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

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/TzCylinderServiceImpl.java

@@ -126,7 +126,9 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
 
 		for (TzCylinderFillingDto tzCylinderFillingDto : tzCylinderFillingDtoList) {
 			Double fillingQuantity = Double.valueOf(ObjectUtils.isEmpty(tzCylinderFillingDto.getFillingQuantity()) ? "0" : tzCylinderFillingDto.getFillingQuantity());
-			tzCylinderFillingDto.setFillingQuantity(new DecimalFormat("#.00").format(fillingQuantity));
+			tzCylinderFillingDto.setFillingQuantity(new DecimalFormat("#0.00").format(fillingQuantity));
+			Double temperature = Double.valueOf(ObjectUtils.isEmpty(tzCylinderFillingDto.getTemperature()) ? "0" : tzCylinderFillingDto.getTemperature());
+			tzCylinderFillingDto.setTemperature(new DecimalFormat("#0.00").format(temperature));
 			if (!ValidationUtil.isEmpty(tzCylinderFillingDto) && !ValidationUtil.isEmpty(tzCylinderFillingDto.getAbnormal())) {
 				tzCylinderFillingDto.setAbnormal(CyclinderStatus.getName(String.valueOf(tzCylinderFillingDto.getAbnormal())));
 			}

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

@@ -17,8 +17,6 @@ import java.util.Map;
 public interface JgEquipTransferMapper extends CustomBaseMapper<JgEquipTransfer> {
     Page<JgEquipTransferDto> queryForPage(Page<JgEquipTransferDto> page, @Param("param") JgEquipTransferDto model, @Param("type") String type, @Param("companyCode") String companyCode);
 
-    void updatePromoter(@Param("id")Long id);
-
     @MapKey("sequenceNbr")
     List<Map<String, Object>> queryEquipInformation(Long sequenceNbr);
 }

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper">
-    <update id="updatePromoter">
-        
-    </update>
-
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto">
         select
             jet.sequence_nbr AS sequenceNbr,
@@ -72,8 +68,8 @@
                 <if test="param.applyNo != null and param.applyNo != ''">
                     AND jet.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
                 </if>
-                <if test="param.useUnitName != null and param.useUnitName != ''">
-                    AND jet.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
+                <if test="param.useUnitCreditCode != null and param.useUnitCreditCode != ''">
+                    AND jet.use_unit_credit_code = #{param.useUnitCreditCode}
                 </if>
                 <if test="param.installUnitCreditCode != null and param.installUnitCreditCode != ''">
                     AND jet.install_unit_credit_code = #{param.installUnitCreditCode}

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

@@ -18,6 +18,9 @@
                 <if test="param.receiveOrgCode != null and param.receiveOrgCode != ''">
                     AND isn.receive_org_code = #{param.receiveOrgCode}
                 </if>
+                <if test="param.useUnitCreditCode != null and param.useUnitCreditCode != ''">
+                    AND isn.use_unit_credit_code = #{param.useUnitCreditCode}
+                </if>
                 <if test="param.useUnitName != null and param.useUnitName != ''">
                     AND isn.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
                 </if>

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

@@ -124,13 +124,13 @@
             fi.factory_standard AS factoryStandard,
             fi.product_quality_yield_prove AS productQualityYieldProve,
             fi.ins_use_maintain_explain AS insUseMaintainExplain,
-            ui.safety_manager AS safetyManager,
-            ui.phone AS safetyManagerPhone,
+            ei.legal_person AS safetyManager,
+            ei.legal_phone AS safetyManagerPhone,
             ui.PROVINCE_NAME AS useUnitProvinceName,
             ui.CITY_NAME AS useUnitCityName,
             ui.COUNTY_NAME AS useUnitCountyName,
             ui.ADDRESS AS useUnitAddress,
-             ei.use_code AS useCode
+            eio.use_code AS useCode
         FROM
             tzs_jg_transfer_notice tjtn
                 LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
@@ -140,6 +140,7 @@
                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
                 LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
                 LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = tjtn.use_unit_credit_code
+                LEFT JOIN tz_base_enterprise_info eio ON eio.use_code = tjtn.install_unit_credit_code
         WHERE
             tjtn.sequence_nbr = #{sequenceNbr}
             LIMIT 1

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

@@ -13,6 +13,7 @@
         date_format(reg_date,'%Y-%m-%d') as regDate,
         ur.use_unit_name as useUnitName,
         ur.status,
+        other.CODE96333 code96333,
         ur.receive_org_name as receiveOrgName,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
@@ -32,6 +33,7 @@
         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
         LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
+        LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
 
         <where>
             and  ur.is_delete = 0
@@ -76,7 +78,7 @@
                      jri.PRODUCT_PHOTO                                                      as proDuctPhoto,
                      jfi.FACTORY_NUM                                                        as factoryNum,
                      jfi.PRODUCE_UNIT_NAME                                                  as produceUnitName,
-                     jfi.PRODUCE_DATE                                                       as produceDate,
+                     date_format(jfi.PRODUCE_DATE,'%Y-%m-%d')                               as produceDate,
                      jfi.FACTORY_STANDARD                                                   as factoryStandard,
                      jfi.PRODUCT_QUALITY_YIELD_PROVE                                        as productQualityYieldProve,
                      jfi.INS_USE_MAINTAIN_EXPLAIN                                           as insUseMaintainExplanin,

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

@@ -78,8 +78,9 @@ public class JgTransferNoticeByWorkFlowController {
         // TODO 受理移装告知流程
         LinkedHashMap model1 = (LinkedHashMap)model.get("model");
         LinkedHashMap installationInfo = (LinkedHashMap)model1.get("transferNoticeInfo");
+        String opinion = model.get("opinion").toString();
         JgTransferNoticeDto JgTransferNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgTransferNoticeDto.class);
-        jgTransferNoticeService.accept(JgTransferNoticeDto,op);
+        jgTransferNoticeService.accept(JgTransferNoticeDto, op, opinion);
         return ResponseHelper.buildResponse(null);
     }
 }

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

