fix(jg):证管理的接口调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationManage.java

@@ -126,7 +126,7 @@ public class JgUseRegistrationManage extends BaseEntity {
     private String useRegistrationCertificateParam;
 
     /**
-     * 登记证书编号
+     * 登记证书唯一标识
      */
 	@TableField("certificate_no")
     private String certificateNo;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -67,4 +67,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     List<Map<String, Object>> selectEquipList(@Param("id") Long id);
 
     List<CompanyEquipCountDto> queryForFlowingEquipList();
+
+    Map<String,String> getEquTypeByUseRegSeq(@Param("sequenceNbr")String sequenceNbr);
 }

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

@@ -529,4 +529,14 @@
         a.sequence_nbr = b.equip_transfer_id
         and (a.status  <![CDATA[ <> ]]>  '使用单位待提交' and a.status  <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已作废')
     </select>
+    <select id="getEquTypeByUseRegSeq" resultType="java.util.Map">
+        select ur.sequence_nbr                                                                                   as sequenceNbr,
+               GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_LIST))         as equList,
+               GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY))     as equCategory,
+               GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE))       as equDefine
+        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
+        where ur.sequence_nbr = #{sequenceNbr}
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import cn.hutool.poi.excel.sax.SheetRidReader;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -34,6 +35,17 @@ public class JgUseRegistrationManageController extends BaseController {
     @Autowired
     JgUseRegistrationManageServiceImpl jgUseRegistrationManageServiceImpl;
 
+	/**
+	 * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/brushHistoryCertificate")
+	@ApiOperation(httpMethod = "GET", value = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中", notes = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中")
+	public ResponseModel<Boolean> brushHistoryCertificate() {
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.brushHistoryCertificate());
+	}
+
+
     /**
      * 新增
      *
@@ -129,7 +141,7 @@ public class JgUseRegistrationManageController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/queryEquByCertificateSeq")
 	@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 查询证下面的所有设备",  notes = "根据证的sequenceNbr 查询证下面的所有设备")
-	public ResponseModel<List<Map<String, Object>>> queryEquByCertificateSeq(Long sequenceNbr) {
+	public ResponseModel<List<JSONObject>> queryEquByCertificateSeq(Long sequenceNbr) {
 		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeq(sequenceNbr));
 	}
 }

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

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 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.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
@@ -96,6 +97,7 @@ import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.nio.file.Files;
+import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
@@ -2032,4 +2034,24 @@ public class CommonServiceImpl implements ICommonService {
             }
         });
     }
+
+    /**
+     * 生成使用登记证书唯一标识
+     * @param equType 包含有 设备种类 & 设备类别 & 设备品种 的map
+     * @param date 生成证日期 （不传取当前时间）
+     * @param receiveCompanyCode 接收机构统一信用代码
+     * @return 使用登记证书唯一标识
+     */
+    public String generateCertificateNo(Map<String,String> equType,Date date,String receiveCompanyCode){
+        String ym = "";
+        try {
+            ym = Optional.of(DateUtils.dateFormat(date, DateUtils.DATE_PATTERN_MM)).orElse(DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM));
+        } catch (ParseException e) {
+            log.error("日期转换失败：", e);
+        }
+        String equCode = Optional.ofNullable(equType.get("equDefine")).orElse(equType.get("equCategory"));
+        String registrationCode = equCode + receiveCompanyCode + ym;
+        ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
+        return responseModel.getResult();
+    }
 }
\ No newline at end of file

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

@@ -1869,13 +1869,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return useFlagParamDto;
     }
 
-    private void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+    public void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(registerInfo.getRecord(), null);
         useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
         useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
     }
 
-    private void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+    public void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
         IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(registerInfo.getRecord());
 
         useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));