diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 5152ba0..ff7156c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -551,9 +551,8 @@ public class TmTaskController extends BaseController { tmTaskService.edit(task); return AjaxResult.success("修改成功"); } catch (Exception e) { - return AjaxResult.error("修改失败"); + return AjaxResult.error("修改失败"+e.getMessage()); } - } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index 5eef3c8..6b44bfb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -71,7 +71,7 @@ public interface TmTaskService{ int updateByPrimaryKeySelective(TmTask record); - int edit(TmTask tmTask); + int edit(TmTask tmTask) throws Exception; int editCq(TmTask tmTask); Integer getAgreementIdByUnit(TmTask task); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 1cf0938..530a21e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -1021,7 +1021,7 @@ public class TmTaskServiceImpl implements TmTaskService { @Override @Transactional(rollbackFor = Exception.class) - public int edit(TmTask tmTask) { + public int edit(TmTask tmTask) throws Exception { int res = 0; //修改任务信息(tm_task) this.updateByPrimaryKeySelective(tmTask); @@ -1053,6 +1053,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } catch (Exception e) { log.error(e.getMessage(), e); + throw new Exception(e.getMessage()); } return res; } @@ -1198,6 +1199,9 @@ public class TmTaskServiceImpl implements TmTaskService { Long taskId = task.getTaskId(); if (CollUtil.isNotEmpty(leaseApplyDetails)) { for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + if (leaseApplyDetail.getPreNum() == null || leaseApplyDetail.getPreNum().equals(0)) { + return 0; + } LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo(); if (leaseApplyDetail.getCompanyId() == null) { leaseApplyInfos = leaseApplyInfoMapper.selectByTaskIdAndCompIdCq(String.valueOf(taskId)); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index cc983cf..203b87e 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -624,7 +624,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ma_type mt LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id WHERE - EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId} AND sai2.STATUS = '0' and sai.lease_type = 0) + EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId} + AND sai2.STATUS = '0' and sai.lease_type = 0 and sai2.num > 0) GROUP BY mt.type_id