fix bug:工作组显示bug

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml

@@ -133,11 +133,15 @@
         allMoney,paid_amount  AS comeAllMoney,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwg1s
         inner join pay_payment_record ppr on(pwg1s.id=ppr.project_id)
-        WHERE ppr.payment_date like concat('%',#{payWorkingGroupSearch.year},'%') group by pwg1s.id
+        <if test="payWorkingGroupSearch.year !='' and payWorkingGroupSearch.year !=null">
+        WHERE ppr.payment_date like concat('%',#{payWorkingGroupSearch.year},'%')
+        </if>
+        group by pwg1s.id
         ) pwg2s group by pwg2s.working_group_id
         )
         pwgs on(pwg.id=pwgs.working_group_id)
         <where>
+            pwgs.comeAllMoney is not null
             <if test="ids != null and ids != ''">
                 pwg.principal_id_a in
                 <foreach item="item" open="(" separator="," close=")" collection="ids">
@@ -179,7 +183,10 @@
         allMoney,SUM(paid_amount) AS comeAllMoney,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwg1s
         inner join pay_payment_record ppr on(pwg1s.id=ppr.project_id)
-        WHERE ppr.payment_date like concat('%',#{payWorkingGroupSearch.year},'%') group by pwg1s.working_group_id)
+        <if test="payWorkingGroupSearch.year !='' and payWorkingGroupSearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{payWorkingGroupSearch.year},'%')
+        </if>
+        group by pwg1s.working_group_id)
         pwgs on(pwg.id=pwgs.working_group_id)
         <where>
             <if test="ids != null and ids != ''">
@@ -544,30 +551,44 @@
         select pwgs.id as id,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwgs
         inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{allProjectStatisticsSearch.year},'%')
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         GROUP BY pwgs.id
         union ALL
         SELECT
         pcp.id as id,max(ppr.payment_date) as payment_date
-        FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id) WHERE ppr.payment_date like  concat('%',#{allProjectStatisticsSearch.year},'%')
+        FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         group by pcp.id
         union all
         SELECT
         pmps.id as id,max(ppr.payment_date) as payment_date from
         pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{allProjectStatisticsSearch.year},'%')
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         group by pmps.id
         union all
         SELECT
         pms.id,max(ppr.payment_date) as payment_date from pay_meeting_situation  pms inner join  pay_payment_record ppr on(pms.id=ppr.project_id)
-        WHERE ppr.payment_date like  concat('%',#{allProjectStatisticsSearch.year},'%')
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         group by pms.id
         union all
         SELECT
         tmps.id,max(ppr.payment_date) as payment_date from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on(tmps.id=ppr.project_id)
-        WHERE ppr.payment_date like  concat('%',#{allProjectStatisticsSearch.year},'%')
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         group by tmps.id
         ) pprr on(pp.id=pprr.id) group by pp.id  order by pprr.payment_date desc
 
@@ -879,33 +900,47 @@
         </where>) pp
         inner join
         (
-        select pwgs.id as id
+        select pwgs.id as id,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwgs
         inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{allProjectStatisticsSearch.year},'%')
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         GROUP BY pwgs.id
         union ALL
         SELECT
-        pcp.id as id
-        FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id) WHERE ppr.payment_date like  concat('%',#{allProjectStatisticsSearch.year},'%')
+        pcp.id as id,max(ppr.payment_date) as payment_date
+        FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         group by pcp.id
         union all
         SELECT
-        pmps.id as id from
+        pmps.id as id,max(ppr.payment_date) as payment_date from
         pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{allProjectStatisticsSearch.year},'%')
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         group by pmps.id
         union all
         SELECT