@@ -169,18 +169,16 @@ public class JgTransferNoticeController extends BaseController {
         map.put("useUnitName", "西安市高科物业服务有限公司");  // 使用单位名称
         map.put("fullAddress", "西安市曲江新区春临东街南湖意境1单元2号楼");  // 设备使用地点
         map.put("equList", "电梯");  // 设备种类
-        map.put("equDefine", "曳引驱动电梯");  // 设备品种
+        map.put("equDefine", "曳引驱动电梯啊啊啊啊啊啊啊啊啊啊啊啊啊");  // 设备品种
         map.put("equipCode", "");  // 设备代码
-        map.put("equCategory", "曳引电梯");  // 设备类别
-        map.put("useInnerCode", "KY-9527");  // 单位内编号
-        map.put("factoryNum", "G60001");  // 产品编号
+        map.put("equCategory", "曳引电梯噜啦噜啦嘞绿绿绿绿绿绿绿");  // 设备类别
+        map.put("useInnerCode", "KY-9527555555555555");  // 单位内编号
+        map.put("factoryNum", "FUCK-G600010000056");  // 产品编号
         map.put("receiveOrgName", "西安市曲江新区质检院");  // 登记机关
         map.put("giveOutYear", "2023");  // 发证日期-年
         map.put("giveOutMonth", "12");  // 发证日期-月
         map.put("giveOutDay", "26");  // 发证日期-日
-        // 生成二维码
-        String qrCode = ImageUtils.generateQRCode("YZGZ20231225001", 70, 65);
-        map.put("supervisoryCode", qrCode);  // 监管二维码
+        map.put("supervisoryCode", "YZGZ20231225001");  // 监管二维码
         commonService.generateCertificateReport(map, response);
     }
 }

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

