Merge branch 'develop_tzs_register' into develop_tzs_register_jyjc

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java

@@ -112,4 +112,14 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "设备代号")
     private String equList;
 
+
+    @ApiModelProperty(value = "设备类别")
+    private String equCategoryDesc;
+
+    @ApiModelProperty(value = "设备名称")
+    private String productName;
+
+    @ApiModelProperty(value = "设备地址")
+    private String fullAddress;
+
 }

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

@@ -30,6 +30,12 @@ public class JgScrapCancel extends BaseEntity {
     private String cancelType;
 
     /**
+     * 注销类型（1报废注销，2移装注销）
+     */
+    @TableField(exist = false)
+    private String cancelTypeDesc;
+
+    /**
      * 申请编号
      */
     @TableField("apply_no")
@@ -157,4 +163,16 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(exist = false)
     private String equList;
 
+    @TableField(exist = false)
+    private String equListDesc;
+
+    @TableField(exist = false)
+    private String equCategoryDesc;
+
+    @TableField(exist = false)
+    private String productName;
+
+    @TableField(exist = false)
+    private String fullAddress;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationReformService.java

@@ -78,5 +78,5 @@ public interface IJgChangeRegistrationReformService {
      * @param sequenceNbr
      * @param response
      */
-    void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response);
+    void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java

@@ -35,5 +35,7 @@ public interface IJgChangeRegistrationTransferService extends IService<JgChangeR
 
     void revocation(String instanceId);
 
-    void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response);
+    void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType);
+
+    Map<String, Object> getDetailFieldCamelCase(String record);
 }

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

@@ -121,10 +121,17 @@ public class JgChangeRegistrationReformController extends BaseController {
 		return ResponseHelper.buildResponse(map);
 	}
 
