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-23 17:18:42 +08:00
parent 82f9c0b587
commit 58632ddb3e
5 changed files with 68 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+8 -1
View File
@@ -126,7 +126,14 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
* @return * @return
*/ */
IPage<CompanyComeMoneyList> queryPageListForCompany(Page<CompanyComeMoneyList> page,@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch,@Param("idList") List<String> idList); IPage<CompanyComeMoneyList> queryPageListForCompany(Page<CompanyComeMoneyList> page,@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch,@Param("idList") List<String> idList);
/**
* 企业来款统计
* @param
* @param companyComeMoneySearch
* @param idList
* @return
*/
List<CompanyComeMoneyList> queryPageListForCompany(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch,@Param("idList") List<String> idList);
/** /**
* 企业来款详情 * 企业来款详情
* @param page * @param page
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+1 -1
View File
@@ -413,7 +413,7 @@
</if> </if>
</otherwise> </otherwise>
</choose> </choose>
</where>) pp right join </where>) pp inner join
(select pwgs.id as id (select pwgs.id as id
from pay_working_group_subitem pwgs from pay_working_group_subitem pwgs
left join pay_payment_record ppr on(pwgs.id=ppr.project_id) left join pay_payment_record ppr on(pwgs.id=ppr.project_id)
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+9 -1
View File
@@ -160,9 +160,17 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
IPage<CompanyComeMoneyDetail> queryPageListForCompanyDetail(Page<CompanyComeMoneyDetail> page, CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch); IPage<CompanyComeMoneyDetail> queryPageListForCompanyDetail(Page<CompanyComeMoneyDetail> page, CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
/** /**
* 企业来款详情统计 * 企业来款详情统计导出
* @param companyComeMoneyDetailSearch * @param companyComeMoneyDetailSearch
* @return * @return
*/ */
List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch); List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch);
/**
* 企业来款统计导出
* @param companyComeMoneySearch
* @param idList
* @return
*/
List<CompanyComeMoneyList> queryPageListForCompanyExcel(CompanyComeMoneySearch companyComeMoneySearch, List<String> idList);
} }
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+16
View File
@@ -256,11 +256,27 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
return payWorkingGroupMapper.queryPageListForCompanyDetail(page,companyComeMoneyDetailSearch); return payWorkingGroupMapper.queryPageListForCompanyDetail(page,companyComeMoneyDetailSearch);
} }
/**
* 企业来款详情导出
* @param companyComeMoneyDetailSearch
* @return
*/
@Override @Override
public List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) { public List<CompanyComeMoneyDetail> queryPageListForCompanyDetailExcel(CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) {
return payWorkingGroupMapper.queryPageListForCompanyDetail(companyComeMoneyDetailSearch); return payWorkingGroupMapper.queryPageListForCompanyDetail(companyComeMoneyDetailSearch);
} }
/**
* 企业来款导出
* @param companyComeMoneySearch
* @param idList
* @return
*/
@Override
public List<CompanyComeMoneyList> queryPageListForCompanyExcel(CompanyComeMoneySearch companyComeMoneySearch, List<String> idList) {
return payWorkingGroupMapper.queryPageListForCompany(companyComeMoneySearch,idList);
}
/** /**
* @Description 校验是存在关联合同的项目 * @Description 校验是存在关联合同的项目
* @Author lqt * @Author lqt
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+34 -34
View File
@@ -135,40 +135,40 @@ public class CompanyComeMoneyStatisticsController {
} }
// /** /**
// *企业来款统计 *企业来款统计
// * *
// */ */
// @GetMapping(value = "/excel") @GetMapping(value = "/excel")
// @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计") @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计")
// public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) { public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) {
// if (companyComeMoneySearch.getYear() == null || companyComeMoneySearch.getYear().equals("")) { if (companyComeMoneySearch.getYear() == null || companyComeMoneySearch.getYear().equals("")) {
// Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
// String year = String.valueOf(calendar.get(Calendar.YEAR)); String year = String.valueOf(calendar.get(Calendar.YEAR));
// companyComeMoneySearch.setYear(year); companyComeMoneySearch.setYear(year);
// } }
// //根据不同角色加载不同列表的参数 //根据不同角色加载不同列表的参数
// List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode(); String roleCode = sysUser.getRoleCode();
// //科长 //科长
// if(constant.BMFZR.equals(roleCode)) { if(constant.BMFZR.equals(roleCode)) {
// String orgCode = sysUser.getOrgCode(); String orgCode = sysUser.getOrgCode();
// List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); 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()); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
// //所领导或者超级管理员 //所领导或者超级管理员
// } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) { } else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
// idList=null; idList=null;
// //企业职员项目负责人 //企业职员项目负责人
// }else if( constant.QYRY.equals(roleCode)){ }else if( constant.QYRY.equals(roleCode)){
// String userId = sysUser.getId(); String userId = sysUser.getId();
// idList.add(userId); idList.add(userId);
// } }
// List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch,idList); List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch,idList);
//
// return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "企业来款统计"); return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "企业来款统计");
// } }
/** /**
*企业来款统计 *企业来款统计