Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -192,7 +192,8 @@
                ur.use_registration_code                                               as useRegistrationCode,
                date_format(ur.audit_pass_date, '%Y-%m-%d')                            as auditPassDate,
                ur.receive_org_name                                                    as receiveOrgName,
-               ur.next_execute_user_ids                                               as nextExecuteUserIds
+               ur.next_execute_user_ids                                               as nextExecuteUserIds,
+               ur.is_xixian                                               as isXixian
         from tzs_jg_use_registration ur
                  LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
                  LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD

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/JgChangeRegistrationReformServiceImpl.java

@@ -792,7 +792,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
+        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), Optional.ofNullable(jgChangeRegistrationReform.getSupervisoryCode()).orElse("无"), jgChangeRegistrationReform.getApplyNo());
     }
 
     /**

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

@@ -197,7 +197,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistration.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
         String equType = this.baseMapper.getEquType(String.valueOf(map.get("equipId")));
         if (map.containsKey("receiveOrgCode")) {
-            //维保单位信息
+            // 接收单位信息
             String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
             jgUseRegistration.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
             jgUseRegistration.setReceiveOrgName(splitMaintenanceUnitCode[1]);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -182,4 +182,17 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField("trace_id")
     private String traceId;
+
+
+    /**
+     * 检验检测单位名称(冗余)
+     */
+    @TableField(value = "inspection_unit_name")
+    private String inspectionUnitName;
+
+    /**
+     * 报检单位名称(冗余)
+     */
+    @TableField(value = "application_unit_name")
+    private String applicationUnitName;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -95,7 +95,9 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "检验检测类型名称（冗余）")
     private String inspectionTypeName;
 
+
     @ApiModelProperty(value = "报检日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date applicationDate;
 
     @ApiModelProperty("检验结果方式")
@@ -143,10 +145,10 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "设备使用地址")
     private String equUseAddress;
 
-    @ApiModelProperty(value = "检验检测单")
+    @ApiModelProperty(value = "检验检测单位名称(冗余)")
     private String inspectionUnitName;
 
-    @ApiModelProperty(value = "报检单位")
+    @ApiModelProperty(value = "报检单位名称(冗余)")
     private String applicationUnitName;
 
     @ApiModelProperty(value = "监管码")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -61,23 +61,54 @@
 
     <select id="selectForPage"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel">
-        select res.sequence_nbr, res.inspection_unit_code, res.application_no, res.application_unit_code,
-        res.equip_unicode, res.result_status, res.license_number, res.result_no, res.inspector, res.inner_person_code,
-        res.inspection_conclusion, res.inspection_date, res.next_inspection_date, res.inspection_start_date,
-        res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.remark,
-        res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
-        res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, equ_code, use_inner_code, ibjri.equ_list,
-        tec1.name equ_list_name, ibjri.equ_category , ibjoi.SUPERVISORY_CODE supervisoryCode
-        , use_org_code, res.equ_define, ibjui.ADDRESS equUseAddress, bei.use_unit inspectionUnitName, bei1.use_unit applicationUnitName, cdb.name inspectionTypeName
-        from tz_jyjc_inspection_result res
-        left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.record
-        left join idx_biz_jg_use_info ibjui on ibjui.record = res.equip_unicode
-        left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
-        left join tz_equipment_category tec on ibjri.equ_category = tec.code
-        left join tz_equipment_category tec1 on ibjri.equ_list = tec1.code
-        left join tz_base_enterprise_info bei on res.inspection_unit_code = bei.use_code
-        left join tz_base_enterprise_info bei1 on res.application_unit_code = bei1.use_code
-        left join cb_data_dictionary cdb on res.inspection_type = cdb.code
+        SELECT
+            res.sequence_nbr,
+            res.inspection_unit_code,
+            res.application_no,
+            res.application_unit_code,
+            res.equip_unicode,
+            res.result_status,
+            res.license_number,
+            res.result_no,
+            res.inspector,
+            res.inner_person_code,
+            res.inspection_conclusion,
+            res.inspection_date,
+            res.next_inspection_date,
+            res.inspection_start_date,
+            res.inspection_end_date,
+            res.inspection_result_summary,
+            res.non_conformance,
+            res.remark,
+            res.rec_user_id,
+            res.rec_date,
+            res.biz_type,
+            res.equ_category,
+            res.inspection_type,
+            res.inspection_type_name,
+            res.application_date,
+            res.inspection_unit_name,
+            res.application_unit_name,
+            res.inspection_type_name,
+            ibjui.use_unit_name,
+            ibjui.use_unit_credit_code,
+            ibjui.province_name,
+            ibjui.city_name,
+            ibjui.county_name,
+            ibjui.street_name,
+            ibjri.equ_code,
+            ibjui.use_inner_code,
+            ibjri.equ_list,
+            (SELECT NAME FROM tz_equipment_category WHERE code = res.equ_list) AS equ_list_name,
+            ibjoi.SUPERVISORY_CODE supervisoryCode,
+            ibjri.use_org_code,
+            res.equ_define,
+            ibjui.ADDRESS equUseAddress
+        FROM
+            tz_jyjc_inspection_result res
+            LEFT JOIN idx_biz_jg_other_info ibjoi ON res.equip_unicode = ibjoi.record
+            LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.record = res.equip_unicode
+            LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.record = ibjri.record
         <where>
             <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
                 and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
