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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -25,6 +25,7 @@ public class DateUtils {
     public static final String MINUTE_ONLY_PATTERN = "mm";
     public static final String HOUR_ONLY_PATTERN = "HH";
     public static final String DATE_PATTERN_NUM = "yyyyMMdd";
+    public static final String DATE_PATTERN_MM = "yyyyMM";
     public static final String CHN_DATE_PATTERN_YEAR = "yyyy年";
     public static final String CHN_DATE_PATTERN_MONTH = "MM月";
     public static final String CHN_DATE_PATTERN = "yyyy年MM月dd日";

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "JgInstallationAccDto", description = "")
+public class JgInstallationAccDto {
+    String opinion;
+
+    JgInstallationNoticeDto model;
+}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -95,13 +96,13 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String propertyUnitName;
 
     @ApiModelProperty(value = "使用单位id")
-    private String useUnitId;
+    private String useUnitCreditCode;
 
     @ApiModelProperty(value = "使用单位")
     private String useUnitName;
 
     @ApiModelProperty(value = "接收机构ID")
-    private String receiveOrgId;
+    private String receiveOrgCreditCode;
 
     @ApiModelProperty(value = "接收机构")
     private String receiveOrgName;
@@ -209,4 +210,7 @@ public class JgInstallationNoticeDto extends BaseDto {
                 + (StringUtils.isEmpty(this.countyName) ? "" : this.countyName)
                 + (StringUtils.isEmpty(this.address) ? "" : this.address);
     }
+   @ApiModelProperty(value = "设备注册代码")
+   private String equRegisterCode;
+
 }

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

@@ -341,4 +341,11 @@ public class JgInstallationNotice extends BaseEntity {
     @TableField("notice_report_url")
     private String noticeReportUrl;
 
+    /**
+     * 设备注册编码
+     */
+    @TableField("equ_register_code")
+    private String equRegisterCode;
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/FlowStatusEnum.java

@@ -25,7 +25,12 @@ public enum  FlowStatusEnum {
     /**
      * 已驳回
      */
-    REJECTED(6614, "已驳回");
+    REJECTED(6614, "已驳回"),
+
+    /**
+     * 已撤回
+     */
+    ROBACK(6615, "已撤回");
 
     private final int code;
 

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

@@ -40,7 +40,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND isn.notice_status in ('6612', '6613', '6614')
+                AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )
             </if>
         </where>
         ORDER BY

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationAccDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+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 java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 安装告知
+ *
+ * @author system_generator
+ * @date 2023-12-12
+ */
+@RestController
+@Api(tags = "安装告知工作流相关Api")
+@RequestMapping(value = "/jg-installation-workflow")
+public class JgInstallationByWorkFlowController {
+
+
+    @Autowired
+    JgInstallationNoticeServiceImpl jgInstallationNoticeServiceImpl;
+
+    /**
+     * 提交
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/submit")
+    @ApiOperation(httpMethod = "POST", value = "安装告知提交", notes = "安装告知提交")
+    public ResponseModel<JgInstallationNoticeDto> submit(@RequestBody JgInstallationNoticeDto model, String op) {
+        // TODO 发起安装告知流程
+        // jgInstallationNoticeServiceImpl.submit(model, op);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 撤销
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/cancel")
+    @ApiOperation(httpMethod = "POST", value = "安装告知撤销", notes = "安装告知撤销")
+    public ResponseModel<JgInstallationNoticeDto> cancel(@RequestBody Map<String, Object> model) {
+        JgInstallationNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgInstallationNoticeDto.class, true);
+        if (Objects.isNull(installationInfo)) {
+            throw new IllegalArgumentException("参数installationInfo不能为空");
+        }
+        jgInstallationNoticeServiceImpl.cancel(installationInfo);
+        return ResponseHelper.buildResponse(installationInfo);
+    }
+
+    /**
+     * 受理
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/accept")
+    @ApiOperation(httpMethod = "POST", value = "安装告知受理", notes = "安装告知受理")
+    public ResponseModel<JgInstallationNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
+        // TODO 受理安装告知流程
+        LinkedHashMap model1 = (LinkedHashMap)model.get("model");
+        LinkedHashMap form = (LinkedHashMap)model1.get("form");
+        LinkedHashMap installationInfo = (LinkedHashMap)form.get("installationInfo");
+        JgInstallationNoticeDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgInstallationNoticeDto.class);
+        jgInstallationNoticeServiceImpl.accept(jgInstallationNoticeDto,op);
+        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/feign/TzsServiceFeignClient.java

+package com.yeejoin.amos.boot.module.jg.biz.feign;
+
+
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+@FeignClient(name = "TZS-YMT-LL", url = "172.16.3.155:11000", path = "/ymt", configuration =
+        {FeignConfiguration.class})
+public interface TzsServiceFeignClient {
+
+
+    /**
+     * 创建监管码及96333
+     *
+     * @param map 请求体
+     * @return
+     */
+    @RequestMapping(value = "/equipment-category/createSupervisorCode", method = RequestMethod.POST)
+    ResponseModel<Map<String, Object>> createCode(@RequestBody Map<String, Object> map);
+
+}

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

@@ -431,31 +431,36 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
         }
 