@@ -17,6 +17,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -133,4 +134,11 @@ public class JgUseRegistrationController extends BaseController {
         return ResponseHelper.buildResponse(map);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/export")
+    @ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
+    public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr){
+        jgUseRegistrationServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response);
+    }
+
 }

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

@@ -118,18 +118,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     public void save(JSONObject map) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         UseInfo useInfo = new UseInfo();
-        BeanUtil.copyProperties(map, useInfo);
         String equipId = map.get("record").toString();
         LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
         lambda.eq(UseInfo::getRecord, equipId);
-        // 更新使用信息
-        useInfoMapper.update(useInfo, lambda);
-        InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
-        BeanUtil.copyProperties(map, inspectionDetectionInfo);
-        LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
-        inspectionLambda.eq(InspectionDetectionInfo::getRecord, equipId);
-        // 更新检验检测信息
-        inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
         // 使用登记信息
         JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
         LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
@@ -137,8 +128,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
         String supervisoryCode = otherInfo.getSupervisoryCode();
         jgChangeRegistrationReform.setSupervisoryCode(supervisoryCode);
-        jgChangeRegistrationReform.setUseUnitName(useInfo.getUseUnitName());
-        jgChangeRegistrationReform.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
+        jgChangeRegistrationReform.setUseUnitName(ObjectUtils.isEmpty(useInfo.getUseUnitName())?reginParams.getCompany().getCompanyName():useInfo.getUseUnitName());
+        jgChangeRegistrationReform.setUseUnitCreditCode(ObjectUtils.isEmpty(useInfo.getUseUnitCreditCode())?reginParams.getCompany().getCompanyCode():useInfo.getUseUnitCreditCode());
+
         if (!ObjectUtils.isEmpty(map.get("transformationQualityCertificate"))) {
             jgChangeRegistrationReform.setTransformationQualityCertificate(JSONObject.toJSONString(map.get("transformationQualityCertificate")));
         }

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

@@ -229,10 +229,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             }
 
             JgChangeRegistrationUnit notice = new JgChangeRegistrationUnit();
-            BeanUtils.copyProperties(noticeDto,notice);
-
+            JgChangeRegistrationUnit noticeOld = JgChangeRegistrationUnitMapper.selectById(noticeDto.getSequenceNbr());
+            BeanUtils.copyProperties(noticeOld,notice);
             boolean submit = submit(notice, op);
-
+            notice.setChangeCertificate(noticeDto.getChangeCertificate());
+            notice.setRemark(noticeDto.getRemark());
             if(submit) {
                 // 查询下节点任务
                 getNext(roleListSecond, notice.getInstanceId(),taskName);

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

@@ -205,7 +205,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         placeholders.put("produceCode", getValue.apply("factoryNum")); // TODO: 制造编号 - 设备出厂编号
         placeholders.put("produceUnitName", getValue.apply("produceUnitName"));
         placeholders.put("produceLicenseNum", getValue.apply("produceLicenseNum"));
-        placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("address"));
+        placeholders.put("fullAddress", getValue.apply("provinceName") + getValue.apply("cityName") + getValue.apply("countyName") + getValue.apply("streetName") + getValue.apply("address"));
         placeholders.put("installStartDate", getValue.apply("installStartDate"));
         placeholders.put("installType", "移装"); // TODO: 施工类别
         placeholders.put("installLicenseNo", "");
@@ -216,7 +216,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         placeholders.put("useUnitName", getValue.apply("useUnitName"));
         placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
         placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
-        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitProvinceName") + getValue.apply("useUnitCityName") + getValue.apply("useUnitCountyName") + getValue.apply("useUnitAddress"));
+        placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitProvinceName") + getValue.apply("useUnitCityName") + getValue.apply("useUnitCountyName") + getValue.apply("streetName") + getValue.apply("useUnitAddress"));
         // 生成二维码
         String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
         placeholders.put("qrCode", qrCode);
@@ -273,7 +273,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             JgTransferNotice notice = new JgTransferNotice();
             BeanUtils.copyProperties(noticeDto,notice);
 
