全所统计

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

@@ -133,5 +133,5 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
      * @param companyComeMoneyDetailSearch
      * @return
      */
-    IPage<CompanyComeMoneyDetail> queryPageListForCompanyDetail(Page<CompanyComeMoneyDetail> page,@Param("companyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
+    IPage<CompanyComeMoneyDetail> queryPageListForCompanyDetail(Page<CompanyComeMoneyDetail> page,@Param("CompanyComeMoneyDetailSearch") CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
 }

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

@@ -1028,7 +1028,7 @@
         FROM pay_working_group_subitem pwgs
         left join pay_working_group pwg on (pwgs.working_group_id=pwg.id)
         <where>
-            pwgs.charge_company_temporary_id = #{companyComeMoneyDetailSearch.chargeCompanyTemporaryId}
+            pwgs.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyTemporaryId}
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
                 AND pwg.working_group_project LIKE
                 concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
@@ -1102,7 +1102,7 @@
         pms.charge_use as chargeUse
         FROM pay_meeting pm left join pay_meeting_situation pms on(pm.id=pms.meeting_id)
         <where>
-            pm.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyTemporaryId}
+            pms.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyTemporaryId}
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
                 AND pm.meeting_name LIKE
                 concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
@@ -1139,7 +1139,7 @@
         pmps.charge_use as chargeUse
         FROM pay_member_project pmp left join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
         <where>
-            pmp.director_id = #{CompanyComeMoneyDetailSearch.principalNameId}
+            pmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyTemporaryId}
             <if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
                 AND pmp.project_name LIKE
                 concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))

jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java

@@ -42,9 +42,6 @@ public class AllProjectStatisticsSearch {
     @ApiModelProperty(value = "打包")
     private String pack;
 
-    @ApiModelProperty(value = "付款状态")
-    private String inAccountStatue;
-
     @ApiModelProperty(value = "项目负责人id")
     private String principalNameId;