Merge branch 'develop_tzs_register_to_0715' of…

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

@@ -30,6 +30,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -112,6 +113,7 @@ public class JgUseRegistrationManageController extends BaseController {
     public ResponseModel<JgUseRegistrationManage> detail(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryDetailBySeq(sequenceNbr));
     }
+
     /**
      * 根据sequenceNbr查询使用登记证操作流水---使用登记证详情用
      *
@@ -124,9 +126,11 @@ public class JgUseRegistrationManageController extends BaseController {
     public ResponseModel<List<Map<String, String>>> operationRecord(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.operationRecord(sequenceNbr));
     }
+
     /**
      * 根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用
      * 分页接口
+     *
      * @param sequenceNbr 主键
      * @return
      */
@@ -134,9 +138,9 @@ public class JgUseRegistrationManageController extends BaseController {
     @GetMapping(value = "/detail/equList")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用", notes = "根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用")
     public ResponseModel<Page<JSONObject>> certificateEquList(@RequestParam(value = "current") int current,
-                                                                  @RequestParam(value = "size") int size,
-                                                                  @RequestParam(value = "sequenceNbr") String sequenceNbr) {
-        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.certificateEquList(current,size,sequenceNbr));
+                                                              @RequestParam(value = "size") int size,
+                                                              @RequestParam(value = "sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.certificateEquList(current, size, sequenceNbr));
     }
 
     /**
@@ -238,4 +242,25 @@ public class JgUseRegistrationManageController extends BaseController {
                 .collect(Collectors.toList());
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquForPageByCertificateSeqList(collect, current, size));
     }
+
+    /**
+     * 证的 相关打印
+     * @param response 响应
+     * @param printType certificateNormalPrint：使用登记证 普打
+     *                  certificateNestedPrint：使用登记证 套打
+     *                  useFlagNormalPrint：使用标志 普打
+     *                  useFlagNestedPrint：使用标志 套打
+     *                  exportSummaryTable；工业管道和气瓶 汇总表下载
+     * @param certificateSeq 证书的seq
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/printCertificate")
+    @ApiOperation(httpMethod = "GET", value = "使用登记证 相关打印", notes = "使用登记证 相关打印")
+    public void printCertificate(HttpServletResponse response,
+                                 @RequestParam(value = "printType") String printType,
+                                 @RequestParam(value = "certificateSeq") String certificateSeq) {
+        jgUseRegistrationManageServiceImpl.printCertificate(response,printType, certificateSeq);
+    }
+
+
 }

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

@@ -123,6 +123,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL = "WHETHER_SKID_MOUNTED_PRESSURE_VESSEL";
     // 检验检测机构
     public static final String INSPECTION_AND_TESTING_INSTITUTIONS = "检验检测机构";
+    // 设备纳管  纳管：true 未纳管：false
+    public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
     // 需要转化成jsonObject的附件字段
     public static String[] jsonFields = {"insOtherAccessories", "installContractAttachment", "installProxyStatementAttachment"};
     @Autowired
@@ -1307,6 +1309,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             seqBuilder.must(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", strings));
             boolMust.must(seqBuilder);
         }
+
+        if (!ObjectUtils.isEmpty(map.getString(IS_INTO_MANAGEMENT))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString(IS_INTO_MANAGEMENT));
+            pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
+            boolMust.must(pBuilder);
+        }
         if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
             String param = QueryParser.escape(map.getString(EQU_CATEGORY));