-        pms.id from pay_meeting_situation  pms inner join  pay_payment_record ppr on(pms.id=ppr.project_id)
-        WHERE ppr.payment_date like  concat('%',#{allProjectStatisticsSearch.year},'%')
+        pms.id,max(ppr.payment_date) as payment_date from pay_meeting_situation  pms inner join  pay_payment_record ppr on(pms.id=ppr.project_id)
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         group by pms.id
         union all
         SELECT
-        tmps.id from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on(tmps.id=ppr.project_id)
-        WHERE ppr.payment_date like  concat('%',#{allProjectStatisticsSearch.year},'%')
+        tmps.id,max(ppr.payment_date) as payment_date from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on(tmps.id=ppr.project_id)
+        <if test="allProjectStatisticsSearch.year != null and allProjectStatisticsSearch.year != ''">
+            WHERE ppr.payment_date like
+            concat('%',#{allProjectStatisticsSearch.year},'%')
+        </if>
         group by tmps.id
         ) pprr on(pp.id=pprr.id) group by pp.id  order by pp.createTime
 
@@ -1023,7 +1058,10 @@
         from (select
         pwg1s.id,working_group_id,receivable_amount,paid_amount,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwg1s inner join pay_payment_record ppr on(pwg1s.id=ppr.project_id)
-        WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%') group by pwg1s.id) pwgs2
+        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">
+            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')
+        </if>
+        group by pwg1s.id) pwgs2
         GROUP BY pwgs2.working_group_id
         ) pwgs
         ON (pwg.id=pwgs.working_group_id)
@@ -1055,9 +1093,9 @@
         FROM
         (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,max(ppr.payment_date) as payment_date from
         pay_common_project pcp inner join pay_payment_record ppr on(pcp.id=ppr.project_id)
-        where
-        ppr.payment_date like
-        concat('%',#{principalPeopleSearch.year},'%')
+        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">
+            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')
+        </if>
         group by pcp.id
         ) pcp1
         left JOIN sys_user su on(pcp1.principal_id=su.id) left join sys_depart sd
@@ -1091,8 +1129,9 @@
         select pmp1s.id,pmp1s.project_id as projectId,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from
         pay_member_project_subitem pmp1s
         inner join pay_payment_record ppr on(pmp1s.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{principalPeopleSearch.year},'%')
+        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">
+            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')
+        </if>
         GROUP BY pmp1s.id
         ) pmp1s group by pmp1s.projectId ) pmps on(pmp.id=pmps.projectId)
         left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
@@ -1125,8 +1164,9 @@
         from
         (select pm1s.id,meeting_id,amount_receivable,paid_amount,max(ppr.payment_date) as payment_date from pay_meeting_situation pm1s
         inner join pay_payment_record ppr on(pm1s.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{principalPeopleSearch.year},'%')
+        <if test="principalPeopleSearch.year !='' and principalPeopleSearch.year != null">
+            WHERE ppr.payment_date like concat('%',#{principalPeopleSearch.year},'%')
+        </if>
         GROUP BY pm1s.id) pms1 group by pms1.meeting_id) pms on(pm.id=pms.meeting_id)
         left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
 
@@ -1402,25 +1442,36 @@
    (select pwgs.id as id,max(ppr.payment_date) as payment_date
       from pay_working_group_subitem pwgs
       inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)
+      <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">
       WHERE ppr.payment_date like
       concat('%',#{principalPeopleDetailSearch.year},'%')
+      </if>
       GROUP BY pwgs.id
       union ALL
       SELECT
       pcp.id as id,max(ppr.payment_date) as payment_date
-      FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id) WHERE ppr.payment_date like  concat('%',#{principalPeopleDetailSearch.year},'%')
+      FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)
+    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">
+        WHERE ppr.payment_date like
+        concat('%',#{principalPeopleDetailSearch.year},'%')
+    </if>
       group by pcp.id
       union all
       SELECT
       pmps.id as id,max(ppr.payment_date) as payment_date from
        pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)
