Merge branch 'refs/heads/develop_tzs_main' into develop_tzs_test

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -3137,7 +3137,7 @@ public class DataDockServiceImpl {
             jgUseRegistration.setUseUnitName((String) map.get("useUnit"));
             jgUseRegistration.setUseUnitCreditCode((String) map.get("useUnitCode"));
             jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
-            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
+            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getRealName());
             if (!ObjectUtils.isEmpty(map.get("inspectOrgCode"))) {
                 jgUseRegistration.setInspectUnitCreditCode(map.get("inspectOrgCode").toString());
             }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/EquipClaimServiceImpl.java

@@ -479,7 +479,7 @@ public class EquipClaimServiceImpl {
         jgUseRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyName().split("_")[1] : company.getCompanyName());
         jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
         jgUseRegistration.setCreateUserId(userModel.getUserId());
-        jgUseRegistration.setCreateUserName(userModel.getUserName());
+        jgUseRegistration.setCreateUserName(userModel.getRealName());
         jgUseRegistration.setManageType("set");
         if (!ObjectUtils.isEmpty(equipInfo.get("inspectUnitCreditCode"))) {
             jgUseRegistration.setInspectUnitCreditCode(equipInfo.get("inspectUnitCreditCode").toString());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -4716,7 +4716,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
                     company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
-            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
+            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getRealName());
             jgUseRegistration.setApplyNo(jgUseRegistrationManage.getApplyNo());
             jgUseRegistration.setAuditPassDate(new Date());
             jgUseRegistration.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -684,7 +684,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
                     company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
-            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
+            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getRealName());
+            jgUseRegistration.setRecUserName(reginParams.getUserModel().getRealName());
             if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
                 jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
             }
@@ -974,7 +975,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             useRegistration.setManageType(map.getString("manageType"));
             useRegistration.setPromoter(reginParams.getUserModel().getUserId());
             useRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
-            useRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
+            useRegistration.setCreateUserName(reginParams.getUserModel().getRealName());
+            useRegistration.setRecUserName(reginParams.getUserModel().getRealName());
             useRegistration.setCylinderCategory(map.getString("cylinderCategory"));//气瓶分类
             // 使用单位信息
             useRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
@@ -1667,7 +1669,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
             jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate());
             jgUseRegistrationManage.setSequenceNbr(useRegistrationManageSeq);
-            jgUseRegistrationManage.setRecUserId(jgUseRegistration.getCreateUserId());
+            jgUseRegistrationManage.setRecUserId(RequestContext.getExeUserId());
             this.setSuperviseOrgInfo(jgUseRegistrationManage, jgUseRegistration);
             jgUseRegistrationManageMapper.updateById(jgUseRegistrationManage);
             return;
@@ -2140,7 +2142,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         dto.setFlowStatus(commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
         dto.setFlowStatusLabel(jgUseRegistration.getStatus());
         dto.setStartUserId(jgUseRegistration.getCreateUserId());
-        dto.setStartUser(jgUseRegistration.getRecUserName());
+        dto.setStartUser(jgUseRegistration.getCreateUserName());
         dto.setStartUserCompanyName(jgUseRegistration.getUseUnitName());
         dto.setStartDate(new Date());
         jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
@@ -4286,7 +4288,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
                     company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
-            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
+            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getRealName());
+            jgUseRegistration.setRecUserName(reginParams.getUserModel().getRealName());
             jgUseRegistration.setManageType("set");
             if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
                 jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
@@ -4888,7 +4891,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
                     company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
-            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
+            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getRealName());
+            jgUseRegistration.setRecUserName(reginParams.getUserModel().getRealName());
             if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
                 jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
             }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -1102,7 +1102,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         dto.setFlowStatus(commonService.getDictionaryCodeByName(jgVehicleInformation.getStatus()));
         dto.setFlowStatusLabel(jgVehicleInformation.getStatus());
         dto.setStartUserId(jgVehicleInformation.getCreateUserId());
-        dto.setStartUser(jgVehicleInformation.getRecUserName());
+        dto.setStartUser(jgVehicleInformation.getCreateUserName());
         dto.setStartUserCompanyName(jgVehicleInformation.getUseUnitName());
         dto.setStartDate(new Date());
         jgVehicleInformation.setInstanceId(workflowResultDto.getInstanceId());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -986,7 +986,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                 String inspectStatus = inspectionStatusMap.get(none);
                 if (dto.containsKey("NEXT_INSPECT_DATE")) {
                     String nextInspectDate = dto.getString("NEXT_INSPECT_DATE");
-                    if (!ObjectUtils.isEmpty(nextInspectDate) && !"".equals(nextInspectDate)) {
+                    if (!ObjectUtils.isEmpty(nextInspectDate) && !nextInspectDate.isEmpty()) {
                         long daysBetween = ChronoUnit.DAYS.between(LocalDate.now(), LocalDate.parse(nextInspectDate, formatter));
                         if (daysBetween < 0) {
                             inspectStatus = inspectionStatusMap.get(overdue);
@@ -1011,7 +1011,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                             String v = j.getString("inspectReportNo");
                             j.put("inspectReportNo", (v == null || "null".equalsIgnoreCase(v)) ? "" : v);
                         }));
-                if (!ValidationUtil.isEmpty(dto.getString("CYLINDER_CATEGORY")) && dto.getString("EQU_CATEGORY_CODE").equals("2300")) {
+                if (!ValidationUtil.isEmpty(dto.getString("CYLINDER_CATEGORY")) && "2300".equals(dto.getString("EQU_CATEGORY_CODE"))) {
                     String cylinderCategory = dto.getString("CYLINDER_CATEGORY");
                     boolean integer = isInteger(cylinderCategory);
                     if (integer) {