+	/**
+	 * 改造登记-导出使用登记证
+	 * @param response 返回
+	 * @param sequenceNbr 主键
+	 * @param printType 打印类型，0-正常打印，1-套打（默认0）
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/export")
 	@ApiOperation(httpMethod = "GET", value = "改造登记-导出使用登记证", notes = "改造登记-导出使用登记证")
-	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr){
-		jgChangeRegistrationReformServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response);
+	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
+							   @RequestParam(value = "printType", defaultValue = "0") String printType){
+		jgChangeRegistrationReformServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
 	}
 }

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

@@ -5,6 +5,7 @@ import com.netflix.ribbon.proxy.annotation.Http;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -156,11 +157,23 @@ public class JgChangeRegistrationTransferController extends BaseController {
 		return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.queryListForPage(page,params, type));
 	}
 
+	/**
+	 * 导出使用登记证
+	 * @param response 返回
+	 * @param sequenceNbr 主键
+	 * @param printType 打印类型，0-正常打印，1-套打（默认0）
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/export")
 	@ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
-	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr){
-		jgChangeRegistrationTransferService.exportUseRegistrationCertificate(sequenceNbr, response);
+	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
+							   @RequestParam(value = "printType", defaultValue = "0") String printType){
+		jgChangeRegistrationTransferService.exportUseRegistrationCertificate(sequenceNbr, response, printType);
+	}
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping (value = "/detailFieldCamelCase")
+	@ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情，返回字段驼峰命名", notes = "根据record查询设备注册信息详情，返回字段驼峰命名")
+	public ResponseModel<Map<String, Object>> getDetailFieldCamelCase(@RequestParam String record) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.getDetailFieldCamelCase(record));
 	}
-
 }

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

@@ -199,11 +199,18 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	}
 
 
+	/**
+	 * 导出使用登记证
+	 * @param response 返回
+	 * @param sequenceNbr 主键
+	 * @param printType 打印类型，0-正常打印，1-套打（默认0）
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/export")
 	@ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
-	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr)  throws IOException {
-		jgChangeRegistrationUnitServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response);
+	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
+							   @RequestParam(value = "printType", defaultValue = "0") String printType) {
+		jgChangeRegistrationUnitServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
 	}
 
 }

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

@@ -22,11 +22,8 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 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.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import java.io.File;
 import java.util.*;
 
 /**
@@ -195,4 +192,25 @@ public class JgTransferNoticeController extends BaseController {
         map.put("supervisoryCode", "YZGZ20231225001");  // 监管二维码
         commonService.generateCertificateReport(map, response);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "（测试使用）特种设备登记证套打", notes = "（测试使用）特种设备登记证套打")
+    @GetMapping(value = "/generate/pdf/print")
+    public void printing(HttpServletResponse response)  {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useRegistrationCode", "梯10 陕B00005（24）");
+        map.put("useUnitName", "西安市高科物业服务有限公司");
+        map.put("fullAddress", "西安市曲江新区春临东街南湖意境1单元2号楼");
+        map.put("equList", "场（厂）内专用机动车辆");
+        map.put("equDefine", "特种气瓶（内装填料气瓶、纤维缠绕气瓶、低温绝热气瓶）");
+        map.put("equCode", "31006102002024010001");
+        map.put("equCategory", "非公路用旅游观光车辆");
+        map.put("useInnerCode", "NBBH-1231231231");
+        map.put("factoryNum", "CCBH-2312312312");
+        map.put("giveOutYear", "2024");
+        map.put("giveOutMonth", "12");
+        map.put("giveOutDay", "26");
+        map.put("supervisoryCode", "YZGZ20231225001");
+        commonService.generatePdfPrint(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

@@ -145,8 +145,9 @@ public class JgUseRegistrationController extends BaseController {
     @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);
+    public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
+                               @RequestParam(value = "printType", defaultValue = "0") String printType) {
+        jgUseRegistrationServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -38,6 +38,8 @@ public interface ICommonService {
 
     void generateCertificateReport(Map<String, Object> map, HttpServletResponse response);
 
+    void generatePdfPrint(Map<String, Object> map, HttpServletResponse response);
+
     List<LinkedHashMap> creatApproveTree();
 
     List<Map<String, Object>>  superviseBusinessCategory(String type);

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

@@ -2,10 +2,16 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.itextpdf.text.DocumentException;
+import com.itextpdf.text.pdf.AcroFields;
+import com.itextpdf.text.pdf.BaseFont;
+import com.itextpdf.text.pdf.PdfReader;
+import com.itextpdf.text.pdf.PdfStamper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -42,7 +48,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -51,11 +59,8 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.net.URLEncoder;
@@ -556,6 +561,89 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
+    /**
+     * 返回附件
+     * @param map 参数
+     * @param response 响应
+     */
+    @Override
+    public void generatePdfPrint(Map<String, Object> map, HttpServletResponse response) {
+        String[] DEFAULT_KEYS = {
+                "useRegistrationCode", "useUnitName", "fullAddress", "equList", "equipDefine",
+                "equipCode", "equipCategory", "useInnerCode", "factoryNum", "giveOutYear",
+                "giveOutMonth", "giveOutDay"
+        };
+
+        if (CollectionUtils.isEmpty(map)) {
+            throw new IllegalArgumentException("参数不能为空");
+        }
+
+        // 设置默认值
+        Arrays.stream(DEFAULT_KEYS)
+                .forEach(key -> map.computeIfAbsent(key, k -> ""));
+
+        // 生成二维码
+        String qrCode = ImageUtils.generateQRCode((String) map.getOrDefault("supervisoryCode", ""), 100, 100);
+        map.put("supervisoryCode", qrCode);  // 监管二维码 代码优化
+
+        // 读取资源文件夹下的模板
+        ClassPathResource resource = new ClassPathResource("templates/use-registration-model.pdf");
+
+
+        PdfReader reader = null;
+        ByteArrayOutputStream bos = null;
+        try {
+            InputStream inputStream = resource.getInputStream();
+            reader = new PdfReader(inputStream);
+            bos = new ByteArrayOutputStream();
+            PdfStamper pdfStamper = new PdfStamper(reader, bos);
+            AcroFields acroFields = pdfStamper.getAcroFields();
+            // 中文字体
+            BaseFont font = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+
+            for (Map.Entry<String, Object> param : map.entrySet()) {
+                // 设置文本域的字体为中文字体
+                acroFields.setFieldProperty(param.getKey(), "textfont", font,null);
+                // 设置字体大小
+                acroFields.setFieldProperty(param.getKey(), "textsize", 12.0f, null);
+                // 将 map 中的值写到 pdf 模板对应的文本域中
+                acroFields.setField(param.getKey(), param.getValue()+"");
+
+            }
+
+            // 如果为false那么生成的PDF文件还能编辑，所以一定要设为true
+            pdfStamper.setFormFlattening(true);
+            pdfStamper.close();
+
+            // 返回文件
+            //FileExporter.exportFile(FileExporter.FileType.valueOf("pdf"), "套打使用登记证", bos.toByteArray(), response);
+            this.writeAttachment(response, bos.toByteArray());
+        } catch (IOException | DocumentException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                assert bos != null;
+                bos.close();
+                reader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 返回附件
+     *
+     * @param response 响应
+     * @param content  附件内容
+     */
+    private void writeAttachment(HttpServletResponse response, byte[] content) throws IOException {
+        // 设置 header 和 contentType
+        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("套打使用登记证.pdf", "UTF-8"));
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        // 输出附件
+        IoUtil.write(response.getOutputStream(), false, content);
+    }
 
     /**
      * word 转 pdf

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

@@ -675,7 +675,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     @Override
-    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response) {
+    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType) {
         Map<String, Object> exportParamsMap = new HashMap<>();
         //查询移装变更详情
         JgChangeRegistrationReform jgChangeRegistrationReform = this.getById(sequenceNbr);
@@ -787,8 +787,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             }
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
-        //调用生成使用登记证
-        commonServiceImpl.generateCertificateReport(exportParamsMap, response);
+        if ("0".equals(printType)) {
+            //调用生成使用登记证
+            commonServiceImpl.generateCertificateReport(exportParamsMap, response);
+        }else{
+            //套打
+            commonServiceImpl.generatePdfPrint(exportParamsMap, 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/JgChangeRegistrationUnitServiceImpl.java

@@ -897,7 +897,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      *
      * @param sequenceNbr
      */
-    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response) {
+    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType) {
         Map<String, Object> exportParamsMap = new HashMap<>();
         //查询移装变更详情
         JgChangeRegistrationUnit transfer = this.getById(sequenceNbr);
@@ -975,7 +975,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         //调用生成使用登记证
         exportParamsMap.put("excelType","变更登记");
         exportParamsMap.put("tableName","特种设备单位变更登记");
-        commonService.generateCertificateReport(exportParamsMap, response);
+
+        if ("0".equals(printType)) {
+            //调用生成使用登记证
+            commonService.generateCertificateReport(exportParamsMap, response);
+        }else{
+            commonService.generatePdfPrint(exportParamsMap, 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/JgReformNoticeServiceImpl.java

@@ -137,6 +137,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 equipMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equId);
                 equipMap.put("useUnitCreditCodeUse", equipMap.getOrDefault("useUnitCreditCode", ""));
                 equipMap.put("useUnitNameUse", equipMap.getOrDefault("useUnitName", ""));
+                equipMap.put("equRegisterCode", equipMap.getOrDefault("equCode", ""));
                 for (String s : fields) {
                     if (installationInfo.containsKey(s)) {
                         installationInfo.put(s, JSON.parseArray(installationInfo.get(s).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/JgScrapCancelServiceImpl.java

@@ -244,6 +244,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
         jgRelationEquip.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr()));
         jgScrapCancelEqService.save(jgRelationEquip);
+        String equListName = EquipmentClassifityEnum.getNameByCode(jgScrapCancel.getEquList());
+        jgScrapCancel.setEquListDesc(equListName);
+        jgScrapCancel.setCancelTypeDesc("1".equals(jgScrapCancel.getCancelType()) ? "报废注销" : "移装注销");
         return jgScrapCancel;
     }
 

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

@@ -47,7 +47,6 @@ 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.text.ParseException;
 import java.time.LocalDate;
@@ -122,9 +121,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 安全管理员
         if (map.containsKey("safetyManagerName")) {
             map.put("safetyManager", map.get("safetyManagerName"));
+            map.put("safetyManagerId", map.get("safetyManagerId"));
         }
+
         IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
         BeanUtil.copyProperties(map, useInfo);
+        if(map.containsKey("isXixian")){
+            useInfo.setIsNotXiXian(map.get("isXixian").toString());
+        }
         // 城市
         if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
             city.forEach(item -> {
@@ -231,6 +235,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 安全管理员
         if (map.containsKey("safetyManager")) {
             String[] data = String.valueOf(map.getString("safetyManager")).split("_");
+            map.put("safetyManagerId",data[0]);
             map.put("safetyManagerName", data[1]);
         }
         // 使用单位提交
@@ -644,7 +649,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return null;
     }
 
-    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response) {
+    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType) {
         Map<String, Object> exportParamsMap = new HashMap<>();
         //查询使用登记详情
         JgUseRegistration useRegistration = this.getById(sequenceNbr);
@@ -754,8 +759,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
-        //调用生成使用登记证
-        commonService.generateCertificateReport(exportParamsMap, response);
+        if ("0".equals(printType)) {
+            //调用生成使用登记证
+            commonService.generateCertificateReport(exportParamsMap, response);
+        }else{
+            //套打
+            commonService.generatePdfPrint(exportParamsMap, response);
+        }
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/common/BizCommonConstant.java

@@ -17,6 +17,11 @@ public interface BizCommonConstant {
 	 */
 	String REGION_TREE_REDIS_KEY = "REGION_TREE_TCM";
 
+	/**
+	 * 全国所有区划企业数据redisKey
+	 */
+	String NATIONAL_REGION_TREE_REDIS_KEY = "NATIONAL_REGION_TREE_TCM";
+
 
 	/**
 	 * 	企业类型数据redisKey

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/RegUnitInfoDto.java

@@ -142,4 +142,7 @@ public class RegUnitInfoDto extends BaseDto {
 
     @ApiModelProperty(value = "注册类型")
     private String registerType;
+
+    @ApiModelProperty(value = "单位所在地是否为全国")
+    private String isNationwide;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/enums/UnitDataSourceEnum.java

+package com.yeejoin.amos.boot.module.tcm.flc.api.enums;
+
+import lombok.Getter;
+
+/**
+ * 企业数据来源
+ * @author Administrator
+ */
+@Getter
+public enum UnitDataSourceEnum {
+
+    /**
+     * 单位审核状态
+     */
+    NATIONAL("省外企业","1"),
+    SHAANXI("陕西省内企业","0");
+
+
+    private String name;
+
+    private String code;
+
+    UnitDataSourceEnum(String name, String code){
+        this.name = name;
+        this.code = code;
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/service/IUnitInfoService.java

@@ -47,7 +47,9 @@ public interface IUnitInfoService {
 
     /**
      * 单位树
+     * @param parentId 上级行政区划ID
+     * @param isNationwide 是否全国范围行政区划 null默认陕西省内，1全国
      * @return Collection<RegionModel>
      */
-    Collection<RegionModel> getRegionTree(Long parentId);
+    Collection<RegionModel> getRegionTree(Long parentId, String isNationwide);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/AmosTcmApplication.java

@@ -140,8 +140,10 @@ public class AmosTcmApplication {
         //4.区域放redis缓存(依赖1)
         //4.1先删除缓存
         redisUtil.del(BizCommonConstant.REGION_TREE_REDIS_KEY);
+        redisUtil.del(BizCommonConstant.NATIONAL_REGION_TREE_REDIS_KEY);
         //4.2再初始化
-        unitInfoService.getAllRegionTree();
+        unitInfoService.getAllRegionTree(null); // 陕西省
+        unitInfoService.getAllRegionTree("1"); // 全国
         //5.企业类型放redis缓存(依赖1)
         //5.1先删除缓存
         redisUtil.del(BizCommonConstant.UNIT_TYPE_LIST_REDIS_KEY);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/UnitInfoController.java

@@ -97,15 +97,23 @@ public class UnitInfoController extends BaseController {
 	 *
 	 * @return
 	 */
-	//@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
 	@GetMapping(value = "/region/tree")
 	@ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
 	public ResponseModel<Collection<RegionModel>> getRegionTree(@RequestParam(value = "parentId",required = false) Long parentId) {
-		return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionTree(parentId));
+		return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionTree(parentId, null));
 	}
 
-
+	/**
+	 * 获取全国行政区划树
+	 *
+     */
+	@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
+	@GetMapping(value = "/national/region/tree")
+	@ApiOperation(httpMethod = "GET", value = "获取全国行政区划树", notes = "获取全国行政区划树")
+	public ResponseModel<Collection<RegionModel>> getNationalRegionTree(@RequestParam(value = "parentId",required = false) Long parentId, @RequestParam(value = "isNationwide",required = false) String isNationwide) {
+		return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionTree(parentId, isNationwide));
+	}
 
 	/**
 	 * 获取管辖单位树

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

@@ -33,6 +33,7 @@ import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitInfoDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.tcm.flc.api.entity.RegUnitInfo;
+import com.yeejoin.amos.boot.module.tcm.flc.api.enums.UnitDataSourceEnum;
 import com.yeejoin.amos.boot.module.tcm.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.tcm.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tcm.flc.api.feign.UgpServiceFeignClient;
@@ -353,7 +354,12 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 		// 这个表有两个字段所以赋值两字段
 		baseEnterpriseInfo.setSuperviseOrgName(regUnitInfo.getManagementUnit());
 		baseEnterpriseInfo.setGoverningBody(regUnitInfo.getManagementUnit());
-		baseEnterpriseInfo.setDataSources("企业注册");
+		if (UnitDataSourceEnum.NATIONAL.getCode().equals(regUnitInfo.getIsNationwide())) {
+			baseEnterpriseInfo.setDataSources(UnitDataSourceEnum.NATIONAL.getName());
+		} else {
+			baseEnterpriseInfo.setDataSources(UnitDataSourceEnum.SHAANXI.getName());
+		}
+
 		baseEnterpriseInfo.setRegisterType(Objects.requireNonNull(EnterpriseEnums.getEnumByType(type).getTypeName()));
 		if (type.equals(EnterpriseEnums.QY_DW.getType())){
 			baseEnterpriseInfo.setIndustry(regUnitInfo.getRegUnitIc().getIndustryName());

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

@@ -101,6 +101,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
     @Autowired
     private RedisUtil redisUtil;
 
+    @Value("${shaanxi.region.seq:1402458558599125040}")
+    private Long shaanxiRegionSeq;
 
 
     @Transactional
@@ -639,11 +641,11 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
     }
 
     @Override
-    public Collection<RegionModel> getRegionTree(Long parentId) {
+    public Collection<RegionModel> getRegionTree(Long parentId, String isNationwide) {
         tzsAuthServiceImpl.setRequestContext();
         Collection<RegionModel> result = null;
         if(parentId == null) {
-            result = this.getAllRegionTree();
+            result = this.getAllRegionTree(isNationwide);
         } else {
             result = Systemctl.regionClient.querySubAgencyTree(parentId).getResult();
         }
@@ -651,20 +653,26 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
         return result;
     }
 
-    public Collection<RegionModel> getAllRegionTree() {
+    public Collection<RegionModel> getAllRegionTree(String isNationwide) {
         Collection<RegionModel> result;
+        // isNationwide = null 获取陕西省行政区划，其他获取全国行政区划
+        String regionTreeRedisKey = ValidationUtil.isEmpty(isNationwide) ? BizCommonConstant.REGION_TREE_REDIS_KEY : BizCommonConstant.NATIONAL_REGION_TREE_REDIS_KEY;
         // 先从Redis缓存中获取值
-        if (redisUtil.hasKey(BizCommonConstant.REGION_TREE_REDIS_KEY)) {
-            result = JSONObject.parseArray(redisUtil.get(BizCommonConstant.REGION_TREE_REDIS_KEY).toString(), RegionModel.class);
+        if (redisUtil.hasKey(regionTreeRedisKey)) {
+            result = JSONObject.parseArray(redisUtil.get(regionTreeRedisKey).toString(), RegionModel.class);
             return result;
         }
         // 在同步块内再次检查缓存，以避免多个线程同时查不到缓存时重复查询数据库
         synchronized (this) {
-            if (redisUtil.hasKey(BizCommonConstant.REGION_TREE_REDIS_KEY)) {
-                result = JSONObject.parseArray(redisUtil.get(BizCommonConstant.REGION_TREE_REDIS_KEY).toString(), RegionModel.class);
+            if (redisUtil.hasKey(regionTreeRedisKey)) {
+                result = JSONObject.parseArray(redisUtil.get(regionTreeRedisKey).toString(), RegionModel.class);
             } else {
-                result = Systemctl.regionClient.queryForTree(null).getResult();
-                redisUtil.set(BizCommonConstant.REGION_TREE_REDIS_KEY, JSONObject.toJSONString(result));
+                if (ValidationUtil.isEmpty(isNationwide)) {
+                    result = Systemctl.regionClient.querySubAgencyTree(shaanxiRegionSeq).getResult();
+                } else {
+                    result = Systemctl.regionClient.queryForTree(null).getResult();
+                }
+                redisUtil.set(regionTreeRedisKey, JSONObject.toJSONString(result));
             }
         }
 
@@ -681,7 +689,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
         while(iterator.hasNext()) {
             RegionModel regionModel = iterator.next();
             regionModel.setLevel(regionModel.getLevel().trim());
-            regionModel.setLevelName(regionModel.getLevelName().trim());
+            regionModel.setLevelName(ValidationUtil.isEmpty(regionModel.getLevelName()) ? "" : regionModel.getLevelName().trim());
             if(!ValidationUtil.isEmpty(regionModel.getChildren())) {
                 despace(regionModel.getChildren());
             }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -221,6 +221,14 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
     @TableField("\"IS_NOT_XIXIAN\"")
     private String isNotXiXian;
 
+
     @TableField("\"STREET_NAME\"")
     private String streetName;
+
+    /**
+     *
+     */
+    @TableField("\"SAFETY_MANAGER_ID\"")
+    private String safetyManagerId;
+
 }