LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

注释不需要内容

Browse Source
This commit is contained in:
zhangqinlin
2021-10-09 15:57:24 +08:00
parent 98ebd3dd75
commit 8e3ca9d2cc
16 changed files with 189 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java
+5
View File
@@ -11,6 +11,7 @@ import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import org.apache.ibatis.annotations.Param;
import java.util.ArrayList;
import java.util.List;
/**
@@ -55,4 +56,8 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroup
* @Exception
*/
IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listNeedInvoice") List<Integer> listNeedInvoice,@Param("listProjectIds") List<String> listProjectIds);
IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listProjectIds") List<String> listProjectIds);
List<PayWorkGroupSubletStatistics> importExcelStatistics2(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,@Param("id") String id,@Param("selections") ArrayList<String> selections);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupDistributionRecordMapper.xml
+1 -1
View File
@@ -38,7 +38,7 @@
left join oss_file ossf on (pht.fileId=ossf.id)) ail
<where>
<if test="fileName!=null and fileName!=''">
ail.fileName like concat(%,concat(%,#{fileName},%),%)
ail.fileName like concat('%',concat(#{fileName},'%'))
</if>
</where>
order by ail.uploadTime desc
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+15 -15
View File
@@ -199,7 +199,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pwgs.in_account LIKE
@@ -213,7 +213,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pwgs.charge_company_temporary_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pwg.principal_id_a=#{allProjectStatisticsSearch.principalNameId}
@@ -258,7 +258,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pcp.charge_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pcp.in_account LIKE
@@ -266,7 +266,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pcp.charge_company_temporary_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.departCode != null and allProjectStatisticsSearch.departCode != ''">
AND su.org_code =#{allProjectStatisticsSearch.departCode}
@@ -318,7 +318,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pmps.in_account LIKE
@@ -332,7 +332,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pmps.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pmp.director_id=#{allProjectStatisticsSearch.principalNameId}
@@ -377,7 +377,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pm.meeting_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pms.in_account LIKE
@@ -391,7 +391,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pms.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pm.director_id=#{allProjectStatisticsSearch.principalNameId}
@@ -434,7 +434,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND tmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND tmps.in_account LIKE
@@ -451,7 +451,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND tmps.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%')) escape '/'
</if>
<if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
AND tmps.pack=#{allProjectStatisticsSearch.pack}
@@ -1303,7 +1303,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pwgs.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1345,7 +1345,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pcp.charge_project LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pcp.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1387,7 +1387,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pm.meeting_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pms.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1429,7 +1429,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pmp.project_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -1464,7 +1464,7 @@
<where>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND tmp.project_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) escape '/'
</if>
<if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+62
View File
@@ -127,6 +127,68 @@
GROUP BY pwg.principal_id_a) pwg2 on (pwg2.principalId=pwg1.principalId)
order by pwg1.create_time
</select>
<!-- 工作组详情导出 -->
<select id="importExcelStatistics2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
select * from (SELECT
pwgs.id,
pwg.principal_id_a as principalId,
pwg.principal_name_a as principalName,
pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName,
pwgs.receivable_amount AS allMoney,
pwgs.paid_amount AS comeAllMoney,
pwgs.charge_use as chargeUse,
pwgs.create_time
FROM pay_working_group_subitem pwgs
left join pay_working_group pwg on(pwgs.working_group_id=pwg.id)
<where>
pwgs.working_group_id = #{id} and pwgs.id in
<foreach collection="selections" open="(" separator="," close=")" item="item" index="index">
#{item}
</foreach>
<if test="payWorkingGroupSubletSearch.projectName != null and payWorkingGroupSubletSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{payWorkingGroupSubletSearch.projectName},'%'))
</if>
<if test="payWorkingGroupSubletSearch.chargeUse != null and payWorkingGroupSubletSearch.chargeUse != ''">
AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse}
</if>
<if test="payWorkingGroupSubletSearch.chargeCompanyTemporaryName != null and payWorkingGroupSubletSearch.chargeCompanyTemporaryName != ''">
AND pwgs.charge_company_temporary_name LIKE
concat('%',concat(#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%'))
</if>
<if test="payWorkingGroupSubletSearch.inAccountStatue != null and payWorkingGroupSubletSearch.inAccountStatue != ''">
AND pwgs.in_account= #{payWorkingGroupSubletSearch.inAccountStatue}
</if>
<if test="payWorkingGroupSubletSearch.principalNameId != null and payWorkingGroupSubletSearch.principalNameId != ''">
AND pwg.principal_id_a=#{payWorkingGroupSubletSearch.principalNameId}
</if>
<choose>
<when test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != '' and payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney} and if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
</when>
<otherwise>
<if test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != ''">
AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) >= #{payWorkingGroupSubletSearch.allMoney}
</if>
<if test="payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
AND if(pwgs.receivable_amount IS NULL OR pwgs.receivable_amount = '', 0, pwgs.receivable_amount ) <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
</where>
group by pwgs.id) pwg1
inner join
(SELECT
pwg.principal_id_a as principalId
FROM pay_working_group pwg
inner JOIN (select pwgs.id as id,working_group_id
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 working_group_id) pwgss ON (pwg.id=pwgss.working_group_id)
GROUP BY pwg.principal_id_a) pwg2 on (pwg2.principalId=pwg1.principalId)
order by pwg1.create_time
</select>
<select id="queryCompanyPageList" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
select pwgs.*,pwg.working_group_project as chargeProject from pay_working_group_subitem pwgs
left join pay_working_group pwg ON pwgs.working_group_id = pwg.id
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java
+2
View File
@@ -11,6 +11,7 @@ import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
/**
@@ -108,4 +109,5 @@ public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroup
*/
IPage<PayWorkingGroupSubItem> queryCompanyPageList(Page<PayWorkingGroupSubItem> page,PayWorkingGroupSubItem payWorkingGroupSubItem,List<Integer> listNeedInvoice,List<String> listProjectIds);
List<PayWorkGroupSubletStatistics> importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList<String> selections);
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+5
View File
@@ -553,6 +553,11 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
return payWorkingGroupSubItemMapper.queryCompanyPageList( page, payWorkingGroupSubItem,listNeedInvoice, listProjectIds);
}
@Override
public List<PayWorkGroupSubletStatistics> importExcelStatistics2(PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, String id, ArrayList<String> selections) {
return payWorkingGroupSubItemMapper.importExcelStatistics2(payWorkingGroupSubletSearch,id,selections);
}
/**
* @Description 删除项目打包关联，临时企业、联系信息
* @Author lqt