-        // 默认条件【STATUS===""】
+        // 默认条件【STATUS==="" || null】
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-        meBuilder.must(QueryBuilders.matchQuery("STATUS", "null"));
+        meBuilder.must(QueryBuilders.boolQuery()
+                .should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")))
+                .should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS",""))));
         boolMust.must(meBuilder);
 
         String queryType = map.getString("QUERY_TYPE");
-        // //查询 安装告知【可告知设备列表】【EQU_STATE===""】
+        // //查询 安装告知【可告知设备列表】【EQU_STATE=== null】
         if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "AZ")) {
             BoolQueryBuilder azBuilder = QueryBuilders.boolQuery();
-            azBuilder.must(QueryBuilders.matchQuery("EQU_STATE", 9999));
+            azBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
             boolMust.must(azBuilder);
         }
-        //查询 维保备案【可绑定设备列表】【EQU_STATE==="" && INSPECT_REPORT！==9999(默认占位值)】
+        //查询 维保备案【可绑定设备列表】【(EQU_STATE=== null） && (INSPECT_REPORT！==""  && !null)】
         if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "WB")) {
             BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
-            wbBuilder.must(QueryBuilders.matchQuery("EQU_STATE", 9999));
-            wbBuilder.mustNot(QueryBuilders.existsQuery("INSPECT_REPORT"));
+            wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+            wbBuilder.must(QueryBuilders.existsQuery("INSPECT_REPORT"));
+            wbBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT",""));
             boolMust.must(wbBuilder);
         }
-        //查询 使用登记【可选设备列表】【EQU_STATUS==="" && INSPECT_REPORT！==9999(默认占位值) && USE_ORG_CODE!=="" 】
+        //查询 使用登记【可选设备列表】【EQU_STATUS=== null && (INSPECT_REPORT！=="" && !null) && (USE_ORG_CODE!=="" && !null)】
         if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "SY")) {
             BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
-            syBuilder.must(QueryBuilders.matchQuery("EQU_STATE", 9999));
-            syBuilder.mustNot(QueryBuilders.existsQuery("INSPECT_REPORT"));
-            syBuilder.mustNot(QueryBuilders.existsQuery("USE_ORG_CODE"));
+            syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+            syBuilder.must(QueryBuilders.existsQuery("INSPECT_REPORT"));
+            syBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT",""));
+            syBuilder.must(QueryBuilders.existsQuery("USE_ORG_CODE"));
+            syBuilder.mustNot(QueryBuilders.matchPhraseQuery("USE_ORG_CODE",""));
             boolMust.must(syBuilder);
         }
 
@@ -638,9 +643,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Map<String, Object> map = categoryOtherInfoMapper.selectDataById(id);
         categoryOtherInfoMapper.updateEsStatus(id);
         ESEquipmentCategoryDto dto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
