From 0c2209a1345619ad8be1f12f9cb082ca1c267239 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Mon, 31 Mar 2025 17:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=91=A8=E6=8A=A5-=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml | 6 ++++++
 .../service/impl/HuzhouUploadfileinfoServiceImpl.java     | 8 ++++++++
 .../easy/admin/modules/huzhou/vo/HuzhouWorkreportOV.java  | 1 +
 3 files changed, 15 insertions(+)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml
index 7a897fe..76b1749 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouWorkreportMapper.xml
@@ -13,6 +13,12 @@
                 <bind name="projectName" value="'%' + info.projectName + '%'" />
                 and b.project_name like  #{projectName}
             </if>
+            <if test="info.yearMonth != null and info.yearMonth != ''">
+                <bind name="year" value="info.yearMonth.split('-')[0]" />
+                <bind name="month" value="info.yearMonth.split('-')[1]" />
+                and YEAR(a.start_date) = #{year}
+                and MONTH(a.start_date) = #{month}
+            </if>
         </where>
         order by b.project_name,a.create_date
     </select>
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java
index 13bd450..391fcbf 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java
@@ -71,6 +71,8 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
     private HuzhouProjectinfoMapper huzhouProjectinfoMapper;
     @Autowired
     private SysDictService sysDictService;
+    @Autowired
+    private HuzhouProjectinfoMoneyMapper projectinfoMoneyMapper;
 
     public void modifyUploadFile(MultipartFile[] files, String projectid, String stage) throws IOException {
         LambdaUpdateWrapper<HuzhouUploadfileinfo> queryWrapper = new LambdaUpdateWrapper<>();
@@ -224,6 +226,12 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
             huzhouPlaninfo2.setIsfinish("2");
             huzhouPlaninfo2.setActualEndTime(new Date());
             planinfoMapper.updateById(huzhouPlaninfo2);
+
+            HuzhouProjectinfoMoney huzhouProjectinfoMoney = new HuzhouProjectinfoMoney();
+            huzhouProjectinfoMoney.setId(projectinfo.getId());
+            huzhouProjectinfoMoney.setApprovalTotalMoney(urtEstimatedAmount);
+            huzhouProjectinfoMoney.setEditDate(new Date());
+            projectinfoMoneyMapper.updateById(huzhouProjectinfoMoney);
             return;
         }
         String taskId = workFlow.getTask().getId();
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouWorkreportOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouWorkreportOV.java
index ff88808..db27820 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouWorkreportOV.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouWorkreportOV.java
@@ -8,4 +8,5 @@ public class HuzhouWorkreportOV extends HuzhouWorkreport {
     private String projectName;
     private String projectContacts;
     private String supervisorContactor;
+    private String yearMonth;
 }