diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index f7755822..9e2b7cf6 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -16,8 +16,8 @@
SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId
from
pay_case_committee pe
- left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
- left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
+ inner JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
+ inner JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
AND pt.name LIKE CONCAT('%',#{name},'%')
@@ -29,15 +29,15 @@
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
- group by pe.id
+
limit #{pageNo},#{pageSize}
SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId
from
pay_case_committee pe
- left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
- left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
+ inner JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
+ inner JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
AND pt.name LIKE CONCAT('%',#{name},'%')
@@ -49,7 +49,7 @@
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
- group by pe.id
+
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java
index 36db8524..7ba1ba62 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java
@@ -36,7 +36,7 @@ public interface constant {
/**
* 用户角色(企业人员)
*/
- public static final String QYRY="qyry";
+ public static final String XMFZR="xmfzr";
}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java
index f2955078..b2cb36b0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java
@@ -79,21 +79,20 @@ public class PayWorkingGroupStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
- //科长
- if(constant.BMFZR.equals(roleCode)) {
- String orgCode = sysUser.getOrgCode();
- List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
- idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
- //所领导或者超级管理员
- } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)||constant.QYXXWHRY.equals(roleCode)) {
- idList=null;
- //企业职员项目负责人
- }else if( constant.QYRY.equals(roleCode)){
- String userId = sysUser.getId();
- idList.add(userId);
- }else {
- idList=null;
- }
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+ //科长
+ if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
+ String orgCode = sysUser.getOrgCode();
+ List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
+ idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
+ //所领导或者超级管理员
+ } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+ idList=null;
+ //企业职员项目负责人
+ }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
+ String userId = sysUser.getId();
+ idList.add(userId);
+ }
IPage pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList);
List records = pageList.getRecords();
for (PayWorkingGroupStatistics payWorkingGroupStatistics:records){
@@ -154,20 +153,19 @@ public class PayWorkingGroupStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
- if(constant.BMFZR.equals(roleCode)) {
+ if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
- } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)||constant.QYXXWHRY.equals(roleCode)) {
+ } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
idList=null;
//企业职员项目负责人
- }else if( constant.QYRY.equals(roleCode)){
+ }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
- }else {
- idList=null;
}
List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,idList);
for (PayWorkingGroupStatistics payWorkingGroupStatistics:pageList){
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
index 90c4ed2c..77cf44cc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
@@ -35,10 +35,10 @@ public class PayWorkingGroupSubletSearch {
private String year;
@ApiModelProperty(value = "来款用途")
- private int chargeUse;
+ private String chargeUse;
@ApiModelProperty(value = "付款状态")
- private int inAccountStatue;
+ private String inAccountStatue;
@ApiModelProperty(value = "项目负责人id")
private String principalNameId;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
index 8a491fd6..250d6550 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
@@ -80,7 +80,7 @@ public interface PayWorkingGroupMapper extends BaseMapper {
*/
List queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
/**
- * @Description 企业来款查询
+ * @Description 企业来款查询和全所统计
* @Author zql
* @Date 2021/9/17
* @Param
@@ -89,15 +89,7 @@ public interface PayWorkingGroupMapper extends BaseMapper {
*/
IPage queryPageList3( Page page,@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch,@Param("idList") List idList);
- /**
- * @Description 全所统计
- * @Author zql
- * @Date 2021/9/17
- * @Param
- * @Return
- * @Exception
- */
- IPage queryPageList3(Page page ,@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
+
/**
* 个人来款统计
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 15170606..021f8771 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -120,7 +120,7 @@
pwgs on(pwg.id=pwgs.working_group_id)
- pwg.principal_id_a inq
+ pwg.principal_id_a in
#{item}
@@ -130,15 +130,15 @@
- AND pwgs.allMoney > #{payWorkingGroupSearch.allMoney} and pwgs.allMoney
+ AND pwgs.allMoney >= #{payWorkingGroupSearch.allMoney} and pwgs.allMoney =
#{payWorkingGroupSearch.allMoneyTwo}
- AND pwgs.allMoney > #{payWorkingGroupSearch.allMoney}
+ AND pwgs.allMoney >= #{payWorkingGroupSearch.allMoney}
- AND pwgs.allMoney #{payWorkingGroupSearch.allMoneyTwo}
+ AND pwgs.allMoney = #{payWorkingGroupSearch.allMoneyTwo}
@@ -191,6 +191,12 @@
FROM pay_working_group pwg right join pay_working_group_subitem pwgs on(pwg.id=pwgs.working_group_id)
left JOIN sys_user su on(pwg.principal_id_a=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+
+ pwg.principal_id_a in
+
+ #{item}
+
+
AND pwg.working_group_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -217,15 +223,15 @@
- AND pwgs.receivable_amount > #{allProjectStatisticsSearch.allMoney} and pwgs.receivable_amount
+ AND pwgs.receivable_amount >= #{allProjectStatisticsSearch.allMoney} and pwgs.receivable_amount =
#{allProjectStatisticsSearch.allMoneyTwo}
- AND pwgs.receivable_amount > #{allProjectStatisticsSearch.allMoney}
+ AND pwgs.receivable_amount >= #{allProjectStatisticsSearch.allMoney}
- AND pwgs.receivable_amount #{allProjectStatisticsSearch.allMoneyTwo}
+ AND pwgs.receivable_amount = #{allProjectStatisticsSearch.allMoneyTwo}
@@ -244,6 +250,12 @@
FROM pay_common_project pcp left JOIN sys_user su on(pcp.principal_id=su.id) left join sys_depart sd
on(su.org_code=sd.org_code)
+
+ pcp.principal_id in
+
+ #{item}
+
+
AND pcp.charge_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -271,15 +283,15 @@
- AND pcp.receivable_amount > #{allProjectStatisticsSearch.allMoney} and pcp.receivable_amount
- #{allProjectStatisticsSearch.allMoneyTwo}
+ AND pcp.receivable_amount >= #{allProjectStatisticsSearch.allMoney} and pcp.receivable_amount
+ = #{allProjectStatisticsSearch.allMoneyTwo}
- AND pcp.receivable_amount > #{allProjectStatisticsSearch.allMoney}
+ AND pcp.receivable_amount >= #{allProjectStatisticsSearch.allMoney}
- AND pcp.receivable_amount #{allProjectStatisticsSearch.allMoneyTwo}
+ AND pcp.receivable_amount = #{allProjectStatisticsSearch.allMoneyTwo}
@@ -298,6 +310,12 @@
FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+
+ pmp.director_id in
+
+ #{item}
+
+
AND pmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -324,15 +342,15 @@
- AND pmps.amount_receivable > #{allProjectStatisticsSearch.allMoney} and pmps.amount_receivable
+ AND pmps.amount_receivable >= #{allProjectStatisticsSearch.allMoney} and pmps.amount_receivable =
#{allProjectStatisticsSearch.allMoneyTwo}
- AND pmps.amount_receivable > #{allProjectStatisticsSearch.allMoney}
+ AND pmps.amount_receivable >= #{allProjectStatisticsSearch.allMoney}
- AND pmps.amount_receivable #{allProjectStatisticsSearch.allMoneyTwo}
+ AND pmps.amount_receivable = #{allProjectStatisticsSearch.allMoneyTwo}
@@ -351,6 +369,12 @@
FROM pay_meeting pm right join pay_meeting_situation 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)
+
+ pm.director_id in
+
+ #{item}
+
+
AND pm.meeting_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -377,15 +401,15 @@
- AND pms.amount_receivable > #{allProjectStatisticsSearch.allMoney} and pms.amount_receivable
+ AND pms.amount_receivable >= #{allProjectStatisticsSearch.allMoney} and pms.amount_receivable =
#{allProjectStatisticsSearch.allMoneyTwo}
- AND pms.amount_receivable > #{allProjectStatisticsSearch.allMoney}
+ AND pms.amount_receivable >= #{allProjectStatisticsSearch.allMoney}
- AND pms.amount_receivable #{allProjectStatisticsSearch.allMoneyTwo}
+ AND pms.amount_receivable = #{allProjectStatisticsSearch.allMoneyTwo}
@@ -404,6 +428,10 @@
FROM tb_member_project tmp left join tb_member_project_subitem tmps on(tmp.id=tmps.project_id)
left JOIN sys_user su on(tmps.liaison_man_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
+
+
+ tmps.id=99999999999999999999999
+
AND tmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -430,15 +458,15 @@
- AND tmps.amount_receivable > #{allProjectStatisticsSearch.allMoney} and tmps.amount_receivable
+ AND tmps.amount_receivable >= #{allProjectStatisticsSearch.allMoney} and tmps.amount_receivable =
#{allProjectStatisticsSearch.allMoneyTwo}
- AND tmps.amount_receivable > #{allProjectStatisticsSearch.allMoney}
+ AND tmps.amount_receivable >= #{allProjectStatisticsSearch.allMoney}
- AND tmps.amount_receivable #{allProjectStatisticsSearch.allMoneyTwo}
+ AND tmps.amount_receivable = #{allProjectStatisticsSearch.allMoneyTwo}
@@ -710,15 +738,15 @@
- ppp.allMoney > #{principalPeopleSearch.allMoney} and ppp.allMoney
+ ppp.allMoney >= #{principalPeopleSearch.allMoney} and ppp.allMoney =
#{principalPeopleSearch.allMoneyTwo}
- AND ppp.allMoney > #{principalPeopleSearch.allMoney}
+ AND ppp.allMoney >= #{principalPeopleSearch.allMoney}
- AND ppp.allMoney #{principalPeopleSearch.allMoneyTwo}
+ AND ppp.allMoney = #{principalPeopleSearch.allMoneyTwo}
@@ -833,15 +861,15 @@
- AND pwgs.receivable_amount > #{principalPeopleDetailSearch.allMoney} and pwgs.receivable_amount
+ AND pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pwgs.receivable_amount =
#{principalPeopleDetailSearch.allMoneyTwo}
- AND pwgs.receivable_amount > #{principalPeopleDetailSearch.allMoney}
+ AND pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
- AND pwgs.receivable_amount #{principalPeopleDetailSearch.allMoneyTwo}
+ AND pwgs.receivable_amount = #{principalPeopleDetailSearch.allMoneyTwo}
@@ -870,15 +898,15 @@
- AND pcp.receivable_amount > #{principalPeopleDetailSearch.allMoney} and pcp.receivable_amount
+ AND pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pcp.receivable_amount =
#{principalPeopleDetailSearch.allMoneyTwo}
- AND pcp.receivable_amount > #{principalPeopleDetailSearch.allMoney}
+ AND pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
- AND pcp.receivable_amount #{principalPeopleDetailSearch.allMoneyTwo}
+ AND pcp.receivable_amount = #{principalPeopleDetailSearch.allMoneyTwo}
@@ -907,15 +935,15 @@
- AND pms.amount_receivable > #{principalPeopleDetailSearch.allMoney} and pms.amount_receivable
+ AND pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pms.amount_receivable =
#{principalPeopleDetailSearch.allMoneyTwo}
- AND pms.amount_receivable > #{principalPeopleDetailSearch.allMoney}
+ AND pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
- AND pms.amount_receivable #{principalPeopleDetailSearch.allMoneyTwo}
+ AND pms.amount_receivable = #{principalPeopleDetailSearch.allMoneyTwo}
@@ -944,15 +972,15 @@
- AND pmps.amount_receivable > #{principalPeopleDetailSearch.allMoney} and pmps.amount_receivable
+ AND pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pmps.amount_receivable =
#{principalPeopleDetailSearch.allMoneyTwo}
- AND pmps.amount_receivable > #{principalPeopleDetailSearch.allMoney}
+ AND pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
- AND pmps.amount_receivable #{principalPeopleDetailSearch.allMoneyTwo}
+ AND pmps.amount_receivable = #{principalPeopleDetailSearch.allMoneyTwo}
@@ -1130,7 +1158,7 @@
left join tb_member_project tmp on(tmp.id=tpms.project_id)
- ppp.id =9999999999999999999999999999999999999999
+ tpms.company_id =9999999999999999999999999999999999999999
@@ -1146,15 +1174,15 @@
- ppp.allMoney > #{companyComeMoneySearch.allMoney} and ppp.allMoney
+ ppp.allMoney >= #{companyComeMoneySearch.allMoney} and ppp.allMoney =
#{companyComeMoneySearch.allMoneyTwo}
- AND ppp.allMoney > #{companyComeMoneySearch.allMoney}
+ AND ppp.allMoney >= #{companyComeMoneySearch.allMoney}
- AND ppp.allMoney #{companyComeMoneySearch.allMoneyTwo}
+ AND ppp.allMoney = #{companyComeMoneySearch.allMoneyTwo}
@@ -1268,7 +1296,7 @@
pwgs.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
- pwg.principal_id_a in
+ and pwg.principal_id_a in
#{item}
@@ -1285,15 +1313,15 @@
- AND pwgs.receivable_amount > #{CompanyComeMoneyDetailSearch.allMoney} and
- pwgs.receivable_amount #{CompanyComeMoneyDetailSearch.allMoneyTwo}
+ AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and
+ pwgs.receivable_amount = #{CompanyComeMoneyDetailSearch.allMoneyTwo}
- AND pwgs.receivable_amount > #{CompanyComeMoneyDetailSearch.allMoney}
+ AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney}
- AND pwgs.receivable_amount #{CompanyComeMoneyDetailSearch.allMoneyTwo}
+ AND pwgs.receivable_amount = #{CompanyComeMoneyDetailSearch.allMoneyTwo}
@@ -1310,7 +1338,7 @@
pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
- PCP.principal_id in
+ and PCP.principal_id in
#{item}
@@ -1327,15 +1355,15 @@
- AND pcp.receivable_amount > #{CompanyComeMoneyDetailSearch.allMoney} and pcp.receivable_amount
+ AND pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and pcp.receivable_amount =
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
- AND pcp.receivable_amount > #{CompanyComeMoneyDetailSearch.allMoney}
+ AND pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney}
- AND pcp.receivable_amount #{CompanyComeMoneyDetailSearch.allMoneyTwo}
+ AND pcp.receivable_amount = #{CompanyComeMoneyDetailSearch.allMoneyTwo}
@@ -1352,7 +1380,7 @@
pms.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
- pm.director_id in
+ and pm.director_id in
#{item}
@@ -1369,15 +1397,15 @@
- AND pms.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney} and pms.amount_receivable
+ AND pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pms.amount_receivable =
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
- AND pms.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney}
+ AND pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
- AND pms.amount_receivable #{CompanyComeMoneyDetailSearch.allMoneyTwo}
+ AND pms.amount_receivable = #{CompanyComeMoneyDetailSearch.allMoneyTwo}
@@ -1394,7 +1422,7 @@
pmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
- pmp.director_id in
+ and pmp.director_id in
#{item}
@@ -1411,15 +1439,15 @@
- AND pmps.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney} and pmps.amount_receivable
+ AND pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pmps.amount_receivable =
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
- AND pmps.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney}
+ AND pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
- AND pmps.amount_receivable #{CompanyComeMoneyDetailSearch.allMoneyTwo}
+ AND pmps.amount_receivable = #{CompanyComeMoneyDetailSearch.allMoneyTwo}
@@ -1449,15 +1477,15 @@
- AND tmps.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable
+ AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable =
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
- AND tmps.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney}
+ AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
- AND tmps.amount_receivable #{CompanyComeMoneyDetailSearch.allMoneyTwo}
+ AND tmps.amount_receivable = #{CompanyComeMoneyDetailSearch.allMoneyTwo}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
index 849ca094..41731c10 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
@@ -90,21 +90,21 @@
concat('%',concat(#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%'))
- AND pwgs.in_account=#{payWorkingGroupSubletSearch.inAccountStatue}
+ AND pwgs.in_account= #{payWorkingGroupSubletSearch.inAccountStatue}
AND pwg.principal_id_a=#{payWorkingGroupSubletSearch.principalNameId}
- AND pwgs.allMoney > #{payWorkingGroupSubletSearch.allMoney} and pwgs.allMoney #{payWorkingGroupSubletSearch.allMoneyTwo}
+ AND pwgs.receivable_amount >= #{payWorkingGroupSubletSearch.allMoney} and pwgs.receivable_amount = #{payWorkingGroupSubletSearch.allMoneyTwo}
- AND pwgs.allMoney > #{payWorkingGroupSubletSearch.allMoney}
+ AND pwgs.receivable_amount >= #{payWorkingGroupSubletSearch.allMoney}
- AND pwgs.allMoney #{payWorkingGroupSubletSearch.allMoneyTwo}
+ AND pwgs.receivable_amount = #{payWorkingGroupSubletSearch.allMoneyTwo}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
index a45939f5..f4746606 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
@@ -98,7 +98,7 @@ public interface IPayWorkingGroupService extends IService {
/**
* 全所查询
*/
- IPage queryPageList3(Page page , AllProjectStatisticsSearch allProjectStatisticsSearch);
+ IPage queryPageList3(Page page , AllProjectStatisticsSearch allProjectStatisticsSearch, List idList );
/**
* 全所查询导出
*/
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index 95d9c5ee..5ff8715e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -172,8 +172,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPageList3(Page page ,AllProjectStatisticsSearch allProjectStatisticsSearch) {
- return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch);
+ public IPage queryPageList3(Page page ,AllProjectStatisticsSearch allProjectStatisticsSearch, List idList ) {
+ return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch, idList );
}
/**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
index a67c5cb1..9779a417 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
@@ -35,10 +35,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -73,14 +70,16 @@ public class AllProjectStatisticsController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
- if(constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)||constant.QYXXWHRY.equals(roleCode)) {
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+ if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+ List idList = null;
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
allProjectStatisticsSearch.setYear(year);
}
Page page = new Page<>(pageNo, pageSize);
- IPage pageList = payWorkingGroupService.queryPageList3(page,allProjectStatisticsSearch);
+ IPage pageList = payWorkingGroupService.queryPageList3(page,allProjectStatisticsSearch, idList );
HashMap hashMap = new HashMap<>();
double sum=0;
double sum2 =0;
@@ -132,16 +131,18 @@ public class AllProjectStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+
//科长
- if(constant.BMFZR.equals(roleCode)) {
+ if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
- } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)||constant.QYXXWHRY.equals(roleCode)) {
+ } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
idList=null;
//企业职员项目负责人
- }else if( constant.QYRY.equals(roleCode)){
+ }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
}
@@ -200,7 +201,14 @@ public class AllProjectStatisticsController {
allProjectStatisticsSearch.setYear(year);
}
List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch);
- return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "统计");
+ if (pageList != null) {
+ for(AllProjectStatistics s: pageList){
+ String key = String.valueOf(s.getChargeUse());
+ String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+ s.setChargeUse_text(payment_charge_use);
+ }
+ }
+ return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计");
}else {
return new ModelAndView();
@@ -220,7 +228,14 @@ public class AllProjectStatisticsController {
allProjectStatisticsSearch.setYear(year);
}
List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch);
- return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "统计");
+ if (pageList != null) {
+ for(AllProjectStatistics s: pageList){
+ String key = String.valueOf(s.getChargeUse());
+ String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
+ s.setChargeUse_text(payment_charge_use);
+ }
+ }
+ return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "企业来款统计");
}
}
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
index a9b4a52c..47600c4a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
@@ -26,10 +26,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -71,16 +68,17 @@ public class CompanyComeMoneyStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
- if(constant.BMFZR.equals(roleCode)) {
+ if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
- } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)||constant.QYXXWHRY.equals(roleCode)) {
+ } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
idList=null;
//企业职员项目负责人
- }else if( constant.QYRY.equals(roleCode)){
+ }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
}
@@ -135,20 +133,19 @@ public class CompanyComeMoneyStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
- if(constant.BMFZR.equals(roleCode)) {
+ if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
- } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
+ } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
idList=null;
//企业职员项目负责人
- }else if( constant.QYRY.equals(roleCode)){
+ }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
- }else {
- idList=null;
}
Page page = new Page<>(pageNo, pageSize);
IPage pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
@@ -200,20 +197,19 @@ public class CompanyComeMoneyStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
- if(constant.BMFZR.equals(roleCode)) {
+ if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
- } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
+ } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
idList=null;
//企业职员项目负责人
- }else if( constant.QYRY.equals(roleCode)){
+ }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
- }else {
- idList=null;
}
List pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch,idList);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
index 1f950a4b..b83d2eb1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
@@ -29,10 +29,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@@ -77,16 +74,17 @@ public class PrincipalPeopleStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
- if(constant.BMFZR.equals(roleCode)) {
+ if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
- } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)||constant.QYXXWHRY.equals(roleCode)) {
+ } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
idList=null;
//企业职员项目负责人
- }else if( constant.QYRY.equals(roleCode)){
+ }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
}
@@ -206,20 +204,19 @@ public class PrincipalPeopleStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
+ List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//科长
- if(constant.BMFZR.equals(roleCode)) {
+ if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
- } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
+ } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
idList=null;
//企业职员项目负责人
- }else if( constant.QYRY.equals(roleCode)){
+ }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
- }else {
- idList=null;
}
List pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch,idList);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
index 1e06c433..433ef35b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
@@ -33,7 +33,6 @@ public class AllProjectStatistics {
@ApiModelProperty(value = "实收总金额")
private String comeAllMoney;
- @Excel(name = "来款用途", width = 15,dicCode = "charge_use")
@ApiModelProperty(value = "来款用途编码")
private String chargeUse;
@@ -41,6 +40,7 @@ public class AllProjectStatistics {
@ApiModelProperty(value = "科室")
private String depart;
+ @Excel(name = "来款用途", width = 15)
@ApiModelProperty(value = "来款用途")
private String ChargeUse_text;
}