-        // 默认赋值占位，方便es条件搜索时使用
-        dto.setSTATUS("null");
-        dto.setEQU_STATE(9999);
         Optional<ESEquipmentCategoryDto> data = esEquipmentCategory.findById(id);
         if (!ObjectUtils.isEmpty(data)) {
             esEquipmentCategory.deleteById(id);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/logback-dev.xml

@@ -50,7 +50,7 @@
     <logger name="com.yeejoin" level="INFO"/>
 
     <!-- 日志输出级别 -->
-    <root level="DEBUG">
+    <root level="INFO">
         <!-- <appender-ref ref="FILE" /> -->
         <appender-ref ref="STDOUT" />
 <!--        <appender-ref ref="ELK" />-->

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -6,8 +6,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-
 /**
  *  Mapper 接口
  *
@@ -19,5 +17,5 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
 
    public Page<JyjcInspectionApplication> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
 
-   List<JyjcInspectionApplicationEquipModel> listByCategory(@Param("equipClassify") String equipClassify);
+   Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationService.java

@@ -13,5 +13,4 @@ import java.util.List;
 public interface IJyjcInspectionApplicationService {
     void deleteBatchData(List<Long> sequenceNbr);
 
-    List<JyjcInspectionApplicationEquipModel> listByCategory(String equipClassify);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -243,7 +243,13 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "查询指定设备种类的设备列表",   notes = "查询指定设备种类的设备列表")
 	@GetMapping(value = "/listByCategory")
-	public ResponseModel<List<JyjcInspectionApplicationEquipModel>> listByCategory(@RequestParam("equipClassify") String equipClassify) {
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(equipClassify));
+	public ResponseModel<Page<JyjcInspectionApplicationEquipModel>> listByCategory(
+			@RequestParam("current") int current,
+			@RequestParam("size") int size,
+			@RequestParam("equipClassify") String equipClassify) {
+		Page<JyjcInspectionApplicationEquipModel> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(page,equipClassify));
 	}
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionResultController.java

@@ -107,8 +107,8 @@ public class JyjcInspectionResultController extends BaseController {
     @PostMapping(value = "/applicationUnitPage")
     @ApiOperation(httpMethod = "Post", value = "列表页面(报检单位）", notes = "列表页面(报检单位）")
     public ResponseModel<Page<JyjcInspectionResultModel>> applicationUnitQueryForPage(
-            @RequestBody int current, @RequestBody int size,
-			@RequestBody JyjcInspectionResultModel model) {
+            @RequestParam int current, @RequestParam int size,
+            @RequestBody JyjcInspectionResultModel model) {
         Page<JyjcInspectionResultModel> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
@@ -127,7 +127,7 @@ public class JyjcInspectionResultController extends BaseController {
     @PostMapping(value = "/inspectionUnitPage")
     @ApiOperation(httpMethod = "POST", value = "列表页面(检验检测单位）", notes = "列表页面(检验检测单位）")
     public ResponseModel<Page<JyjcInspectionResultModel>> inspectionUnitQueryForPage(
-            @RequestBody int current, @RequestBody int size,
+            @RequestParam int current, @RequestParam int size,
             @RequestBody JyjcInspectionResultModel model) {
         Page<JyjcInspectionResultModel> page = new Page<>();
         page.setCurrent(current);
@@ -135,18 +135,19 @@ public class JyjcInspectionResultController extends BaseController {
         return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultPage(page, model, true));
     }
 
-    /**
-     * 检验结果-上传结果和编辑结果
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/updateResult")
-    @ApiOperation(httpMethod = "PUT", value = "检验结果-上传结果和编辑结果", notes = "检验结果-上传结果和编辑结果")
-    public ResponseModel<JyjcInspectionResultModel> updateJyjcInspectionResult(@RequestBody JyjcInspectionResultModel model) {
-        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateJyjcInspectionResult(model));
-    }
 
+	/**
+	 * 检验结果-上传结果和编辑结果
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/updateResult")
+	@ApiOperation(httpMethod = "PUT", value = "检验结果-上传结果和编辑结果", notes = "检验结果-上传结果和编辑结果")
+	public ResponseModel<JyjcInspectionResultModel> updateJyjcInspectionResult(@RequestBody Map<String, JyjcInspectionResultModel> model) {
+		JyjcInspectionResultModel inspectResult = model.get("inspectResult");
+		return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateJyjcInspectionResult(inspectResult));
+	}
 
     /**
      * 获取设备种类列表

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -176,9 +176,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     }
 
-    @Override
-    public List<JyjcInspectionApplicationEquipModel> listByCategory(String equipClassify) {
-        return getBaseMapper().listByCategory(equipClassify);
+    public Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,String equipClassify) {
+        return getBaseMapper().listByCategory(page,equipClassify);
     }
 
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -72,6 +72,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     public Page<JyjcInspectionResultModel> queryForJyjcInspectionResultPage(Page<JyjcInspectionResultModel> page, JyjcInspectionResultModel model, boolean type) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
                 RequestContext.getToken())).toString(), ReginParams.class);
+        if (ObjectUtils.isEmpty(model)) {
+            model = new JyjcInspectionResultModel();
+        }
         if (type) {
             //检验检测单位分页查询
             model.setInspectionUnitCode(reginParams.getCompany().getCompanyCode());
@@ -134,7 +137,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                 map.put("paramJson", mapParam);
             }
         }
-        return map;
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("inspectResult", map);
+        return resultMap;
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -124,7 +124,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
                 model.setUnitCode(companyBo.getCompanyCode());
                 model.setUnitCodeName(companyBo.getCompanyName());
-                model.setApplicationSeq(createCodeService.createDeviceRegistrationCode(ApplicationFormTypeEnum.JY.getCode()));
+                List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
+                model.setApplicationSeq(codes.get(0));
                 return this.createWithModel(model);
             } else {
                 return this.updateWithModel(model);