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 @@ and b.project_name like #{projectName} + + + + and YEAR(a.start_date) = #{year} + and MONTH(a.start_date) = #{month} + order by b.project_name,a.create_date 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 queryWrapper = new LambdaUpdateWrapper<>(); @@ -224,6 +226,12 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl