feat(jg): 安装告知-详情编辑、删除等接口

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

@@ -3,18 +3,13 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-12
  */
@@ -51,10 +46,10 @@ public class JgInstallationNotice extends BaseEntity {
     private Integer deviceNum;
 
     /**
-     * 安装单位id
+     * 安装单位统一信用代码
      */
-	@TableField("install_unit_id")
-    private String installUnitId;
+    @TableField("install_unit_credit_code")
+    private String installUnitCreditCode;
 
     /**
      * 安装许可证编号
@@ -159,10 +154,10 @@ public class JgInstallationNotice extends BaseEntity {
     private Date installEndDate;
 
     /**
-     * 产权单位id
+     * 产权单位统一信用代码
      */
-	@TableField("property_unit_id")
-    private String propertyUnitId;
+    @TableField("property_unit_credit_code")
+    private String propertyUnitCreditCode;
 
     /**
      * 产权单位
@@ -171,10 +166,10 @@ public class JgInstallationNotice extends BaseEntity {
     private String propertyUnitName;
 
     /**
-     * 使用单位id
+     * 使用单位统一信用代码
      */
-	@TableField("use_unit_id")
-    private String useUnitId;
+    @TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
 
     /**
      * 使用单位
@@ -183,10 +178,10 @@ public class JgInstallationNotice extends BaseEntity {
     private String useUnitName;
 
     /**
-     * 接收机构ID
+     * 接收机构统一信用代码
      */
-	@TableField("receive_org_id")
-    private String receiveOrgId;
+    @TableField("receive_org_credit_code")
+    private String receiveOrgCreditCode;
 
     /**
      * 接收机构

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgInstallationNoticeMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
-import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Collection;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Mapper 接口
  *
@@ -18,5 +16,21 @@ import org.apache.ibatis.annotations.Param;
  * @date 2023-12-12
  */
 public interface JgInstallationNoticeMapper extends CustomBaseMapper<JgInstallationNotice> {
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param model 查询参数
+     * @param type  类型：enterprise-企业端、supervision-监管端
+     * @return 安装告知列表
+     */
     Page<JgInstallationNotice> queryForPage(Page<JgInstallationNotice> page, @Param("param") JgInstallationNoticeDto model, @Param("type") String type);
+
+    /**
+     * 根据安装告知编号查询设备、设计、制造等信息
+     *
+     * @param sequenceNbr 安装告知编号
+     */
+    @MapKey("sequenceNbr")
+    List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
 }

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

@@ -7,14 +7,11 @@
             isn.sequence_nbr AS sequenceNbr,
             isn.apply_no AS applyNo,
             isn.notice_date AS noticeDate,
-            isn.use_unit_id       AS useUnitId,
             isn.use_unit_name AS useUnitName,
-            isn.receive_org_id    AS receiveOrgId,
             isn.receive_org_name AS receiveOrgName,
             isn.region_no AS regionNo,
             isn.address AS address,
             isn.notice_status AS noticeStatus,
-            isn.install_unit_id   AS installUnitId,
             isn.install_unit_name AS installUnitName
         FROM
             tzs_jg_installation_notice isn
@@ -45,4 +42,46 @@
         isn.notice_date DESC
     </select>
 
+    <select id="queryEquipInformation" resultType="java.util.Map">
+        select
+            isn.sequence_nbr AS sequenceNbr,
+            ri.equ_list AS equList,
+            ri.equ_category AS equCategory,
+            ri.EQU_DEFINE AS equDefine,
+            -- 产品编号
+            ri.product_name AS productName,
+            ri.brand_name AS brandName,
+            ri.equ_type AS equType,
+            ri.equ_price AS equPrice,
+            ri.product_photo AS productPhoto,
+            di.design_unit_credit_code AS designUnitCreditCode,
+            di.design_unit_name AS designUnitName,
+            di.design_license_num AS designLicenseNum,
+            di.design_use_date AS designUseDate,
+            di.design_date AS designDate,
+            di.drawing_do AS drawingDo,
+            di.appraisal_unit AS appraisalUnit,
+            di.appraisal_date AS appraisalDate,
+            di.design_doc AS designDoc,
+            di.design_standard AS designStandard,
+            fi.produce_unit_credit_code AS produceUnitCreditCode,
+            fi.produce_unit_name AS produceUnitName,
+            fi.produce_license_num AS produceLicenseNum,
+            fi.factory_num AS factoryNum,
+            fi.produce_date AS produceDate,
+            fi.imported AS imported,
+            fi.produce_country AS produceCountry,
+            fi.factory_standard AS factoryStandard,
+            fi.product_quality_yield_prove AS productQualityYieldProve,
+            fi.ins_use_maintain_explain AS insUseMaintainExplain
+        FROM
+            tzs_jg_installation_notice isn
+                LEFT JOIN tzs_jg_relation_equip re ON re.business_id = isn.sequence_nbr
+                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equip_id
+                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equip_id
+                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equip_id
+                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equip_id
+        WHERE
+            isn.sequence_nbr = #{sequenceNbr}
+    </select>
 </mapper>

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
@@ -20,8 +16,10 @@ 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 java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 安装告知
@@ -53,27 +51,28 @@ public class JgInstallationNoticeController extends BaseController {
     /**
      * 根据sequenceNbr更新
      *
-     * @param sequenceNbr 主键
-     * @return
+     * @param model 安装告知
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
+    @PutMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新安装告知", notes = "根据sequenceNbr更新安装告知")
-    public ResponseModel<JgInstallationNoticeDto> updateBySequenceNbrJgInstallationNotice(@RequestBody JgInstallationNoticeDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.updateWithModel(model));
+    public ResponseModel<JgInstallationNoticeDto> updateBySequenceNbrJgInstallationNotice(@RequestBody Map<String, Object> model) {
+        JgInstallationNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgInstallationNoticeDto.class, true);
+        if (Objects.isNull(installationInfo)) {
+            throw new IllegalArgumentException("参数installationInfo不能为空");
+        }
+        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.updateInstallationNotice(installationInfo));
     }
 
     /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
-     * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
+    @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除安装告知", notes = "根据sequenceNbr删除安装告知")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long[] sequenceNbr) {
         return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.removeById(sequenceNbr));
     }
 
@@ -81,16 +80,29 @@ public class JgInstallationNoticeController extends BaseController {
      * 根据sequenceNbr查询
      *
      * @param sequenceNbr 主键
-     * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
+    @GetMapping(value = "/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个安装告知", notes = "根据sequenceNbr查询单个安装告知")
-    public ResponseModel<JgInstallationNoticeDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.queryBySeq(sequenceNbr));
+    public ResponseModel<Map<String,
+            Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.queryBySequenceNbr(sequenceNbr));
     }
 
     /**
+     * 根据sequenceNbr批量删除
+     *
+     * @param sequenceNbrs 主键
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/batchDelete")
+    @ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
+    public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
+        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.deleteForBatch(sequenceNbrs));
+    }
+
+
+    /**
      * 列表分页查询
      *
      * @param current 当前页

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRelationEquip;
 import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
+import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -28,13 +34,70 @@ import java.util.stream.Collectors;
 public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationNoticeDto, JgInstallationNotice, JgInstallationNoticeMapper> implements IJgInstallationNoticeService {
 
     @Autowired
+    JgRelationEquipMapper jgRelationEquipMapper;
+    @Autowired
     private JgInstallationNoticeMapper jgInstallationNoticeMapper;
-
     @Autowired
-    JgRelationEquipMapper jgRelationEquipMapper;
+    private ICommonService commonService;
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return 安装告知
+     */
+    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
+        // 安装告知信息
+        JgInstallationNotice notice = jgInstallationNoticeMapper.selectById(sequenceNbr);
+        Map<String, Object> installationInfo = BeanUtil.beanToMap(notice);
+
+        installationInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
+        installationInfo.put("city", notice.getCity() + "_" + notice.getCityName());
+        installationInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
+
+        // 设备信息
+        List<Map<String, Object>> equipmentInfos = jgInstallationNoticeMapper.queryEquipInformation(sequenceNbr);
+
+        return new HashMap<String, Map<String, Object>>() {{
+            this.put("installationInfo", installationInfo);
+            this.put("equipmentInfo", equipmentInfos.get(0));
+        }};
+    }
+
+    /**
+     * 更新安装告知
+     *
+     * @param noticeDto 安装告知
+     */
+    @SuppressWarnings("rawtypes")
+    public JgInstallationNoticeDto updateInstallationNotice(JgInstallationNoticeDto noticeDto) {
+        this.convertField(noticeDto);
+
+        ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+        dto.setProcessDefinitionKey("installationNotification");
+        dto.setBusinessKey("1");
+        AjaxResult ajaxResult;
+        try {
+            ajaxResult = Workflow.taskClient.startByVariable(dto);
+            String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
+            noticeDto.setInstanceId(instanceId);
+            noticeDto.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+            JgInstallationNotice bean = new JgInstallationNotice();
+            BeanUtils.copyProperties(noticeDto, bean);
+            jgInstallationNoticeMapper.updateById(bean);
+        } catch (Exception e) {
+            log.error("提交失败：{}", e);
+        }
+        return noticeDto;
+    }
 
     /**
      * 分页查询
+     *
+     * @param page  分页对象
+     * @param model 查询参数
+     * @param type  类型：enterprise-企业端、supervision-监管端
+     * @return 安装告知列表
      */
     public Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type) {
         Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type);
