From bbfd7c77701a12c2b0345b0735a696d4ed0277e6 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Mon, 23 Jun 2025 15:18:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=94=AF=E4=BB=98=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuzhouContractinfoController.java | 5 +++-- .../huzhou/dao/HuzhouContractinfoMapper.java | 5 ++++- .../dao/mapping/HuzhouContractinfoMapper.xml | 9 ++++++++- .../service/IHuzhouContractinfoService.java | 4 +++- .../impl/HuzhouContractinfoServiceImpl.java | 20 +++++++++++++++++-- .../impl/HuzhouPlaninfofileServiceImpl.java | 18 +---------------- 6 files changed, 37 insertions(+), 24 deletions(-) diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java index 5aa1bba..feaab81 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouContractinfoController.java @@ -156,8 +156,9 @@ public class HuzhouContractinfoController { @GetMapping("/setSortedContracts") - public Result setSortedContracts(){ - contractinfoService.setSortedContracts(); + public Result setSortedPlanContracts(){ + contractinfoService.setSortedPlanContracts(); + contractinfoService.setSortedRealContracts(); return Result.ok("根据合同支付日期进行排序"); } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouContractinfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouContractinfoMapper.java index db9a0fa..15ca0ef 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouContractinfoMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouContractinfoMapper.java @@ -24,7 +24,10 @@ public interface HuzhouContractinfoMapper extends BaseMapper Map getTotalByProjectIds(@Param("projectIds") List projectIds); // 给已经存在的合同进行排序 - List getSortedContracts(); + List getSortedPlanContracts(); + + // 给已经存在的合同进行排序 + List getSortedRealContracts(); int updateSortFlag(@Param("id") String id, @Param("sortFlag") int sortFlag); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml index 149b576..4c68ded 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouContractinfoMapper.xml @@ -281,13 +281,20 @@ - SELECT * FROM `guoyan_huzhou`.`huzhou_contractinfo` WHERE flag = '计划' ORDER BY `project_id`, `pay_date` ASC LIMIT 0, 1000 + UPDATE huzhou_contractinfo diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java index 9194d06..7bfc3f9 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java @@ -59,5 +59,7 @@ public interface IHuzhouContractinfoService extends IService HuzhouContractinfo getContractInfoByProjectId(String projectId); - void setSortedContracts(); + void setSortedPlanContracts(); + + void setSortedRealContracts(); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index 1075e34..3cc340a 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -636,8 +636,8 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl contracts = contractinfoMapper.getSortedContracts(); + public void setSortedPlanContracts() { + List contracts = contractinfoMapper.getSortedPlanContracts(); Map counterMap = new HashMap<>(); @@ -652,5 +652,21 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl contracts = contractinfoMapper.getSortedRealContracts(); + + Map counterMap = new HashMap<>(); + + for (HuzhouContractinfo contract : contracts) { + String projectId = contract.getProjectId(); + Integer count = counterMap.getOrDefault(projectId, 0) + 1; + contract.setSortFlag(count); + counterMap.put(projectId, count); + // 可以选择批量更新，也可以先收集完再更新 + contractinfoMapper.updateSortFlag(contract.getId(), contract.getSortFlag()); + } + } + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index 22d6c5e..ddc6c8b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -124,15 +124,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl counterMap = new HashMap<>(); - for (HuzhouContractinfo contract : contractList) { - String projectId = contract.getProjectId(); - Integer count = counterMap.getOrDefault(projectId, 0) + 1; - contract.setSortFlag(count); - counterMap.put(projectId, count); - log.info("projectId:{}--->第:{}笔支付", projectId, count); - } + //立项审批和合同签订 金额输入 HuzhouProjectinfoMoney huzhouProjectinfoMoney = new HuzhouProjectinfoMoney(); if(approvalMoneyFieldsValue!=null){ @@ -733,14 +725,6 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl counterMap = new HashMap<>(); - for (HuzhouContractinfo contract : collectForSave) { - String projectId = contract.getProjectId(); - Integer count = counterMap.getOrDefault(projectId, 0) + 1; - contract.setSortFlag(count); - counterMap.put(projectId, count); - log.info("projectId:{}--->第:{}笔支付", projectId, count); - } contractinfoService.saveBatch(collectForSave); log.info("新增原有合同信息:{}", collectForSave);