fix(jg):改造告知

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -153,11 +154,18 @@ public class JgReformNoticeDto extends BaseDto {
     @ApiModelProperty (value = "是否西咸")
     private String isXixian;
 
-    @ApiModelProperty(value = "设备类别")
+    @ApiModelProperty(value = "设备种类code")
     private String equListCode;
 
+    @ApiModelProperty(value = "设备种类名称")
+    private String equListName;
+
+    @ApiModelProperty(value = "设备类别code")
+    private String equCategoryCode;
+
     @ApiModelProperty(value = "设备类别名称")
-    private String equCategory;
+    private String equCategoryName;
+
     /* ----------------  -------------- */
 
     @ApiModelProperty (value = "告知设备列表")

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

@@ -27,4 +27,7 @@ public class JgReformNoticeEqDto  extends BaseDto {
     @ApiModelProperty(value = "设备id")
     private String equId;
 
+    @ApiModelProperty(value = "告知书编号")
+    private String informNumber;
+
 }

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

@@ -299,16 +299,28 @@ public class JgReformNotice extends BaseEntity {
     @TableField("status")
     private String status;
     /**
-     * 设备类别
+     * 设备种类code
      */
     @TableField(value = "equ_list_code")
     private String equListCode;
 
     /**
+     * 设备种类名称
+     */
+    @TableField(value = "equ_list_name")
+    private String equListName;
+
+    /**
+     * 设备类别code
+     */
+    @TableField(value = "equ_category_code")
+    private String equCategoryCode;
+
+    /**
      * 设备类别名称
      */
-    @TableField(value = "equ_category")
-    private String equCategory;
+    @TableField(value = "equ_category_name")
+    private String equCategoryName;
 
     /**
      *工作流下一节点任务id

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

@@ -23,7 +23,7 @@ public class JgReformNoticeEq extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 设备移交申请id
+     * 改造告知seq
      */
 	@TableField("equip_transfer_id")
     private String equipTransferId;
@@ -34,4 +34,10 @@ public class JgReformNoticeEq extends BaseEntity {
 	@TableField("equ_id")
     private String equId;
 
+    /**
+     * 告知书编号
+     */
+    @TableField("inform_number")
+    private String informNumber;
+
 }

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

@@ -19,6 +19,9 @@
         isn.province_name AS provinceName,
         isn.notice_report_url AS noticeReportUrl,
         isn.equ_list_code as equListCode,
+        isn.equ_list_name as equListName,
+        isn.equ_category_code as equCategoryCode,
+        isn.equ_category_name as equCategoryName,
         isn.create_user_id as createUserId,
         isn.next_execute_user_ids as nextExecuteUserIds,
         isn.instance_id AS instanceId,
@@ -30,24 +33,12 @@
         isn.next_execute_ids as nextExecuteIds,
         isn.instance_status AS instanceStatus,
         isn.inform_number AS informNumber,
-        isn.equ_category AS equCategory,
         isn.next_task_id as nextTaskId,
-        ri.EQU_CODE AS equCode,
-        oi.SUPERVISORY_CODE AS supervisoryCode,
-        oi.CODE96333 as code96333,
         DATE_FORMAT(isn.plan_date,'%Y-%m-%d') AS planDate,
         DATE_FORMAT(isn.notice_date,'%Y-%m-%d') AS noticeDate,
-        DATE_FORMAT(isn.accept_date,'%Y-%m-%d') AS acceptDate,
-        (SELECT name from tz_equipment_category ec WHERE ec.code = ri.EQU_LIST) AS equList,
-        (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_DEFINE) AS equDefine,
-        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME") as fullAddress,
-        ibjui."ADDRESS" as detailedAddress
+        DATE_FORMAT(isn.accept_date,'%Y-%m-%d') AS acceptDate
         FROM
         tzs_jg_reform_notice isn
-        LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
-        LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
-        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.record = re.equ_id
-        LEFT JOIN idx_biz_jg_other_info oi ON  oi.RECORD = re.equ_id
         <where>
             isn.is_delete = false
             <if test="param != null ">
@@ -72,35 +63,6 @@
                 <if test="param.noticeDate != null ">
                     AND isn.notice_date like concat('%',DATE_FORMAT(#{param.noticeDate},'%Y-%m-%d'),'%')
                 </if>
-                <if test="param.equListCode != null and param.equListCode != ''">
-                    AND ri."EQU_LIST" = #{param.equListCode}
-                </if>
-                <if test="param.equCategory != null and param.equCategory != ''">
-                    AND ri."equ_category" = #{param.equCategory}
-                </if>
-                <if test="param.equDefine != null and param.equDefine != ''">
-                    AND ri."EQU_DEFINE" = #{param.equDefine}
-                </if>
-                <if test="param.equCode != null and param.equCode != ''">
-                    AND ri."EQU_CODE" like concat('%',#{param.equCode},'%')
-                </if>
-                <if test="param.informNumber != null and param.informNumber != ''">
-                    AND isn.inform_number like concat('%',#{param.informNumber},'%')
-                </if>
-                <if test="param.supervisoryCode != null and param.supervisoryCode != ''">
-                    AND oi.SUPERVISORY_CODE like concat('%',#{param.supervisoryCode},'%')
-                </if>
-                <if test="param.code96333 != null and param.code96333 != ''">
-                    AND oi.CODE96333 like concat('%',#{param.code96333},'%')
-                </if>
-                <if test="param.address != null and param.address != ''">
-                    AND (
-                    ibjui."PROVINCE_NAME" LIKE CONCAT('%', #{param.address}, '%')
-                    OR ibjui."CITY_NAME" LIKE CONCAT('%', #{param.address}, '%')
-                    OR ibjui."COUNTY_NAME" LIKE CONCAT('%', #{param.address}, '%')
-                    OR ibjui."STREET_NAME" LIKE CONCAT('%', #{param.address}, '%')
-                    )
-                </if>
                 <if test="param.useUnitCreditCode != null and param.useUnitCreditCode != ''">
                     AND isn.use_unit_credit_code = #{param.useUnitCreditCode}
                 </if>
@@ -110,6 +72,12 @@
                 <if test="param.receiveCompanyCode != null and param.receiveCompanyCode != ''">
                     AND isn.receive_company_code = #{param.receiveCompanyCode}
                 </if>
+                <if test="param.equListCode != null and param.equListCode != ''">
+                    AND isn.equ_list_code = #{param.equListCode}
+                </if>
+                <if test="param.equCategoryCode != null and param.equCategoryCode != ''">
+                    AND isn.equ_category_code = #{param.equCategoryCode}
+                </if>
             </if>
             <if test="type == 'supervision'">
                 AND (isn.notice_status in ('6612', '6613', '6614', '6616') )

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

@@ -73,13 +73,8 @@ public class JgReformByWorkFlowController {
     @TycloudOperation (ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/accept")
     @ApiOperation (httpMethod = "POST", value = "改造告知受理", notes = "改造告知受理")
-    public ResponseModel<JgReformNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
-        // TODO 受理改造告知流程
-        LinkedHashMap model1 = (LinkedHashMap) model.get("model");
-        String opinion = (String) model.get("opinion");
-        JgReformNoticeDto jgReformNoticeDto = JSON.parseObject(JSON.toJSONString(model1), JgReformNoticeDto.class);
-        jgReformNoticeDto.setRemark(opinion);
-        jgReformNoticeService.accept(jgReformNoticeDto, op);
-        return ResponseHelper.buildResponse(null);
+    public ResponseModel<Boolean> accept(@RequestBody Map<String, Object> map, String op) {
+        jgReformNoticeService.accept(map, op);
+        return ResponseHelper.buildResponse(Boolean.TRUE);
     }
 }

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

@@ -1402,7 +1402,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     if (ValidationUtil.isEmpty(map.get("useUnitCreditCode")) || ValidationUtil.isEmpty(map.get("county"))) {
                         throw new BadRequest("请先选择使用单位，施工区县等信息");
                     }
-                    map.put("USE_UNIT_CREDIT_CODE", map.get("useUnitCreditCode"));
+                    map.put("USE_UNIT_CREDIT_CODE", String.valueOf(map.get("useUnitCreditCode")).split("_")[0]);
                     map.put(USE_PLACE_CODE, String.valueOf(map.get("county")).split("_")[0]);
                 } else if (ValidationUtil.equals(queryType, "GZ_WX")) {// 维修告知设备选择 - 业务限制
                     // 设备类别（EQU_CATEGORY）、安装单位（USC_UNIT_CREDIT_CODE）、选择的使用单位（USE_UNIT_CREDIT_CODE）、选择的区县（USE_PLACE_CODE）过滤数据