-      WHERE ppr.payment_date like
-      concat('%',#{principalPeopleDetailSearch.year},'%')
+    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">
+        WHERE ppr.payment_date like
+        concat('%',#{principalPeopleDetailSearch.year},'%')
+    </if>
       group by pmps.id
       union all
       SELECT
       pms.id as id ,max(ppr.payment_date) as payment_date  from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)
-      WHERE ppr.payment_date like  concat('%',#{principalPeopleDetailSearch.year},'%')
+    <if test="principalPeopleDetailSearch.year !='' and principalPeopleDetailSearch.year !=null">
+        WHERE ppr.payment_date like
+        concat('%',#{principalPeopleDetailSearch.year},'%')
+    </if>
       group by pms.id) pprr on(pp.id=pprr.id)
       order by pprr.payment_date desc
   </select>
@@ -1626,7 +1677,10 @@
         from (select
         pwg1s.id,working_group_id,receivable_amount,paid_amount,charge_company_id,pwg1s.create_time,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwg1s inner join pay_payment_record ppr on(pwg1s.id=ppr.project_id)
-        WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%') group by pwg1s.id) pwgs2 left join pay_working_group pwg
+        <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%')
+        </if>
+        group by pwg1s.id) pwgs2 left join pay_working_group pwg
         ON (pwg.id=pwgs2.working_group_id)
         <where>
             <if test="idList != null and idList != ''">
@@ -1656,9 +1710,9 @@
         FROM
         (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.charge_company_id,max(ppr.payment_date) as payment_date from
         pay_common_project pcp inner join pay_payment_record ppr on(pcp.id=ppr.project_id)
-        where
-        ppr.payment_date like
-        concat('%',#{companyComeMoneySearch.year},'%')
+        <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%')
+        </if>
         group by pcp.id
         ) pcp1
         left join pay_company_management pcm on(pcm.id=pcp1.charge_company_id)
@@ -1686,8 +1740,9 @@
         select pmp2s.id,pmp2s.project_id as projectId,amount_receivable,paid_amount,pmp2s.create_time,company_id,company_name,max(ppr.payment_date) as payment_date from
         pay_member_project_subitem pmp2s
         inner join pay_payment_record ppr on(pmp2s.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{companyComeMoneySearch.year},'%')
+        <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%')
+        </if>
         GROUP BY pmp2s.id) pmp1s left join pay_member_project pmp on(pmp.id=pmp1s.projectId)
           <where>
               <if test="idList != null and idList != ''">
@@ -1717,8 +1772,9 @@
         from (select pm1s.meeting_id,amount_receivable as allMoney ,paid_amount as comeAllMoney,pm1s.create_time,company_id,company_name,max(ppr.payment_date) as payment_date
          from pay_meeting_situation pm1s
         inner join pay_payment_record ppr on(pm1s.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{companyComeMoneySearch.year},'%')
+        <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%')
+        </if>
         GROUP BY pm1s.id) pms left join pay_meeting pm  on(pm.id=pms.meeting_id)
         <where>
             <if test="idList != null and idList != ''">
@@ -1747,8 +1803,10 @@
         from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id,max(ppr.payment_date) as payment_date
         from tb_member_project_subitem tmp1s
         inner join pay_payment_record ppr on(tmp1s.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{companyComeMoneySearch.year},'%') group by tmp1s.id) tpms
+        <if test="companyComeMoneySearch.year !='' and companyComeMoneySearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{companyComeMoneySearch.year},'%')
+        </if>
+         group by tmp1s.id) tpms
         left join tb_member_project tmp on(tmp.id=tpms.project_id)
         <where>
             <if test="idList != null and idList != ''">
