diff --git a/start/src/main/resources/templates/primeport.html b/start/src/main/resources/templates/primeport.html index f554435..bb4048e 100644 --- a/start/src/main/resources/templates/primeport.html +++ b/start/src/main/resources/templates/primeport.html @@ -1,4 +1,4 @@ ---
\ No newline at end of file + })();
\ No newline at end of file diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java index d1bdfd6..061d765 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java @@ -34,6 +34,12 @@ public class MkmjController { return mkmjService.add(cmd); } + @ApiOperation("分页") + @PostMapping("/listNoToken") + public PageResponse listNoToken(@RequestBody MkmjPageQry qry) { + return mkmjService.listPage(qry); + } + @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@RequestBody MkmjPageQry qry) { diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java index cc6dd88..b32d014 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java @@ -90,7 +90,7 @@ public class ClosedTmpApplyController { stringObjectHashMap.put("value", cmd.getHgAuthAreaName()); hashMaps.add(stringObjectHashMap); HashMap stringObjectHashMap2 = new HashMap<>(); - stringObjectHashMap2.put("area", stringObjectHashMap); + stringObjectHashMap2.put("area", hashMaps); vehicleApplyAddCmd.setGateLevelAuthArea(JSON.toJSONString(stringObjectHashMap2)); vehicleApplyAddCmd.setAuditCorpId(cmd.getAuditPersonCorpId()); vehicleApplyAddCmd.setAuditCorpName(cmd.getAuditPersonCorpName()); @@ -99,6 +99,7 @@ public class ClosedTmpApplyController { vehicleApplyAddCmd.setAuditUserId(cmd.getAuditPersonUserId()); vehicleApplyAddCmd.setAuditUserName(cmd.getAuditPersonUserName()); vehicleApplyAddCmd.setMkmjId(cmd.getLevelOneMkmjId()); + vehicleApplyAddCmd.setMkmjName(cmd.getLevelOneMkmjName()); vehicleApplyAddCmd.setLsUserIdcard(cmd.getUserCard()); vehicleApplyAddCmd.setLsUserPhone(cmd.getUserPhone()); vehicleApplyAddCmd.setEmployeeVehicleUserName(cmd.getApplyPersonUserName()); diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java index 4180983..821c2b4 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java @@ -16,6 +16,7 @@ import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.domain.model.VehicleAuditE; import com.zcloud.primeport.domain.model.VehicleMessageE; import com.zcloud.primeport.dto.VehicleApplyAddCmd; +import jodd.util.Base64; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -69,6 +70,11 @@ public class VehicleApplyAddExe { examTypeE.setVehicleCorpId(user.getTenantId()); examTypeE.setVehicleCorpName(user.getTenantName()); } + if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode())){ + // 临时 + examTypeE.setEmployeeVehicleUserName(cmd.getDrivingUserName()); + examTypeE.setLsUserIdcard(Base64.encodeToString(cmd.getLsUserIdcard())); + } VehicleApplyE add = vehicleApplyGateway.add(examTypeE); VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1) .auditUserId(examTypeE.getAuditUserId()) diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java index 70f8581..b670dd4 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java @@ -48,6 +48,9 @@ public class VehicleAuditUpdateExe { vehicleApplyE.setId(cmd.getVehicleApplyId()); vehicleApplyE.setAuditFlag(cmd.getAuditStatus()); vehicleApplyE.setMkmjPermission(1); + if (cmd.getAuditStatus().equals(3)) { + vehicleApplyE.setMkmjPermission(2); + } vehicleApplyE.setStatusFlag(2); vehicleApplyGateway.update(vehicleApplyE); vehicleAuditGateway.update(vehicleAuditE); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java index be74b52..d7dbcf3 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java @@ -69,6 +69,8 @@ public class VehicleApplyAddCmd extends Command { // private Integer blockedFlag; @ApiModelProperty(value = "口门id", name = "mkmjId") private Long mkmjId; + @ApiModelProperty(value = "口门名称", name = "mkmjName") + private String mkmjName; @ApiModelProperty(value = "临时申请驾驶人手机号", name = "lsUserPhone") private String lsUserPhone; @ApiModelProperty(value = "临时申请驾驶人身份证", name = "lsUserIdcard") diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java index 3105760..1aa2039 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java @@ -73,6 +73,7 @@ public class VehicleApplyE extends BaseE { //1被拉黑2未拉黑 private Integer blockedFlag; private Long mkmjId; + private String mkmjName; private String lsUserPhone; private String lsUserIdcard; private Long auditCorpId; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java index 087877f..a50f0e9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java @@ -102,11 +102,8 @@ public class VehicleApplyDO extends BaseDO { @TableField(exist = false) @ApiModelProperty(value = "项目人员数") private Integer personApplyCount; - private Long mkmjId; - @TableField(exist = false) private String mkmjName; - private String lsUserPhone; private String lsUserIdcard; private String drivingUserName; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java index df04e81..f976284 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java @@ -136,6 +136,9 @@ public class VehicleAuditDO extends BaseDO { private String projectName; @TableField(exist = false) private String projectId; - + @TableField(exist = false) + private String mkmjName; + @TableField(exist = false) + private Long mkmjId; } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml index f855899..fb8ecec 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -46,6 +46,7 @@ va.ls_user_phone, va.ls_user_idcard, va.mkmj_id, + va.mkmj_name, va.blocked_flag, va.remarks reason_visit FROM