@@ -86,19 +117,19 @@
                 and res.application_unit_code = #{jyjcInspectionResultModel.applicationUnitCode}
             </if>
             <if test="jyjcInspectionResultModel.useOrgCode != '' and jyjcInspectionResultModel.useOrgCode != null">
-                and use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
+                and ibjri.use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
-                and use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
+                and ibjui.use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
-                and equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
+                and ibjri.equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.equipUnicode != '' and jyjcInspectionResultModel.equipUnicode != null">
                 and res.equip_unicode like concat('%',#{jyjcInspectionResultModel.equipUnicode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.equCategory != '' and jyjcInspectionResultModel.equCategory != null">
-                and ibjri.equ_category = #{jyjcInspectionResultModel.equCategory}
+            <if test="jyjcInspectionResultModel.equList != '' and jyjcInspectionResultModel.equList != null">
+                and ibjri.equ_list = #{jyjcInspectionResultModel.equList}
             </if>
             <if test="jyjcInspectionResultModel.inspectionType != '' and jyjcInspectionResultModel.inspectionType != null">
                 and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
@@ -107,7 +138,7 @@
                 AND TO_DAYS(res.application_date) = TO_DAYS(#{jyjcInspectionResultModel.applicationDate})
             </if>
             <if test="jyjcInspectionResultModel.useUnitCreditCode != '' and jyjcInspectionResultModel.useUnitCreditCode != null">
-                and use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
+                and ibjui.use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.inspectionUnitCode != '' and jyjcInspectionResultModel.inspectionUnitCode != null">
                 and res.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
@@ -130,6 +161,6 @@
                 </otherwise>
             </choose>
         </where>
-        ORDER BY application_date DESC
+        ORDER BY res.application_date DESC
     </select>
 </mapper>

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

@@ -12,7 +12,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import com.sun.org.apache.regexp.internal.RE;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
@@ -113,6 +117,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Autowired
     TaskModelServiceImpl taskModelService;
 
+    @Autowired
+    DataDictionaryServiceImpl dataDictionaryService;
+
     public JyjcInspectionApplicationModel save(@RequestBody JSONObject obj) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
@@ -353,6 +360,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
 
+    @Override
     public Boolean deleteBatchData(List<Long> sequenceNbr) {
 
 //        List<JyjcInspectionApplication> jyjcInspectionApplications = this.getBaseMapper().selectBatchIds(sequenceNbr);
@@ -398,6 +406,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     }
 
+    @Override
     public Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
                 RequestContext.getToken())).toString(), ReginParams.class);
@@ -581,17 +590,21 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         for (int i = 0; i < applicationEquipModels.size(); i++) {
             JyjcInspectionResult resultModel = new JyjcInspectionResult();
             resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
+            resultModel.setInspectionUnitName(inspectionApplicationModel.getInspectionUnitName());
             resultModel.setApplicationNo(inspectionApplicationModel.getApplicationNo());
             resultModel.setApplicationUnitCode(inspectionApplicationModel.getApplicationUnitCode());
+            resultModel.setApplicationUnitName(inspectionApplicationModel.getApplicationUnitName());
             resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
             resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
             resultModel.setResultType(inspectionApplicationModel.getResultType());
             //resultModel.setResultType("input");
             resultModel.setInspectionType(inspectionApplicationModel.getInspectionType());
+            resultModel.setInspectionTypeName(this.getDictNameByCode(inspectionApplicationModel.getInspectionType()));
             // 解析设备
             resultModel.setBizType(inspectionApplicationModel.getBizType());
             resultModel.setResultNo(codes.get(i));
-            resultModel.setEquipUnicode(applicationEquipModels.get(i).getEquipUnicode());//设备唯一标识
+            //设备唯一标识
+            resultModel.setEquipUnicode(applicationEquipModels.get(i).getEquipUnicode());
             resultModel.setEquDefine(applicationEquipModels.get(i).getEquDefine());
             resultModel.setEquCategory(applicationEquipModels.get(i).getEquCategory());
             resultModel.setEquList(applicationEquipModels.get(i).getEquList());
@@ -603,6 +616,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         JyjcInspectionApplicationHandlerFactory.apply(type).notifyInspectionUnit(thiryPartParams);
     }
 
+    private String getDictNameByCode(String code) {
+        DataDictionary dataDictionary = dataDictionaryService.getByCode(code,"JYJC");
+        return dataDictionary != null ? dataDictionary.getName() : "";
+    }
+
     /**
      * 退回
      *

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

@@ -143,7 +143,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
         categoryOtherInfoMapper.selectSupervisorCodeMaxValue().forEach(vo ->
                 stringRedisTemplate.opsForValue().set(vo.getName(), String.valueOf(vo.getValue())));
 
-        return Long.parseLong(Objects.requireNonNull(redisTemplate.opsForValue().get(sequenceKey)));
+        return Long.parseLong(redisTemplate.opsForValue().get(sequenceKey) == null ? "0" : redisTemplate.opsForValue().get(sequenceKey));
     }
 
     /**