From bd628eeae65dae1a24d3906fbbab3e85e6a134bb Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 14 Apr 2025 12:17:34 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/app/domain/LeaseApplyInfo.java | 3 ++ .../sgzb/app/mapper/LeaseApplyInfoMapper.java | 7 +++ .../app/service/impl/TmTaskServiceImpl.java | 30 +++++++++-- .../mapper/app/LeaseApplyInfoMapper.xml | 51 +++++++++++++++++++ 4 files changed, 86 insertions(+), 5 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java index 48d887f4..59cd093e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java @@ -168,4 +168,7 @@ public class LeaseApplyInfo implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date estimateLeaseTime; + + @ApiModelProperty(value = "任务状态(数据字典)") + private Integer taskStatus; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java index 0060ec8b..0c2a0e6d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java @@ -39,4 +39,11 @@ public interface LeaseApplyInfoMapper { int batchInsert(@Param("list") List list); LeaseApplyInfo selectByTaskIdAndCompIdCq(@Param("taskId") String taskId); + + /** + * 根据任务id更新 + * @param record + * @return + */ + int updateById(LeaseApplyInfo record); } \ No newline at end of file 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 17dde0bc..4083298a 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 @@ -1029,7 +1029,15 @@ public class TmTaskServiceImpl implements TmTaskService { // 再审核领料任务信息表 List leaseApplyInfoList = record.getLeaseApplyInfoList(); if (CollUtil.isNotEmpty(leaseApplyInfoList)) { - List applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId.intValue())).collect(Collectors.toList()); + for (LeaseApplyInfo info : leaseApplyInfoList) { + Integer companyId1 = info.getCompanyId(); + List applyInfoList = new ArrayList<>(); + if (companyId1 != null && companyId1 == 101) { + applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(101)).collect(Collectors.toList()); + } else if (companyId1 != null && companyId1 == 102) { + applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(102)).collect(Collectors.toList()); + } + //List applyInfoList = leaseApplyInfoList.stream().filter(t -> t.getCompanyId().equals(companyId.intValue())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(applyInfoList)) { for (LeaseApplyInfo leaseApplyInfo : applyInfoList) { taskId = leaseApplyInfo.getTaskId(); @@ -1040,6 +1048,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } + } List leaseApplyInfo = tmTaskMapper.getLeaseApplyInfo(taskId); for (LeaseApplyInfo applyInfo : leaseApplyInfo) { if (applyInfo.getStatus() != null) { @@ -1243,12 +1252,22 @@ public class TmTaskServiceImpl implements TmTaskService { } // 修改任务关联的协议 this.updateAgreementByTask(tmTask); - // 分公司审核 - tmTask.setTaskStatus(30); + /*//根据taskId查询任务状态 + TmTask task = tmTaskMapper.selectByPrimaryKey(tmTask.getTaskId()); + if (task != null) { + // 内部审核驳回 + if (task.getTaskStatus() == 100) { + // 待内部审核 + task.setTaskStatus(32); + } else { + // 分公司审核 + tmTask.setTaskStatus(30); + } + } res = tmTaskMapper.updateTmTaskAuditStatus(tmTask); if (res == 0) { throw new RuntimeException("修改任务状态异常"); - } + }*/ //先删除leaseApplyDetail res = deletePreDetailData(tmTask); if (res == 0) { @@ -1331,7 +1350,8 @@ public class TmTaskServiceImpl implements TmTaskService { // 根据taskId查询id LeaseApplyInfo leaseApplyInfo = leaseApplyInfoMapper.selectByTaskIdAndCompId(String.valueOf(task.getTaskId()), task.getCompanyId()); record.setId(leaseApplyInfo.getId()); - res = leaseApplyInfoMapper.updateByPrimaryKeySelective(record); + record.setTaskStatus(task.getTaskStatus()); + res = leaseApplyInfoMapper.updateById(record); /*LeaseApplyInfo leaseApplyInfo1 = task.getLeaseApplyInfo(); String leasePerson = ""; String remark = ""; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml index 238b663c..5678189d 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml @@ -490,6 +490,57 @@ #{item.id,jdbcType=INTEGER} + + update lease_apply_info + + + task_id = #{taskId}, + + + lease_person = #{leasePerson}, + + + phone = #{phone}, + + + `type` = #{type}, + + + + company_audit_by = NULL, + company_audit_time = NULL, + company_audit_remark = NULL, + dept_audit_by = NULL, + dept_audit_time = NULL, + dept_audit_remark = NULL, + + + direct_audit_by = NULL, + direct_audit_time = NULL, + direct_audit_remark = NULL, + + + + create_by = #{createBy}, + + + create_time = #{createTime}, + + + update_by = #{updateBy}, + + + update_time = #{updateTime}, + + + remark = #{remark}, + + + company_id = #{companyId}, + + + where id = #{id} +