add:统计变更

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

@@ -189,4 +189,10 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
 
     List<PrincipalPeopleDetail> queryPageListForPrincipalDetailTwo(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch,@Param("ids") ArrayList<String> ids);
 
+    AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
+
+    AllMoney queryPageListForCompany33(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List<String> idList);
+
+    AllMoney queryPageListForCompanyDetail33(@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, @Param("idList") List<String> idList);
+
 }

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

@@ -85,6 +85,10 @@
                 AND pwg.working_group_project LIKE
                 concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
             </if>
+            <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
+                AND pwgs.create_time LIKE
+                concat(#{payWorkingGroupSubletSearch.year},'%')
+            </if>
             <if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
                 AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse}
             </if>
@@ -112,17 +116,17 @@
                 </otherwise>
             </choose>
         </where>
-        group by pwgs.id) pwg1
-        inner join
-        (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)
-        <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
+        group by pwgs.id) pwg1 order by pwg1.create_time desc
+<!--        inner join-->
+<!--        (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)-->
+<!--        <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>
 
 <!-- 工作组详情导出 -->
@@ -147,6 +151,10 @@
                 AND pwg.working_group_project LIKE
                 concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
             </if>
+            <if test="payWorkingGroupSubletSearch.year != null and payWorkingGroupSubletSearch.year != ''">
+                AND pwgs.create_time LIKE
+                concat(#{payWorkingGroupSubletSearch.year},'%')
+            </if>
             <if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
                 AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse}
             </if>
@@ -174,17 +182,17 @@
                 </otherwise>
             </choose>
         </where>
-        group by pwgs.id) pwg1
-        inner join
-        (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)
-        <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
+        group by pwgs.id) pwg1 order by pwg1.create_time desc
+<!--        inner join-->
+<!--        (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)-->
+<!--        <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>
     <select id="queryCompanyPageList" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
         select pwgs.*,pwg.working_group_project as chargeProject from pay_working_group_subitem pwgs

jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java

@@ -220,4 +220,10 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
      */
     IPage<AllProjectStatistics> queryPageListForProject(Page<AllProjectStatistics> page, AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList);
 
+    AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch);
+
+    AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch, List<String> idList);
+
+
+    AllMoney queryPageListForCompanyDetail33(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, List<String> idList);
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayResearchProjectServiceImpl.java

@@ -36,7 +36,7 @@ import java.util.List;
 
 /**
  * @Description: pay_research_project
- * @Author: jeecg-boot
+ * @Author: jeecg-boot<
  * @Date:   2021-12-13
  * @Version: V1.0
  */

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java

@@ -564,6 +564,21 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
         return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch,idList);
     }
 
+    @Override
+    public AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch) {
+        return payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch);
+    }
+
+    @Override
+    public AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch,List<String> idList) {
+        return payWorkingGroupMapper.queryPageListForCompany33(companyComeMoneySearch,idList);
+    }
+
+    @Override
+    public AllMoney queryPageListForCompanyDetail33(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch, List<String> idList) {
+        return payWorkingGroupMapper.queryPageListForCompanyDetail33(companyComeMoneyDetailSearch,idList);
+    }
+
 
     /**
     * @Description 校验是存在关联合同的项目