@@ -2090,30 +2148,39 @@
         (select pwgs.id as id,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwgs
         inner join pay_payment_record ppr on(pwgs.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        </if>
         GROUP BY pwgs.id
         union ALL
         SELECT
         pcp.id as id,max(ppr.payment_date) as payment_date
-        FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id) WHERE ppr.payment_date like  concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        FROM pay_common_project pcp inner JOIN   pay_payment_record ppr on(pcp.id=ppr.project_id)
+        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        </if>
         group by pcp.id
         union all
         SELECT
         pmps.id as id,max(ppr.payment_date) as payment_date from
         pay_member_project_subitem pmps  inner join pay_payment_record ppr on(pmps.id=ppr.project_id)
-        WHERE ppr.payment_date like
-        concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        </if>
         group by pmps.id
         union all
         SELECT
         pms.id as id,max(ppr.payment_date) as payment_date from pay_meeting_situation  pms inner join  pay_payment_record ppr on (pms.id=ppr.project_id)
-        WHERE ppr.payment_date like  concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        </if>
         group by pms.id
         union all
         SELECT
         tmps.id,max(ppr.payment_date) as payment_date from tb_member_project_subitem  tmps inner join  pay_payment_record ppr on(tmps.id=ppr.project_id)
-        WHERE ppr.payment_date like  concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        <if test="CompanyComeMoneyDetailSearch.year !='' and CompanyComeMoneyDetailSearch.year !=null">
+            WHERE ppr.payment_date like concat('%',#{CompanyComeMoneyDetailSearch.year},'%')
+        </if>
         group by tmps.id
         ) pprr on(pp.projectId=pprr.id)
         order by pprr.payment_date desc

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml

@@ -110,7 +110,10 @@
         (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwgs
         left join pay_payment_record ppr on(pwgs.id=ppr.project_id)
-        WHERE ppr.payment_date like  concat('%',#{payWorkingGroupSubletSearch.year},'%') GROUP BY pwgs.id
+        <if test="payWorkingGroupSubletSearch.year !='' and payWorkingGroupSubletSearch.year !=null">
+        WHERE ppr.payment_date like  concat('%',#{payWorkingGroupSubletSearch.year},'%')
+        </if>
+        GROUP BY pwgs.id
         ) pwg2 on (pwg2.id=pwg1.id)
       order by pwg2.payment_date
     </select>
@@ -169,7 +172,10 @@
         (select pwgs.id as id,working_group_id,max(ppr.payment_date) as payment_date
         from pay_working_group_subitem pwgs
         left join pay_payment_record ppr on(pwgs.id=ppr.project_id)
-        WHERE ppr.payment_date like  concat('%',#{payWorkingGroupSubletSearch.year},'%') GROUP BY pwgs.id
+        <if test="payWorkingGroupSubletSearch.year !='' and payWorkingGroupSubletSearch.year !=null">
+            WHERE ppr.payment_date like  concat('%',#{payWorkingGroupSubletSearch.year},'%')
+        </if>
+         GROUP BY pwgs.id
         ) pwg2 on (pwg2.id=pwg1.id)
         order by pwg2.payment_date
     </select>
@@ -201,5 +207,4 @@
         </where>
         group by pwgs.id order by pwgs.create_time desc
     </select>
-
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java

@@ -71,7 +71,7 @@ public class AllProjectStatisticsController {
     @RequiresPermissions("wholeInstituteStatistics:search")
     @ApiOperation(value = "全所统计搜索-分页列表查询", notes = "全所统计搜索-详情分页列表查询")
     @GetMapping(value = "/list")
-    public Result<?> list(@Valid AllProjectStatisticsSearch allProjectStatisticsSearch,
+    public Result<?> list( AllProjectStatisticsSearch allProjectStatisticsSearch,
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
@@ -99,12 +99,6 @@ public class AllProjectStatisticsController {
             } else {
                 throw new JeroBootException("权限异常");
             }
-
-            if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                allProjectStatisticsSearch.setYear(year);
-            }
             Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
             IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList );
             HashMap<String, Object> hashMap = new HashMap<>();
@@ -176,11 +170,6 @@ public class AllProjectStatisticsController {
             } else {
                 throw new JeroBootException("权限异常");
             }
-            if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                allProjectStatisticsSearch.setYear(year);
-            }
             Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
             IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
             HashMap<String, Object> hashMap = new HashMap<>();
@@ -320,11 +309,6 @@ public class AllProjectStatisticsController {
     public ModelAndView excelProject( AllProjectStatisticsSearch allProjectStatisticsSearch) {
             allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
             allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
-            if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                allProjectStatisticsSearch.setYear(year);
-            }
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
             //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java

@@ -64,14 +64,6 @@ public class CompanyComeMoneyStatisticsController {
     public Result<?> list(CompanyComeMoneySearch companyComeMoneySearch,
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-
-
-
-        if (companyComeMoneySearch.getYear() == null || companyComeMoneySearch.getYear().equals("")) {
-            Calendar calendar = Calendar.getInstance();
-            String year = String.valueOf(calendar.get(Calendar.YEAR));
-            companyComeMoneySearch.setYear(year);
-        }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
         //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -136,11 +128,6 @@ public class CompanyComeMoneyStatisticsController {
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
         companyComeMoneyDetailSearch.setProjectName( oConvertUtils.replaceAllPercent(companyComeMoneyDetailSearch.getProjectName()));
-        if (companyComeMoneyDetailSearch.getYear() == null || companyComeMoneyDetailSearch.getYear().equals("")) {
-            Calendar calendar = Calendar.getInstance();
-            String year = String.valueOf(calendar.get(Calendar.YEAR));
-            companyComeMoneyDetailSearch.setYear(year);
-        }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
         //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -204,11 +191,6 @@ public class CompanyComeMoneyStatisticsController {
     @GetMapping(value = "/excel")
     @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计")
     public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) {
-            if (companyComeMoneySearch.getYear() == null || companyComeMoneySearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                companyComeMoneySearch.setYear(year);
-            }
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
             //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -244,11 +226,6 @@ public class CompanyComeMoneyStatisticsController {
     @GetMapping(value = "/excelDetail")
     @ApiOperation(value = "企业来款详情统计-导出统计", notes = "企业来款详情统计-导出统计")
     public ModelAndView excelDetail( CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) {
-            if (companyComeMoneyDetailSearch.getYear() == null || companyComeMoneyDetailSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                companyComeMoneyDetailSearch.setYear(year);
-            }
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
             //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java

@@ -76,11 +76,6 @@ public class PayWorkingGroupStatisticsController {
 
         payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
         Page<PayWorkingGroupStatistics> page = new Page<>(pageNo, pageSize);
-        if(payWorkingGroupSearch.getYear()==null|| payWorkingGroupSearch.getYear().equals("")){
-            Calendar calendar= Calendar.getInstance();
-            String year = String.valueOf(calendar.get(Calendar.YEAR));
-            payWorkingGroupSearch.setYear(year);
-        }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
         //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -148,11 +143,6 @@ public class PayWorkingGroupStatisticsController {
     public ModelAndView exportXls2( PayWorkingGroupSearch payWorkingGroupSearch,  @RequestParam(name = "selections", required = false) String selections) {
         if (StringUtils.isBlank(selections)) {
             payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
-            if (payWorkingGroupSearch.getYear() == null || payWorkingGroupSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                payWorkingGroupSearch.setYear(year);
-            }
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
             //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -191,11 +181,6 @@ public class PayWorkingGroupStatisticsController {
         }else {
             ArrayList<String> strings = new ArrayList<>(Arrays.asList(selections.split(",")));
             payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
-            if (payWorkingGroupSearch.getYear() == null || payWorkingGroupSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                payWorkingGroupSearch.setYear(year);
-            }
             //根据不同角色加载不同列表的参数
             List<String> idList = new ArrayList<>();
             //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -256,11 +241,6 @@ public class PayWorkingGroupStatisticsController {
                          ) {
         payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
         Page<PayWorkGroupSubletStatistics> page = new Page<>(pageNo, pageSize);
-        if(payWorkingGroupSubletSearch.getYear()==null|| payWorkingGroupSubletSearch.getYear().equals("")){
-            Calendar calendar= Calendar.getInstance();
-            String year = String.valueOf(calendar.get(Calendar.YEAR));
-            payWorkingGroupSubletSearch.setYear(year);
-        }
         IPage<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.queryPageList2(page, payWorkingGroupSubletSearch,id);
         double sum=0;
         double sumTwo =0;
@@ -306,12 +286,6 @@ public class PayWorkingGroupStatisticsController {
             @RequestParam(name = "selections", required = false) String selections
     ) {
 
-        if (payWorkingGroupSubletSearch.getYear() == null || payWorkingGroupSubletSearch.getYear().equals("")) {
-            Calendar calendar = Calendar.getInstance();
-            String year = String.valueOf(calendar.get(Calendar.YEAR));
-            payWorkingGroupSubletSearch.setYear(year);
-        }
-
         if (ObjectUtils.isEmpty(selections)) {
             payWorkingGroupSubletSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubletSearch.getChargeCompanyTemporaryName()));
             List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch, id);

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java

@@ -67,11 +67,11 @@ public class PrincipalPeopleStatisticsController {
                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
-            if (principalPeopleSearch.getYear() == null || principalPeopleSearch.getYear().equals("")) {
-                Calendar calendar = Calendar.getInstance();
-                String year = String.valueOf(calendar.get(Calendar.YEAR));
-                principalPeopleSearch.setYear(year);
-            }
+//            if (principalPeopleSearch.getYear() == null || principalPeopleSearch.getYear().equals("")) {
+//                Calendar calendar = Calendar.getInstance();
+//                String year = String.valueOf(calendar.get(Calendar.YEAR));
+//                principalPeopleSearch.setYear(year);
+//            }
         //根据不同角色加载不同列表的参数
         List<String> idList = new ArrayList<>();
         //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -137,11 +137,11 @@ public class PrincipalPeopleStatisticsController {
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
-        if (principalPeopleDetailSearch.getYear() == null || principalPeopleDetailSearch.getYear().equals("")) {
-            Calendar calendar = Calendar.getInstance();
-            String year = String.valueOf(calendar.get(Calendar.YEAR));
-            principalPeopleDetailSearch.setYear(year);
-        }
+//        if (principalPeopleDetailSearch.getYear() == null || principalPeopleDetailSearch.getYear().equals("")) {
+//            Calendar calendar = Calendar.getInstance();
+//            String year = String.valueOf(calendar.get(Calendar.YEAR));
+//            principalPeopleDetailSearch.setYear(year);
+//        }
             Page<PrincipalPeopleDetail> page = new Page<>(pageNo, pageSize);
             IPage<PrincipalPeopleDetail> pageList = payWorkingGroupService.queryPageListForPrincipalDetail(page, principalPeopleDetailSearch);
             HashMap<String, Object> hashMap = new HashMap<>();