diff --git a/start/src/main/resources/templates/primeport.html b/start/src/main/resources/templates/primeport.html index 8d8794d..a51ee21 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-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java index aea669d..d24f752 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java @@ -113,6 +113,7 @@ public class PersonApplyAddExe { BeanUtils.copyProperties(item, personApplyAddCmdExt); personApplyAddCmdExts.add(personApplyAddCmdExt); }); + xgfPersonApplyCO.setPersonApplyCount(personApplyAddCmdExts.size()); xgfPersonApplyCO.setPersonApplyList(personApplyAddCmdExts); return xgfPersonApplyCO; } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java index e9b9297..a5f4173 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java @@ -43,7 +43,9 @@ public class VehicleApplyUpdateExe { // VehicleApplyE nweV = vehicleApplyGateway.getById(vehicleApplyUpdateCmd.getId()); // nweV.setAuditCorpId(); // VehicleApplyE newV = vehicleApplyGateway.getById(vehicleApplyUpdateCmd.getId()); - + vehicleApplyE.setVehicleType(oldV.getVehicleType()); + vehicleApplyE.setLicenceNo(oldV.getLicenceNo()); + vehicleApplyE.setVehicleBelongType(oldV.getVehicleBelongType()); VehicleAuditE build = VehicleAuditE.builder() .vehicleApplyId(vehicleApplyE.getId()) .batchState(2).batchType(2) @@ -54,8 +56,8 @@ public class VehicleApplyUpdateExe { .auditCorpId(vehicleApplyE.getAuditCorpId()) .auditCorpName(vehicleApplyE.getAuditCorpName()) .auditStatus(AuditEnum.WAITING.getCode()) - .changeAfter(JSON.toJSONString(oldV)) - .changeBefore(JSON.toJSONString(vehicleApplyE)).build(); + .changeAfter(JSON.toJSONString(vehicleApplyE)) + .changeBefore(JSON.toJSONString(oldV)).build(); // 添加审批信息 vehicleAuditGateway.add(build); // 发送待审核待办 diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java index cc2da6b..e35cd5a 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java @@ -81,7 +81,7 @@ public class PersonApplyQueryExe { public PageResponse xgfPersonApplyList(XgfApplyPersonPageQry qry) { Map parmas = PageQueryHelper.toHashMap(qry); - parmas.put("applyCorpId", AuthContext.getTenantId()); +// parmas.put("applyCorpId", AuthContext.getTenantId()); PageResponse pageResponse = xgfPersonApplyRepository.xgfPersonAuditList(parmas); List examCenterCOS = xgfApplyPersonCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java index b970e37..42038f7 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java @@ -46,6 +46,8 @@ public class VehicleAuditPageQry extends PageQuery { private String vehicleBelongType; @ApiModelProperty(name = "processOrRecord", value = "1审批中数据，2审批记录") private Integer processOrRecord; + @ApiModelProperty(name = "auditStatus", value = "审核状态") + private Integer auditStatus; @ApiModelProperty(name = "vehicleApplyId", value = "车辆申请ID（车辆审批记录用）") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java index 22e5f1e..684235d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java @@ -48,6 +48,8 @@ public class XgfPersonApplyCO extends ClientObject { private Long applyCorpId; @ApiModelProperty(name = "申请单位名称", value = "applyCorpName") private String applyCorpName; + @ApiModelProperty(name = "申请时间", value = "applyTime") + private String applyTime; @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit") private Integer currentUserCanAudit; 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 92d44cd..63e6367 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 @@ -105,7 +105,7 @@ public class VehicleApplyDO extends BaseDO { private Long mkmjId; @TableField(exist = false) - private Long mkmjName; + private String mkmjName; private String lsUserPhone; private String lsUserIdcard; 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 17a9afd..df04e81 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 @@ -132,6 +132,10 @@ public class VehicleAuditDO extends BaseDO { private String reasonVisit; @TableField(exist = false) private String applyUserName; + @TableField(exist = false) + private String projectName; + @TableField(exist = false) + private String projectId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java index d900d44..88f41c3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java @@ -57,5 +57,7 @@ public class XgfApplyPersonDO extends BaseDO { private String reasonVisit; @TableField(exist = false) private Integer personApplyCount; + @TableField(exist = false) + private String applyTime; } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml index 16bda0b..f855899 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -62,6 +62,9 @@ AND a.audit_status != 1 + + AND a.audit_status = #{params.auditStatus} + AND va.licence_no like CONCAT('%', #{params.licenceNo}, '%') @@ -131,8 +134,8 @@ vap.vehicle_department_name, vap.employee_vehicle_user_id, vap.employee_vehicle_user_name, - vap.create_name apply_user_name, - vap.create_time apply_time + va.create_name apply_user_name, + va.create_time apply_time FROM vehicle_audit AS va LEFT JOIN vehicle_apply vap on va.vehicle_apply_id = vap.id diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index 27981ce..ab51414 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -75,6 +75,7 @@