-            boolean submit = submit(notice, op);
+            boolean submit = submit(notice, op, null);
 
             if(submit) {
                 // 查询下节点任务
@@ -537,7 +537,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         return urls;
     }
 
-    public boolean submit(JgTransferNotice notice, String op) {
+    public boolean submit(JgTransferNotice notice, String op, String opinion) {
 
         AjaxResult ajaxResult = Workflow.taskClient.getTask(notice.getInstanceId());
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -546,7 +546,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
-        dto.setComment("提交流程");
+        if (!StringUtils.isEmpty(opinion)) {
+            dto.setComment(opinion);
+        }
         HashMap<String, Object> map = new HashMap<>();
         if(notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615") ) {
             map.put("approvalStatus", "提交");
@@ -586,7 +588,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
     @Transactional
-    public void accept(JgTransferNoticeDto dto, String op) {
+    public void accept(JgTransferNoticeDto dto, String op, String opinion) {
         String[] taskName = new String[]{"流程结束"};
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         JgTransferNotice jgTransferNotice = this.jgTransferNoticeMapper.selectById(dto.getSequenceNbr());
@@ -600,7 +602,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
 
         ArrayList<String> roleList = new ArrayList<>();
-        boolean submit = submit(jgTransferNotice, op);
+        boolean submit = submit(jgTransferNotice, op, opinion);
         if(submit) {
             getNext(roleList, dto.getInstanceId(), taskName);
             jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());

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

@@ -20,7 +20,12 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
@@ -35,14 +40,19 @@ import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -72,6 +82,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
     @Autowired
     IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
+    @Autowired
+    private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
+    @Autowired
+    private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
+    @Autowired
+    private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
+    @Autowired
+    ICommonService commonService;
+
     public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
@@ -468,4 +487,118 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
         return null;
     }
+
+    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response) {
+        Map<String, Object> exportParamsMap = new HashMap<>();
+        //查询使用登记详情
+        JgUseRegistration useRegistration = this.getById(sequenceNbr);
+        LambdaQueryWrapper<JgUseRegistrationEq> useEqLambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        useEqLambda.eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr);
+        JgUseRegistrationEq useRegistrationEq = jgRelationEquipMapper.selectOne(useEqLambda);
+
+        if (ValidationUtil.isEmpty(useRegistration) || ValidationUtil.isEmpty(useRegistrationEq)) {
+            throw new BadRequest("使用登记证导出失败,请稍后重试!");
+        }
+        //登记机关
+        if(ValidationUtil.isEmpty(useRegistration.getReceiveOrgName())){
+            throw new BadRequest("使用登记证导出失败,登记机关为空!");
+        }
+        exportParamsMap.put("receiveOrgName", useRegistration.getReceiveOrgName());
+        //使用登记证编号
+        if(ValidationUtil.isEmpty(useRegistration.getUseRegistrationCode())){
+            throw new BadRequest("使用登记证导出失败,使用登记证编号为空!");
+        }
+        exportParamsMap.put("useRegistrationCode", useRegistration.getUseRegistrationCode());
+        //使用单位名称
+        if(ValidationUtil.isEmpty(useRegistration.getUseUnitName())){
+            throw new BadRequest("使用登记证导出失败,使用单位名称为空!");
+        }
+        exportParamsMap.put("useUnitName", useRegistration.getUseUnitName());
+        //监管码
+        if(ValidationUtil.isEmpty(useRegistration.getSupervisoryCode())){
+            throw new BadRequest("使用登记证导出失败,监管码为空!");
+        }
+        exportParamsMap.put("supervisoryCode", useRegistration.getSupervisoryCode());
+        //发证日期（当前时间）
+        LocalDate today = LocalDate.now();
+        exportParamsMap.put("giveOutYear", today.getYear());
+        exportParamsMap.put("giveOutMonth", today.getMonthValue());
+        exportParamsMap.put("giveOutDay", today.getDayOfMonth());
+
+        //查询设备注册信息
+        IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", useRegistrationEq.getEquId()));
+        if(!ValidationUtil.isEmpty(registerInfo)){
+            //设备种类、类别、品种
+            String equList = registerInfo.getEquList();//设备种类
+            String equCategory = registerInfo.getEquCategory();//设备类别
+            String equDefine = registerInfo.getEquDefine();//设备品种
+            List<EquipmentCategory> categoryList0 = commonService.getEquipmentCategoryList(equList, null);
+            List<EquipmentCategory> categoryList1 = commonService.getEquipmentCategoryList(equCategory, null);
+            List<EquipmentCategory> categoryList2 = commonService.getEquipmentCategoryList(equDefine, null);
+            if (CollectionUtils.isNotEmpty(categoryList0)) {
+                if(ValidationUtil.isEmpty(categoryList0.get(0).getName())){
+                    throw new BadRequest("使用登记证导出失败,设备种类为空!");
+                }
+                exportParamsMap.put("equList", categoryList0.get(0).getName());
+            }
+            if (CollectionUtils.isNotEmpty(categoryList1)) {
+                if(ValidationUtil.isEmpty(categoryList1.get(0).getName())){
+                    throw new BadRequest("使用登记证导出失败,设备类别为空!");
+                }
+                exportParamsMap.put("equCategory", categoryList1.get(0).getName());
+            }
+            if (CollectionUtils.isNotEmpty(categoryList2)) {
+                if(ValidationUtil.isEmpty(categoryList2.get(0).getName())){
+                    throw new BadRequest("使用登记证导出失败,设备品种为空!");
+                }
+                exportParamsMap.put("equDefine", categoryList2.get(0).getName());
+            }
+            //设备代码
+            if(ValidationUtil.isEmpty(registerInfo.getEquCode())){
+                throw new BadRequest("使用登记证导出失败,设备代码为空!");
+            }
+            exportParamsMap.put("equCode", registerInfo.getEquCode());
+        }
+
+        IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(useRegistrationEq.getEquId());
+        if(!ValidationUtil.isEmpty(useInfo)){
+            if(ValidationUtil.isEmpty(useInfo.getUseInnerCode())){
+                throw new BadRequest("使用登记证导出失败,设备单位内部编码为空!");
+            }
+            //单位内部编码
+            exportParamsMap.put("useInnerCode", useInfo.getUseInnerCode());
+            //设备使用地址
+            String fullAddress="";
+            if (!ObjectUtils.isEmpty(useInfo.getProvinceName())) {
+                fullAddress += useInfo.getProvinceName();
+            }
+            if (!ObjectUtils.isEmpty(useInfo.getCityName())) {
+                fullAddress += useInfo.getCityName();
+            }
+            if (!ObjectUtils.isEmpty(useInfo.getCountyName())) {
+                fullAddress += useInfo.getCountyName();
+            }
+            if (!ObjectUtils.isEmpty(useInfo.getStreetName())) {
+                fullAddress += useInfo.getStreetName();
+            }
+            if (!ObjectUtils.isEmpty(useInfo.getAddress())) {
+                fullAddress += useInfo.getAddress();
+            }
+            if(ValidationUtil.isEmpty(fullAddress)){
+                throw new BadRequest("使用登记证导出失败,设备使用地址为空!");
+            }
+            exportParamsMap.put("fullAddress", fullAddress);
+        }
+
+        IdxBizJgFactoryInfo factoryInfo = idxBizJgFactoryInfoService.getOneData(useRegistrationEq.getEquId());
+        //产品编号(出厂编号)
+        if(!ValidationUtil.isEmpty(factoryInfo)){
+            if(ValidationUtil.isEmpty(factoryInfo.getFactoryNum())){
+                throw new BadRequest("使用登记证导出失败,产品编号为空!");
+            }
+            exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
+        }
+        //调用生成使用登记证
+        commonService.generateCertificateReport(exportParamsMap, response);
+    }
 }
\ No newline at end of file