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-09-26 18:48:36 +08:00
parent c668d909c6
commit 1f77d2580c
13 changed files with 172 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+6 -6
View File
@@ -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)
<where>
<if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%')
@@ -29,15 +29,15 @@
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if>
</where>
group by pe.id
<!--group by pe.id-->
limit #{pageNo},#{pageSize}
</select>
<select id="list4" resultMap="people">
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)
<where>
<if test=" name!=null and name != ''">
AND pt.name LIKE CONCAT('%',#{name},'%')
@@ -49,7 +49,7 @@
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if>
</where>
group by pe.id
<!--group by pe.id-->
</select>
<select id="list2" resultType="com.jero.data.entity.VO.payCaseCommitteeSubitemVO">
jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/constant.java
+1 -1
View File
@@ -36,7 +36,7 @@ public interface constant {
/**
* 用户角色(企业人员)
*/
public static final String QYRY="qyry";
public static final String XMFZR="xmfzr";
}
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java
+18 -20
View File
@@ -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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<String> 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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList);
List<PayWorkingGroupStatistics> 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<String> 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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,idList);
for (PayWorkingGroupStatistics payWorkingGroupStatistics:pageList){
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
+2 -2
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+2 -10
View File
@@ -80,7 +80,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
*/
List<AllProjectStatistics> queryPageList3(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
/**
* @Description 企业来款查询
* @Description 企业来款查询和全所统计
* @Author zql
* @Date 2021/9/17
* @Param
@@ -89,15 +89,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
*/
IPage<AllProjectStatistics> queryPageList3( Page<AllProjectStatistics> page,@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch,@Param("idList") List<String> idList);
/**
* @Description 全所统计
* @Author zql
* @Date 2021/9/17
* @Param
* @Return
* @Exception
*/
IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page ,@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch);
/**
* 个人来款统计
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+87 -59
View File
@@ -120,7 +120,7 @@
pwgs on(pwg.id=pwgs.working_group_id)
<where>
<if test="ids != null and ids != ''">
pwg.principal_id_a inq
pwg.principal_id_a in
<foreach item="item" open="(" separator="," close=")" collection="ids">
#{item}
</foreach>
@@ -130,15 +130,15 @@
</if>
<choose>
<when test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != '' and payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
AND pwgs.allMoney > #{payWorkingGroupSearch.allMoney} and pwgs.allMoney <![CDATA[<]]>
AND pwgs.allMoney >= #{payWorkingGroupSearch.allMoney} and pwgs.allMoney <![CDATA[<]]>=
#{payWorkingGroupSearch.allMoneyTwo}
</when>
<otherwise>
<if test="payWorkingGroupSearch.allMoney != null and payWorkingGroupSearch.allMoney != ''">
AND pwgs.allMoney > #{payWorkingGroupSearch.allMoney}
AND pwgs.allMoney >= #{payWorkingGroupSearch.allMoney}
</if>
<if test="payWorkingGroupSearch.allMoneyTwo != null and payWorkingGroupSearch.allMoneyTwo != ''">
AND pwgs.allMoney <![CDATA[<]]> #{payWorkingGroupSearch.allMoneyTwo}
AND pwgs.allMoney <![CDATA[<]]>= #{payWorkingGroupSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -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)
<where>
<if test="idList != null and idList != ''">
pwg.principal_id_a in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -217,15 +223,15 @@
</if>
<choose>
<when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND pwgs.receivable_amount > #{allProjectStatisticsSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>
AND pwgs.receivable_amount >= #{allProjectStatisticsSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>=
#{allProjectStatisticsSearch.allMoneyTwo}
</when>
<otherwise>
<if test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != ''">
AND pwgs.receivable_amount > #{allProjectStatisticsSearch.allMoney}
AND pwgs.receivable_amount >= #{allProjectStatisticsSearch.allMoney}
</if>
<if test="allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND pwgs.receivable_amount <![CDATA[<]]> #{allProjectStatisticsSearch.allMoneyTwo}
AND pwgs.receivable_amount <![CDATA[<]]>= #{allProjectStatisticsSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -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)
<where>
<if test="idList != null and idList != ''">
pcp.principal_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pcp.charge_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -271,15 +283,15 @@
</if>
<choose>
<when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND pcp.receivable_amount > #{allProjectStatisticsSearch.allMoney} and pcp.receivable_amount
<![CDATA[<]]> #{allProjectStatisticsSearch.allMoneyTwo}
AND pcp.receivable_amount >= #{allProjectStatisticsSearch.allMoney} and pcp.receivable_amount
<![CDATA[<]]>= #{allProjectStatisticsSearch.allMoneyTwo}
</when>
<otherwise>
<if test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != ''">
AND pcp.receivable_amount > #{allProjectStatisticsSearch.allMoney}
AND pcp.receivable_amount >= #{allProjectStatisticsSearch.allMoney}
</if>
<if test="allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND pcp.receivable_amount <![CDATA[<]]> #{allProjectStatisticsSearch.allMoneyTwo}
AND pcp.receivable_amount <![CDATA[<]]>= #{allProjectStatisticsSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -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)
<where>
<if test="idList != null and idList != ''">
pmp.director_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -324,15 +342,15 @@
</if>
<choose>
<when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND pmps.amount_receivable > #{allProjectStatisticsSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>
AND pmps.amount_receivable >= #{allProjectStatisticsSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>=
#{allProjectStatisticsSearch.allMoneyTwo}
</when>
<otherwise>
<if test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != ''">
AND pmps.amount_receivable > #{allProjectStatisticsSearch.allMoney}
AND pmps.amount_receivable >= #{allProjectStatisticsSearch.allMoney}
</if>
<if test="allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND pmps.amount_receivable <![CDATA[<]]> #{allProjectStatisticsSearch.allMoneyTwo}
AND pmps.amount_receivable <![CDATA[<]]>= #{allProjectStatisticsSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -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)
<where>
<if test="idList != null and idList != ''">
pm.director_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pm.meeting_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -377,15 +401,15 @@
</if>
<choose>
<when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND pms.amount_receivable > #{allProjectStatisticsSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>
AND pms.amount_receivable >= #{allProjectStatisticsSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>=
#{allProjectStatisticsSearch.allMoneyTwo}
</when>
<otherwise>
<if test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != ''">
AND pms.amount_receivable > #{allProjectStatisticsSearch.allMoney}
AND pms.amount_receivable >= #{allProjectStatisticsSearch.allMoney}
</if>
<if test="allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND pms.amount_receivable <![CDATA[<]]> #{allProjectStatisticsSearch.allMoneyTwo}
AND pms.amount_receivable <![CDATA[<]]>= #{allProjectStatisticsSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -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)
<where>
<!--标协项目没有负责人所以除最高权限都查不到 -->
<if test="idList != null and idList != ''">
tmps.id=99999999999999999999999
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND tmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
@@ -430,15 +458,15 @@
</if>
<choose>
<when test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != '' and allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND tmps.amount_receivable > #{allProjectStatisticsSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>
AND tmps.amount_receivable >= #{allProjectStatisticsSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
#{allProjectStatisticsSearch.allMoneyTwo}
</when>
<otherwise>
<if test="allProjectStatisticsSearch.allMoney != null and allProjectStatisticsSearch.allMoney != ''">
AND tmps.amount_receivable > #{allProjectStatisticsSearch.allMoney}
AND tmps.amount_receivable >= #{allProjectStatisticsSearch.allMoney}
</if>
<if test="allProjectStatisticsSearch.allMoneyTwo != null and allProjectStatisticsSearch.allMoneyTwo != ''">
AND tmps.amount_receivable <![CDATA[<]]> #{allProjectStatisticsSearch.allMoneyTwo}
AND tmps.amount_receivable <![CDATA[<]]>= #{allProjectStatisticsSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -710,15 +738,15 @@
<where>
<choose>
<when test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != '' and principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''">
ppp.allMoney > #{principalPeopleSearch.allMoney} and ppp.allMoney <![CDATA[<]]>
ppp.allMoney >= #{principalPeopleSearch.allMoney} and ppp.allMoney <![CDATA[<]]>=
#{principalPeopleSearch.allMoneyTwo}
</when>
<otherwise>
<if test="principalPeopleSearch.allMoney != null and principalPeopleSearch.allMoney != ''">
AND ppp.allMoney > #{principalPeopleSearch.allMoney}
AND ppp.allMoney >= #{principalPeopleSearch.allMoney}
</if>
<if test="principalPeopleSearch.allMoneyTwo != null and principalPeopleSearch.allMoneyTwo != ''">
AND ppp.allMoney <![CDATA[<]]> #{principalPeopleSearch.allMoneyTwo}
AND ppp.allMoney <![CDATA[<]]>= #{principalPeopleSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -833,15 +861,15 @@
</if>
<choose>
<when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND pwgs.receivable_amount > #{principalPeopleDetailSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>
AND pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>=
#{principalPeopleDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
AND pwgs.receivable_amount > #{principalPeopleDetailSearch.allMoney}
AND pwgs.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
</if>
<if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND pwgs.receivable_amount <![CDATA[<]]> #{principalPeopleDetailSearch.allMoneyTwo}
AND pwgs.receivable_amount <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -870,15 +898,15 @@
</if>
<choose>
<when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND pcp.receivable_amount > #{principalPeopleDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>
AND pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>=
#{principalPeopleDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
AND pcp.receivable_amount > #{principalPeopleDetailSearch.allMoney}
AND pcp.receivable_amount >= #{principalPeopleDetailSearch.allMoney}
</if>
<if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND pcp.receivable_amount <![CDATA[<]]> #{principalPeopleDetailSearch.allMoneyTwo}
AND pcp.receivable_amount <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -907,15 +935,15 @@
</if>
<choose>
<when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND pms.amount_receivable > #{principalPeopleDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>
AND pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>=
#{principalPeopleDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
AND pms.amount_receivable > #{principalPeopleDetailSearch.allMoney}
AND pms.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
</if>
<if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND pms.amount_receivable <![CDATA[<]]> #{principalPeopleDetailSearch.allMoneyTwo}
AND pms.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -944,15 +972,15 @@
</if>
<choose>
<when test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != '' and principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND pmps.amount_receivable > #{principalPeopleDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>
AND pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>=
#{principalPeopleDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="principalPeopleDetailSearch.allMoney != null and principalPeopleDetailSearch.allMoney != ''">
AND pmps.amount_receivable > #{principalPeopleDetailSearch.allMoney}
AND pmps.amount_receivable >= #{principalPeopleDetailSearch.allMoney}
</if>
<if test="principalPeopleDetailSearch.allMoneyTwo != null and principalPeopleDetailSearch.allMoneyTwo != ''">
AND pmps.amount_receivable <![CDATA[<]]> #{principalPeopleDetailSearch.allMoneyTwo}
AND pmps.amount_receivable <![CDATA[<]]>= #{principalPeopleDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -1130,7 +1158,7 @@
left join tb_member_project tmp on(tmp.id=tpms.project_id)
<where>
<if test="idList != null and idList != ''">
ppp.id =9999999999999999999999999999999999999999
tpms.company_id =9999999999999999999999999999999999999999
</if>
</where>
@@ -1146,15 +1174,15 @@
<where>
<choose>
<when test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != '' and companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''">
ppp.allMoney > #{companyComeMoneySearch.allMoney} and ppp.allMoney <![CDATA[<]]>
ppp.allMoney >= #{companyComeMoneySearch.allMoney} and ppp.allMoney <![CDATA[<]]>=
#{companyComeMoneySearch.allMoneyTwo}
</when>
<otherwise>
<if test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != ''">
AND ppp.allMoney > #{companyComeMoneySearch.allMoney}
AND ppp.allMoney >= #{companyComeMoneySearch.allMoney}
</if>
<if test="companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''">
AND ppp.allMoney <![CDATA[<]]> #{companyComeMoneySearch.allMoneyTwo}
AND ppp.allMoney <![CDATA[<]]>= #{companyComeMoneySearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -1268,7 +1296,7 @@
<where>
pwgs.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
<if test="idList != null and idList != ''">
pwg.principal_id_a in
and pwg.principal_id_a in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
@@ -1285,15 +1313,15 @@
</if>
<choose>
<when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND pwgs.receivable_amount > #{CompanyComeMoneyDetailSearch.allMoney} and
pwgs.receivable_amount <![CDATA[<]]> #{CompanyComeMoneyDetailSearch.allMoneyTwo}
AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and
pwgs.receivable_amount <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
AND pwgs.receivable_amount > #{CompanyComeMoneyDetailSearch.allMoney}
AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney}
</if>
<if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND pwgs.receivable_amount <![CDATA[<]]> #{CompanyComeMoneyDetailSearch.allMoneyTwo}
AND pwgs.receivable_amount <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -1310,7 +1338,7 @@
<where>
pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
<if test="idList != null and idList != ''">
PCP.principal_id in
and PCP.principal_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
@@ -1327,15 +1355,15 @@
</if>
<choose>
<when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND pcp.receivable_amount > #{CompanyComeMoneyDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>
AND pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and pcp.receivable_amount <![CDATA[<]]>=
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
AND pcp.receivable_amount > #{CompanyComeMoneyDetailSearch.allMoney}
AND pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney}
</if>
<if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND pcp.receivable_amount <![CDATA[<]]> #{CompanyComeMoneyDetailSearch.allMoneyTwo}
AND pcp.receivable_amount <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -1352,7 +1380,7 @@
<where>
pms.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
<if test="idList != null and idList != ''">
pm.director_id in
and pm.director_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
@@ -1369,15 +1397,15 @@
</if>
<choose>
<when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND pms.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>
AND pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pms.amount_receivable <![CDATA[<]]>=
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
AND pms.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney}
AND pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
</if>
<if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND pms.amount_receivable <![CDATA[<]]> #{CompanyComeMoneyDetailSearch.allMoneyTwo}
AND pms.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -1394,7 +1422,7 @@
<where>
pmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
<if test="idList != null and idList != ''">
pmp.director_id in
and pmp.director_id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
@@ -1411,15 +1439,15 @@
</if>
<choose>
<when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND pmps.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>
AND pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pmps.amount_receivable <![CDATA[<]]>=
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
AND pmps.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney}
AND pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
</if>
<if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND pmps.amount_receivable <![CDATA[<]]> #{CompanyComeMoneyDetailSearch.allMoneyTwo}
AND pmps.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
@@ -1449,15 +1477,15 @@
<choose>
<when test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != '' and CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND tmps.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>
AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable <![CDATA[<]]>=
#{CompanyComeMoneyDetailSearch.allMoneyTwo}
</when>
<otherwise>
<if test="CompanyComeMoneyDetailSearch.allMoney != null and CompanyComeMoneyDetailSearch.allMoney != ''">
AND tmps.amount_receivable > #{CompanyComeMoneyDetailSearch.allMoney}
AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney}
</if>
<if test="CompanyComeMoneyDetailSearch.allMoneyTwo != null and CompanyComeMoneyDetailSearch.allMoneyTwo != ''">
AND tmps.amount_receivable <![CDATA[<]]> #{CompanyComeMoneyDetailSearch.allMoneyTwo}
AND tmps.amount_receivable <![CDATA[<]]>= #{CompanyComeMoneyDetailSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+4 -4
View File
@@ -90,21 +90,21 @@
concat('%',concat(#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%'))
</if>
<if test="payWorkingGroupSubletSearch.inAccountStatue != null and payWorkingGroupSubletSearch.inAccountStatue != ''">
AND pwgs.in_account=#{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 pwgs.allMoney > #{payWorkingGroupSubletSearch.allMoney} and pwgs.allMoney <![CDATA[<]]> #{payWorkingGroupSubletSearch.allMoneyTwo}
AND pwgs.receivable_amount >= #{payWorkingGroupSubletSearch.allMoney} and pwgs.receivable_amount <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
</when>
<otherwise>
<if test="payWorkingGroupSubletSearch.allMoney != null and payWorkingGroupSubletSearch.allMoney != ''">
AND pwgs.allMoney > #{payWorkingGroupSubletSearch.allMoney}
AND pwgs.receivable_amount >= #{payWorkingGroupSubletSearch.allMoney}
</if>
<if test="payWorkingGroupSubletSearch.allMoneyTwo != null and payWorkingGroupSubletSearch.allMoneyTwo != ''">
AND pwgs.allMoney <![CDATA[<]]> #{payWorkingGroupSubletSearch.allMoneyTwo}
AND pwgs.receivable_amount <![CDATA[<]]>= #{payWorkingGroupSubletSearch.allMoneyTwo}
</if>
</otherwise>
</choose>
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+1 -1
View File
@@ -98,7 +98,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
/**
* 全所查询
*/
IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page , AllProjectStatisticsSearch allProjectStatisticsSearch);
IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page , AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList );
/**
* 全所查询导出
*/
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+2 -2
View File
@@ -172,8 +172,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
* @return
*/
@Override
public IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page ,AllProjectStatisticsSearch allProjectStatisticsSearch) {
return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch);
public IPage<AllProjectStatistics> queryPageList3(Page<AllProjectStatistics> page ,AllProjectStatisticsSearch allProjectStatisticsSearch, List<String> idList ) {
return payWorkingGroupMapper.queryPageList3(page,allProjectStatisticsSearch, idList );
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+26 -11
View File
@@ -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<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
List<String> 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<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList3(page,allProjectStatisticsSearch);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList3(page,allProjectStatisticsSearch, idList );
HashMap<String, Object> 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<String> 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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> 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<AllProjectStatistics> 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, "企业来款统计");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+13 -17
View File
@@ -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<String> 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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<String> 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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
@@ -200,20 +197,19 @@ public class CompanyComeMoneyStatisticsController {
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch,idList);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+9 -12
View File
@@ -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<String> 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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<String> 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<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().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<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch,idList);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+1 -1
View File
@@ -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;
}