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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java

@@ -65,4 +65,6 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
      * @return pdf文件路径
      */
     String generateMaintainNoticeReport(Long sequenceNbr);
+
+    boolean deleteBySequenceNbr(Long[] sequenceNbr);
 }

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

@@ -8,7 +8,12 @@
     </update>
 
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice">
-        select isn.* FROM tzs_jg_maintain_notice isn
+        select
+        isn.*,
+        concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME", '', use."ADDRESS") as fullAddress
+        FROM tzs_jg_maintain_notice isn
+        left join tzs_jg_maintain_notice_eq isneq on isn.sequence_nbr = isneq.equip_transfer_id
+        LEFT JOIN idx_biz_jg_use_info use on isneq.equ_id = use.RECORD
         <where>
             isn.is_delete = 0
             <if test="param != null ">

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

@@ -81,7 +81,7 @@ public class JgMaintainNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维修告知", notes = "根据sequenceNbr删除维修告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long[] sequenceNbr) {
-        return ResponseHelper.buildResponse(iJgMaintainNoticeService.removeById(sequenceNbr));
+        return ResponseHelper.buildResponse(iJgMaintainNoticeService.deleteBySequenceNbr(sequenceNbr));
     }
 
     /**

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

@@ -589,6 +589,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         LambdaQueryWrapper<JgEnableDisableEq> lambda = new QueryWrapper<JgEnableDisableEq>().lambda();
         lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr);
         jgEnableDisableEqService.getBaseMapper().delete(lambda);
+        // 删除暂存时生成的待办
+        commonService.deleteTaskModel(sequenceNbr + "");
     }
 
     public Map<String, Object> getDetail(Long sequenceNbr) {

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -400,6 +402,17 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
     @Override
+    public boolean deleteBySequenceNbr(Long[] sequenceNbr) {
+        this.baseMapper.deleteById(sequenceNbr);
+        LambdaQueryWrapper<JgMaintainNoticeEq> lambda = new QueryWrapper<JgMaintainNoticeEq>().lambda();
+        lambda.eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr);
+        jgMaintainNoticeEqMapper.delete(lambda);
+        // 删除暂存时生成的待办
+        commonService.deleteTaskModel(sequenceNbr + "");
+        return true;
+    }
+
+    @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public List<JgMaintainNotice> saveNotice(String submitType, Map<String, Object> jgMaintainNoticeDtoMap, ReginParams reginParams) {