fix(jg):1、业务删除接口调整，2、压力管道查询恢复到覆盖前

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

@@ -45,14 +45,6 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
     Page<Map<String,Object>> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page,String sort, JgMaintainNoticeDto model, ReginParams reginParams);
 
     /**
-     * 批量删除
-     *
-     * @param sequenceNbrs 主键
-     * @return 是否删除成功
-     */
-    Boolean deleteForBatch(Long[] sequenceNbrs);
-
-    /**
      * 保存维修告知单
      *
      * @param model      数据

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

@@ -406,22 +406,18 @@
         and ui."DATA_SOURCE" like 'jg%'
         and NOT(ui."EQU_STATE" is not null )
         and NOT(ri."USE_ORG_CODE" is not null )
-        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" >
-            and ui."USE_UNIT_CREDIT_CODE" =  #{jsonObject.useUnitCreditCode}
+        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
+        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
+            and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
+        </if>
+        <if test="jsonObject.record != null and jsonObject.record != ''">
+            and ui."RECORD" = #{jsonObject.record}
+        </if>
+        <if test="jsonObject.record == null">
+            and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
+            v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
+            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
         </if>
-        <choose>
-            <when test="jsonObject.record != null and jsonObject.record != ''">
-                and ui."RECORD" =  #{jsonObject.record}
-            </when>
-            <otherwise>
-                <if test="records != null and records.size() > 0">
-                    and ui."RECORD" not in
-                    <foreach collection="records" item="record" separator="," open="(" close=")">
-                        #{record}
-                    </foreach>
-                </if>
-            </otherwise>
-        </choose>
         ORDER BY ui.REC_DATE DESC
     </select>
 

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

@@ -94,7 +94,8 @@ public class JgInstallationNoticeController extends BaseController {
         // 删除待办 + 中止流程
         JgInstallationNotice jgInstallationNotice = iJgInstallationNoticeService.getBaseMapper().selectById(sequenceNbr);
         commonService.deleteTaskModel(String.valueOf(sequenceNbr),jgInstallationNotice.getInstanceId());
-        return ResponseHelper.buildResponse(iJgInstallationNoticeService.removeById(sequenceNbr));
+        jgInstallationNotice.setIsDelete(true);
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.updateById(jgInstallationNotice));
     }
 
     /**

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

@@ -95,7 +95,7 @@ public class JgMaintainNoticeController extends BaseController {
     @ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
     public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
         try {
-            return ResponseHelper.buildResponse(iJgMaintainNoticeService.deleteForBatch(sequenceNbrs));
+            return ResponseHelper.buildResponse(iJgMaintainNoticeService.deleteBySequenceNbr(sequenceNbrs));
         } catch (Exception e) {
             return CommonResponseUtil.failure(e.getMessage());
         }

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

@@ -1294,7 +1294,9 @@ public class CommonServiceImpl implements ICommonService {
         // 删除暂存的代办
         deleteTasksByRelationId(businessId);
         // 删除流程中的代办 及 中止流程
-        deleteTasksAndStopProcess(instanceId, "发起人主动删除业务单");
+        if(!ObjectUtils.isEmpty(instanceId)){
+            deleteTasksAndStopProcess(instanceId, "发起人主动删除业务单");
+        }
     }
 
     /**

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

@@ -707,8 +707,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         LambdaQueryWrapper<JgEnableDisableEq> lambda = new QueryWrapper<JgEnableDisableEq>().lambda();
         lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr);
         jgEnableDisableEqService.getBaseMapper().delete(lambda);
-        // 删除暂存时生成的待办
-        commonService.deleteTasksByRelationId(sequenceNbr + "");
+        // 删除待办
+        JgEnableDisable jgEnableDisable = this.baseMapper.selectById(sequenceNbr);
+        commonService.deleteTaskModel(sequenceNbr + "",jgEnableDisable.getInstanceId());
     }
 
     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/JgEquipTransferServiceImpl.java

@@ -746,7 +746,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         Collection<JgEquipTransfer> jgEquipTransfers = this.listByIds(Arrays.asList(ids));
         for (JgEquipTransfer notice : jgEquipTransfers) {
             notice.setIsDelete(true);
-            commonService.deleteTasksByRelationId(String.valueOf(notice.getSequenceNbr()));
+            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()),notice.getInstanceId());
         }
         return this.updateBatchById(jgEquipTransfers);
     }

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

@@ -432,6 +432,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         // });
         // 删除暂存的待办
         jgInstallationNotices.forEach(installationNotice -> {
+            installationNotice.setIsDelete(true);
             commonService.deleteTaskModel(String.valueOf(installationNotice.getSequenceNbr()),installationNotice.getInstanceId());
         });
         return this.updateBatchById(jgInstallationNotices);

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

@@ -337,27 +337,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         return this.queryForList("", false);
     }
 
-    /**
-     * 批量删除
-     *
-     * @param sequenceNbrs 主键
-     * @return 是否删除成功
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteForBatch(Long[] sequenceNbrs) {
-        if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) {
-            return false;
-        }
-        Collection<JgMaintainNotice> jgMaintainNotices = this.listByIds(Arrays.asList(sequenceNbrs));
-        jgMaintainNotices.forEach(notice -> {
-            if (StringUtils.hasText(notice.getInspectionUnitCreditCode())) {
-                throw new IllegalStateException("所选数据已存在流程，不能删除！");
-            }
-            notice.setIsDelete(true);
-        });
-        return this.updateBatchById(jgMaintainNotices);
-    }
 
     /**
      * 打印维修告知单

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

@@ -202,7 +202,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         //     notice.setIsDelete(true);
         // });
         // 删除待办及中止流程
-        jgTransferNotices.forEach(jgTransferNotice -> commonService.deleteTaskModel(String.valueOf(jgTransferNotice.getSequenceNbr()),jgTransferNotice.getInstanceId()));
+        jgTransferNotices.forEach(jgTransferNotice -> {
+            jgTransferNotice.setIsDelete(true);
+            commonService.deleteTaskModel(String.valueOf(jgTransferNotice.getSequenceNbr()),jgTransferNotice.getInstanceId());
+        });
         return this.updateBatchById(jgTransferNotices);
     }