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

add:统计打包企业等字段调整

Browse Source
This commit is contained in:
zhangqinlin
2021-12-07 11:06:02 +08:00
parent 4d7e7c8f94
commit f2856bd306
7 changed files with 79 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java
+8 -4
View File
@@ -16,10 +16,6 @@ public class PayWorkGroupSubletStatistics {
@ApiModelProperty(value = "工作组成员id")
private String id;
@Excel(name = "项目负责人", width = 15)
@ApiModelProperty(value = "项目负责人")
private String principalName;
@Excel(name = "来款单位", width = 15)
@ApiModelProperty(value = "来款单位")
private String chargeCompanyTemporaryName;
@@ -42,4 +38,12 @@ public class PayWorkGroupSubletStatistics {
@ApiModelProperty(value = "来款用途文本")
private String chargeUse_text;
@Excel(name = "打包", width = 15)
@ApiModelProperty(value = "打包")
private String pack;
@Excel(name = "项目负责人", width = 15)
@ApiModelProperty(value = "项目负责人")
private String principalName;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+28 -8
View File
@@ -252,7 +252,7 @@
<!-- 全所统计-->
<select id="queryPageList3" resultType="com.jero.statistics.entity.AllProjectStatistics">
select pp.id as projectId,pp.projectName, principalName, chargeCompanyTemporaryName, allMoney, comeAllMoney, chargeUse, depart, createTime,pp.id from
select pp.id as projectId,pp.projectName, principalName, chargeCompanyTemporaryName, allMoney, comeAllMoney, chargeUse, depart, createTime,if(pp.pack=0,'否','是') as pack from
(SELECT
pwgs.id,
pwg.working_group_project AS projectName,
@@ -262,6 +262,7 @@
pwgs.paid_amount as comeAllMoney,
pwgs.charge_use as chargeUse,
sd.depart_name as depart,
pwgs.pack as pack,
pwgs.create_time as createTime
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)
@@ -321,6 +322,7 @@
pcp.paid_amount as comeAllMoney,
pcp.charge_use as chargeUse,
sd.depart_name as depart,
pcp.pack as pack,
pcp.create_time as createTime
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)
@@ -381,6 +383,7 @@
pmps.paid_amount as comeAllMoney,
pmps.charge_use as chargeUse,
sd.depart_name as depart,
pmps.pack as pack,
pmps.create_time as createTime
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)
@@ -440,6 +443,7 @@
pms.paid_amount as comeAllMoney,
pms.charge_use as chargeUse,
sd.depart_name as depart,
pms.pack as pack,
pms.create_time as createTime
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)
@@ -499,6 +503,7 @@
tmps.paid_amount as comeAllMoney,
tmps.charge_use as chargeUse,
sd.depart_name as depart,
tmps.pack as pack,
tmps.create_time as createTime
FROM tb_member_project tmp left join tb_member_project_subitem tmps on(tmp.id=tmps.project_id)
left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code)
@@ -1361,13 +1366,15 @@
</select>
<!-- 个人来款详情-->
<select id="queryPageListForPrincipalDetail" resultType="com.jero.statistics.entity.PrincipalPeopleDetail">
select * from (SELECT
select pp.id,pp.projectName,pp.principalId,pp.allMoney,pp.comeAllMoney,if(pp.pack=0,'否','是') as pack,pp.chargeUse,pp.chargeCompanyTemporaryName from (SELECT
pwgs.create_time as createTime,
pwgs.id,
pwgs.charge_company_temporary_name as chargeCompanyTemporaryName,
pwg.working_group_project as projectName,
pwg.principal_id_a as principalId,
pwgs.receivable_amount AS allMoney,
pwgs.paid_amount AS comeAllMoney,
pwgs.pack as pack,
pwgs.charge_use as chargeUse
FROM pay_working_group_subitem pwgs
inner join pay_working_group pwg on (pwgs.working_group_id=pwg.id)
@@ -1402,10 +1409,12 @@
SELECT
pcp.create_time as createTime,
pcp.id,
pcp.charge_company_temporary_name as chargeCompanyTemporaryName,
pcp.charge_project as projectName,
pcp.principal_id as principalId,
pcp.receivable_amount AS allMoney,
pcp.paid_amount AS comeAllMoney,
pcp.pack as pack,
pcp.charge_use as chargeUse
FROM pay_common_project pcp
<where>
@@ -1439,10 +1448,12 @@
SELECT
pms.create_time as createTime,
pms.id,
pms.company_name as chargeCompanyTemporaryName,
pm.meeting_name as projectName,
pm.director_id as principalId,
pms.amount_receivable AS allMoney,
pms.paid_amount AS comeAllMoney,
pms.pack as pack,
pms.charge_use as chargeUse
FROM pay_meeting pm inner join pay_meeting_situation pms on(pm.id=pms.meeting_id)
<where>
@@ -1476,10 +1487,12 @@
SELECT
pmps.create_time as createTime,
pmps.id,
pmps.company_name as chargeCompanyTemporaryName,
pmp.project_name as projectName,
pmp.director_id as principalId,
pmps.amount_receivable AS allMoney,
pmps.paid_amount AS comeAllMoney,
pmps.pack as pack,
pmps.charge_use as chargeUse
FROM pay_member_project pmp inner join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
<where>
@@ -1513,10 +1526,12 @@
SELECT
tmps.create_time as createTime,
tmps.id,
tmps.company_name as chargeCompanyTemporaryName,
tmp.project_name as projectName,
tmp.director_id as principalId,
tmps.amount_receivable AS allMoney,
tmps.paid_amount AS comeAllMoney,
tmps.pack as pack,
tmps.charge_use as chargeUse
FROM tb_member_project tmp inner join tb_member_project_subitem tmps on(tmp.id=tmps.project_id)
<where>
@@ -2061,13 +2076,14 @@
<!-- 企业来款详情统计-->
<select id="queryPageListForCompanyDetail" resultType="com.jero.statistics.entity.CompanyComeMoneyDetail">
select * from (SELECT
select pp.projectId,pp.projectName,pp.allMoney,pp.comeAllMoney,pp.chargeUse,if(pp.pack=0,'否','是') as pack from (SELECT
pwgs.create_time as createTime,
pwgs.id AS projectId,
pwg.working_group_project as projectName,
pwgs.receivable_amount AS allMoney,
pwgs.paid_amount AS comeAllMoney,
pwgs.charge_use as chargeUse
pwgs.charge_use as chargeUse,
pwgs.pack
FROM pay_working_group_subitem pwgs
left join pay_working_group pwg on (pwgs.working_group_id=pwg.id)
<where>
@@ -2110,7 +2126,8 @@
pcp.charge_project as projectName,
pcp.receivable_amount AS allMoney,
pcp.paid_amount AS comeAllMoney,
pcp.charge_use as chargeUse
pcp.charge_use as chargeUse,
pcp.pack
FROM pay_common_project pcp
<where>
pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
@@ -2152,7 +2169,8 @@
pm.meeting_name as projectName,
pms.amount_receivable AS allMoney,
pms.paid_amount AS comeAllMoney,
pms.charge_use as chargeUse
pms.charge_use as chargeUse,
pms.pack
FROM pay_meeting pm right join pay_meeting_situation pms on(pm.id=pms.meeting_id)
<where>
pms.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
@@ -2194,7 +2212,8 @@
pmp.project_name as projectName,
pmps.amount_receivable AS allMoney,
pmps.paid_amount AS comeAllMoney,
pmps.charge_use as chargeUse
pmps.charge_use as chargeUse,
pmps.pack
FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id)
<where>
pmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
@@ -2236,7 +2255,8 @@
tmp.project_name AS projectName,
tmps.amount_receivable as allMoney,
tmps.paid_amount as comeAllMoney,
tmps.charge_use as chargeUse
tmps.charge_use as chargeUse,
tmps.pack
FROM tb_member_project tmp left join tb_member_project_subitem tmps on(tmp.id=tmps.project_id)
<where>
tmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+2 -1
View File
@@ -64,7 +64,7 @@
</select>
<!--工作组详情-->
<select id="queryPageList2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
select * from (SELECT
select pwg1.principalId,pwg1.principalName,pwg1.chargeCompanyTemporaryName,pwg1.allMoney,pwg1.comeAllMoney,pwg1.chargeUse,if(pwg1.pack=0,'否','是') as pack from (SELECT
pwgs.id,
pwg.principal_id_a as principalId,
pwg.principal_name_a as principalName,
@@ -72,6 +72,7 @@
pwgs.receivable_amount AS allMoney,
pwgs.paid_amount AS comeAllMoney,
pwgs.charge_use as chargeUse,
pwgs.pack,
pwgs.create_time
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/statistics/controller/AllProjectStatisticsController.java
+18
View File
@@ -8,6 +8,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysDepartTreeModel;
import com.jero.common.util.oConvertUtils;
@@ -19,6 +20,8 @@ import com.jero.member.service.ITbMemberProjectService;
import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.util.UserUtil;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkGroupSubletStatistics;
import com.jero.project.entity.PayWorkingGroupStatistics;
@@ -41,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.text.DecimalFormat;
import java.util.*;
@@ -60,6 +64,8 @@ public class AllProjectStatisticsController {
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
private ISysUserService sysUserService;
@Autowired
private IPayWorkingGroupService payWorkingGroupService;
/**
@@ -360,4 +366,16 @@ public class AllProjectStatisticsController {
}
@ApiOperation(value = "查询列表", notes = "查询列表")
@RequestMapping(value = "/listForUserByOrgCode", method = RequestMethod.GET)
public Result<?> listForUserByOrgCode(@RequestParam(name = "departId",required = true) String departId) {
List<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(departId);
List<String> orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList());
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
queryWrapper.in("org_code",orgCodes);
queryWrapper.ne("username","_reserve_user_external");
List<SysUser> pageList = sysUserService.list(queryWrapper);
return Result.OK(pageList);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+11 -7
View File
@@ -17,10 +17,6 @@ public class AllProjectStatistics {
@ApiModelProperty(value = "来款项目")
private String projectName;
@Excel(name = "项目负责人", width = 15)
@ApiModelProperty(value = "项目负责人")
private String principalName;
@Excel(name = "来款单位", width = 15)
@ApiModelProperty(value = "来款单位")
private String chargeCompanyTemporaryName;
@@ -36,11 +32,19 @@ public class AllProjectStatistics {
@ApiModelProperty(value = "来款用途编码")
private String chargeUse;
@Excel(name = "来款用途", width = 15)
@ApiModelProperty(value = "来款用途")
private String ChargeUse_text;
@Excel(name = "打包", width = 15)
@ApiModelProperty(value = "打包")
private String pack;
@Excel(name = "科室", width = 15)
@ApiModelProperty(value = "科室")
private String depart;
@Excel(name = "来款用途", width = 15)
@ApiModelProperty(value = "来款用途")
private String ChargeUse_text;
@Excel(name = "项目负责人", width = 15)
@ApiModelProperty(value = "项目负责人")
private String principalName;
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
+6
View File
@@ -25,7 +25,13 @@ public class CompanyComeMoneyDetail {
@ApiModelProperty(value = "来款用途编码")
private String chargeUse;
@Excel(name = "打包")
@ApiModelProperty(value = "打包")
private String pack;
@Excel(name = "来款用途")
@ApiModelProperty(value = "来款用途")
private String chargeUse_text;
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java
+6
View File
@@ -14,6 +14,9 @@ public class PrincipalPeopleDetail {
@ApiModelProperty(value = "项目id")
private String id;
@Excel(name = "来款企业", width = 15)
@ApiModelProperty(value = "来款企业")
private String chargeCompanyTemporaryName;
@Excel(name = "来款项目", width = 15)
@ApiModelProperty(value = "来款项目")
private String projectName;
@@ -23,6 +26,9 @@ public class PrincipalPeopleDetail {
@Excel(name = "实收总金额", width = 15)
@ApiModelProperty(value = "实收总金额")
private String comeAllMoney;
@Excel(name = "打包", width = 15)
@ApiModelProperty(value = "打包")
private String pack;
@ApiModelProperty(value = "来款用途编码")
private String chargeUse;
@Excel(name = "来款用途", width = 15)