项目周报-检索框修改

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>

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();

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;
 }