@@ -63,6 +126,22 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         return this.queryForList("", false);
     }
 
+    /**
+     * 批量删除
+     *
+     * @param sequenceNbrs 主键
+     * @return 是否删除成功
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteForBatch(Long[] sequenceNbrs) {
+        if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) {
+            return false;
+        }
+        Collection<JgInstallationNotice> jgInstallationNotices = this.listByIds(Arrays.asList(sequenceNbrs));
+        jgInstallationNotices.forEach(notice -> notice.setIsDelete(true));
+        return this.updateBatchById(jgInstallationNotices);
+    }
+
     @Override
     public void saveNotice(JgInstallationNoticeDto model) {
 
@@ -75,7 +154,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         // 调用方法
         List<String> applyNoList = new ArrayList<>();
         Random random = new Random();
-        for (int i = 0 ; i< deviceList.size(); i++) {
+        for (int i = 0; i < deviceList.size(); i++) {
             applyNoList.add(String.valueOf(random.nextInt()));
         }
 
@@ -111,7 +190,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private void convertField(JgInstallationNoticeDto model) {
         // 处理图片
         String proxyStatementAttachment = convertImageUrl(model.getInstallContractAttachmentList());
-        String installContractAttachment =convertImageUrl(model.getProxyStatementAttachmentList());
+        String installContractAttachment = convertImageUrl(model.getProxyStatementAttachmentList());
         model.setProxyStatementAttachment(proxyStatementAttachment);
         model.setInstallContractAttachment(installContractAttachment);
 
@@ -172,7 +251,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
     }
 
-    private String convertImageUrl (List<Map<String, String>> urlList) {
+    private String convertImageUrl(List<Map<String, String>> urlList) {
         String urls = "";
         if (!CollectionUtils.isEmpty(urlList)) {
             urls = urlList.stream().map(map -> map.get("url")).collect(Collectors.joining(","));