From 7f73c243f50cf32a769f56fd0fc00ed09121b4ea Mon Sep 17 00:00:00 2001 From: syruan <1555146157@163.com> Date: Fri, 22 Dec 2023 20:27:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B7=A5=E7=A8=8B=E4=B8=8E?= =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E5=8F=8A=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/TmTaskController.java | 13 +++++++++++-- .../bonus/sgzb/app/mapper/TmTaskMapper.java | 4 ++++ .../bonus/sgzb/app/service/TmTaskService.java | 4 ++++ .../app/service/impl/TmTaskServiceImpl.java | 18 ++++++++++++++++++ .../main/resources/mapper/app/TmTaskMapper.xml | 13 ++++++++++++- 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 682bf98c..6fffcb5d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -278,7 +278,16 @@ public class TmTaskController extends BaseController { if (CollUtil.isEmpty(task.getLeaseApplyInfoList())){ return AjaxResult.error("任务表修改完成,但领料任务明细为空，执行失败！"); } - // 先删除原有的领料任务明细 + + // 根据参数判断是否需要修改工程与往来单位 + if (StringUtils.isNotNull(task.getProjectId()) && StringUtils.isNotNull(task.getUnitId())) { + Integer agreementId = tmTaskService.getAgreementIdByUnit(task); + if (StringUtils.isNotNull(agreementId)) { + task.setAgreementId(agreementId); + tmTaskService.updateAgreementByTask(task); // 修改任务关联的协议 + } + } + for (LeaseApplyInfo leaseApplyInfo : task.getLeaseApplyInfoList()) { if (leaseApplyInfo == null || leaseApplyInfo.getId() == null) { continue; @@ -286,7 +295,7 @@ public class TmTaskController extends BaseController { if (StringUtils.isEmpty(leaseApplyInfo.getLeaseApplyDetails())) { continue; } - // 执行删除 + // 先删除之前的领料明细 tmTaskService.deleteDetailsByParentId(String.valueOf(leaseApplyInfo.getId())); // 删除后,插入新地领料任务明细 if (StringUtils.isNotNull(leaseApplyInfo.getId())) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 84af30b0..c5f029ad 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -76,9 +76,13 @@ public interface TmTaskMapper { int insertAgreement(TmTask record); + int updateAgreementByTask(TmTask record); + int selectNumByMonth(Date nowDate); TmTask getLeaseListTmTask(TmTask task); LeaseApplyInfo getLeaseListByLeaseInfo(TmTask task); + + Integer getAgreementIdByUnit(TmTask task); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index 072bf814..5447b5ae 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -41,6 +41,10 @@ public interface TmTaskService{ int updateByPrimaryKeySelective(TmTask record); + Integer getAgreementIdByUnit(TmTask task); + + int updateAgreementByTask(TmTask record); + int updateByPrimaryKey(TmTask record); int updateBatch(List list); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 9c5d98de..2c6953d8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -190,6 +190,24 @@ public class TmTaskServiceImpl implements TmTaskService{ return tmTaskMapper.updateByPrimaryKeySelective(record); } + /** + * @param task 查询条件 + * @return 协议的id + */ + @Override + public Integer getAgreementIdByUnit(TmTask task) { + return tmTaskMapper.getAgreementIdByUnit(task); + } + + /** + * @param record 修改信息 + * @return 结果 + */ + @Override + public int updateAgreementByTask(TmTask record) { + return tmTaskMapper.updateAgreementByTask(record); + } + @Override public int updateByPrimaryKey(TmTask record) { return tmTaskMapper.updateByPrimaryKey(record); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 884de84c..a080d55a 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -442,12 +442,17 @@ - INSERT INTO tm_task_agreement ( `task_id`, `agreement_id`, `create_by`, `create_time`, `company_id` ) VALUES(#{id},#{agreementId},#{createBy},NOW(),#{companyId}) + + + update tm_task_agreement set agreement_id = #{agreementId}, update_time = now() + where task_id = #{taskId} + + + select agreement_id from bm_agreement_info + where unit_id = #{unitId} and project_id = #{projectId} + + \ No newline at end of file