Merge branch 'develop_tzs_register' of…

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,6 +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/CommonController.java

@@ -15,7 +15,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -65,6 +64,21 @@ public class CommonController extends BaseController {
 
 
 	/**
+	 * 工作台接收机构树
+	 * @param bizType 业务类型：notice-告知类， register-登记类
+	 * @return 树
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{bizType}/receive-unit/tree")
+	@ApiOperation(httpMethod = "GET", value = "接收机构树", notes = "接收机构树")
+	public ResponseModel<Object> getNoticeReceiveTree(@PathVariable String bizType) {
+		return ResponseHelper.buildResponse(commonService.getReceiveUnitTree(bizType));
+	}
+
+
+
+
+	/**
 	 * 获取行政审批局树
 	 *
 	 * @return
@@ -278,4 +292,18 @@ public class CommonController extends BaseController {
 	}
 
 
+	/**
+	 * 校验EQUCODE的唯一性
+	 * @param equCode  EQUCODE
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/checkUniquenessOfEQUCODE")
+	@ApiOperation(httpMethod = "GET", value = "校验EQUCODE的唯一性", notes = "校验EQUCODE的唯一性")
+	public ResponseModel<Object> checkUniquenessOfEQUCODE(String equCode) {
+		Boolean bool = commonService.checkUniquenessOfEQUCODE(equCode);
+		return ResponseHelper.buildResponse(bool);
+	}
+
+
 }

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

@@ -157,11 +157,18 @@ 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")

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);
@@ -53,4 +55,13 @@ public interface ICommonService {
     List<LinkedHashMap> getCreatTreeByInstallation();
 
     List<LinkedHashMap> getCreatTreeByInstallationTree();
+
+    /**
+     * 接收机构树
+     * @return  List<Map>
+     * @param bizType 业务类型： notice-告知类， register-登记类
+     */
+    List<LinkedHashMap> getReceiveUnitTree(String bizType);
+
+    Boolean checkUniquenessOfEQUCODE(String equCode);
 }

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

@@ -677,7 +677,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);
@@ -789,8 +789,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/JgChangeRegistrationTransferServiceImpl.java

@@ -1008,7 +1008,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      *
      * @param sequenceNbr
      */
-    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response) {
+    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType) {
         Map<String, Object> exportParamsMap = new HashMap<>();
         //查询移装变更详情
         JgChangeRegistrationTransfer transfer = this.getById(sequenceNbr);
@@ -1139,8 +1139,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
-        //调用生成使用登记证
-        iCommonService.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/JgChangeRegistrationUnitServiceImpl.java

@@ -899,7 +899,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);
@@ -977,7 +977,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/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;
@@ -651,7 +650,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);
@@ -761,8 +760,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-jg/amos-boot-module-jg-biz/src/main/resources/templates/installation-notification-report.ftl

@@ -578,7 +578,7 @@
                                             <w:sz w:val="24"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>设备注册代码</w:t>
+                                        <w:t>设备代码</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>