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

fix:统计调整

Browse Source
This commit is contained in:
zhangqinlin
2021-12-13 12:01:09 +08:00
parent 11878cfe03
commit 911fcef96a
14 changed files with 100 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+11 -1
View File
@@ -14,6 +14,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.DictPoint;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.data.entity.*;
@@ -21,6 +22,7 @@ import com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
import com.jero.data.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import com.jero.mail.commont.constant;
import com.jero.meeting.entity.PayMeetingRemindRecord;
import com.jero.meeting.service.IPayMeetingRemindRecordService;
import com.jero.project.common.PayProjectCommon;
@@ -30,6 +32,7 @@ import io.swagger.annotations.ApiImplicitParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
@@ -81,8 +84,15 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
String companyNames = oConvertUtils.replaceAllPercent(companyName);
String fenBiaoWeiNames = oConvertUtils.replaceAllPercent(fenBiaoWeiName);
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
String userName=null;
if (roleCodes.contains(constant.BMFZR)){
userName=sysUser.getUsername();
}
Page<FindByName> page = new Page<>(pageNo, pageSize);
IPage<FindByName> pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames);
IPage<FindByName> pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames,userName);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+13 -3
View File
@@ -13,6 +13,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.data.entity.*;
@@ -21,9 +22,12 @@ import com.jero.data.service.IPayCaseCouncilSubitemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.mail.commont.constant;
import com.jero.modules.system.util.SecurityUtil;
import com.jero.util.AmountUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
@@ -65,9 +69,15 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
String contactsNames = oConvertUtils.replaceAllPercent(contactsName);
String companyNames = oConvertUtils.replaceAllPercent(companyName);
String councilNames = oConvertUtils.replaceAllPercent(councilName);
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
String userName=null;
if (roleCodes.contains(constant.BMFZR)){
userName=sysUser.getUsername();
}
Page<councilList> page = new Page<>(pageNo, pageSize);
IPage<councilList> pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames);
IPage<councilList> pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames,userName);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
@@ -172,7 +182,7 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
public ModelAndView customExportXlsList(@RequestParam(name="contactsName",required =false) String contactsName,
@RequestParam(name = "selects",required = false) String selects,
@RequestParam(name="companyName",required =false) String companyName,
@RequestParam(name="fenBiaoWeiName",required =false) String councilName) {
@RequestParam(name="councilName",required =false) String councilName) {
String contactsNames = oConvertUtils.replaceAllPercent(contactsName);
String companyNames = oConvertUtils.replaceAllPercent(companyName);
String councilNames = oConvertUtils.replaceAllPercent(councilName);
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java
+1 -2
View File
@@ -23,11 +23,10 @@ import java.util.List;
*/
public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
IPage<FindByName> listThree (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName);
IPage<FindByName> listThree (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userName") String userName);
List<payCaseCommitteeSubitemVO> listTwo (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
List<ChooseExcelWorkingGroup> listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("councilName") String councilName);
List<ChooseExcelWorkingGroup> chooseExcel(ArrayList<String> idList);
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java
+1 -1
View File
@@ -20,7 +20,7 @@ import java.util.List;
*/
public interface PayCaseCouncilSubitemMapper extends BaseMapper<PayCaseCouncilSubitem> {
IPage<councilList> listThree(Page<councilList> page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames);
IPage<councilList> listThree(Page<councilList> page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames,@Param("userName") String userName);
List<ChooseExcelCouncil> chooseExcel(@Param("idList")ArrayList<String> idList);
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+3
View File
@@ -30,6 +30,9 @@
<if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
</if>
<if test=" userName!=null and userName != ''">
AND pe.create_by = #{userName}
</if>
</where>
group by pe.id
order by pe.create_time desc
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+3
View File
@@ -30,6 +30,9 @@
<if test=" councilNames!=null and councilNames != ''">
AND pe.name LIKE CONCAT('%',#{councilNames},'%')
</if>
<if test=" userName!=null and userName != ''">
AND pe.create_by = #{userName}
</if>
</where>
group by pe.id
order by pe.create_time desc
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java
+1 -1
View File
@@ -25,7 +25,7 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
List<payCaseCommitteeSubitemVO> listTwo(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName);
IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName,String userName);
List<ChooseExcelWorkingGroup> listForExcel(String name, String companyName, String councilName);
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.List;
*/
public interface IPayCaseCouncilSubitemService extends IService<PayCaseCouncilSubitem> {
IPage<councilList> listThree(Page<councilList> page,String contactsNames, String companyNames, String councilNames);
IPage<councilList> listThree(Page<councilList> page,String contactsNames, String companyNames, String councilNames, String userName);
List<ChooseExcelCouncil> listForExcel(String contactsNames, String companyNames, String councilNames);
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+2 -2
View File
@@ -41,8 +41,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
}
@Override
public IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName) {
return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName);
public IPage<FindByName> listThree(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName,String userName) {
return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName,userName);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java
+2 -2
View File
@@ -28,8 +28,8 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl<PayCaseCouncil
@Resource
private PayCaseCouncilSubitemMapper payCaseCouncilSubitemMapper;
@Override
public IPage<councilList> listThree(Page<councilList> page, String contactsNames, String companyNames, String councilNames) {
return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames);
public IPage<councilList> listThree(Page<councilList> page, String contactsNames, String companyNames, String councilNames, String userName) {
return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames,userName);
}
@Override
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java
+6 -4
View File
@@ -20,6 +20,12 @@ public class PayWorkGroupSubletStatistics {
@ApiModelProperty(value = "来款单位")
private String chargeCompanyTemporaryName;
@ApiModelProperty(value = "打包")
private Integer pack;
@Excel(name = "打包", width = 15)
private String packText;
@Excel(name = "应收总金额", width = 15)
@ApiModelProperty(value = "应收总金额")
private String allMoney;
@@ -38,11 +44,7 @@ public class PayWorkGroupSubletStatistics {
@ApiModelProperty(value = "来款用途文本")
private String chargeUse_text;
@ApiModelProperty(value = "打包")
private Integer pack;
@Excel(name = "打包", width = 15)
private String packText;
@Excel(name = "项目负责人", width = 15)
@ApiModelProperty(value = "项目负责人")
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+49 -47
View File
@@ -64,6 +64,8 @@ import java.util.stream.Collectors;
@RequestMapping("/statistics/allProjectStatistics")
@Slf4j
public class AllProjectStatisticsController {
@Resource
private SysUserMapper userMapper;
@Autowired
private ISysDepartService sysDepartService;
@Autowired
@@ -164,29 +166,29 @@ public class AllProjectStatisticsController {
allProjectStatisticsSearch.setProjectName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
//根据不同角色加载不同列表的参数
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//
// //admin
// if (roleCodes.contains(constant.ADMIN)) {
// idList = null;
// //部门负责人
// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
// List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
//
// idList.addAll(allDepartIds);//项目负责人
// } else if (roleCodes.contains(constant.XMFZR)) {
// String userId = sysUser.getId();
// idList.add(userId);
// } else {
// return Result.OK();
// }
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//admin
if (roleCodes.contains(constant.ADMIN)) {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
//获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
return Result.OK();
}
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,null);
HashMap<String, Object> hashMap = new HashMap<>();
@@ -334,30 +336,30 @@ public class AllProjectStatisticsController {
allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
//根据不同角色加载不同列表的参数
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//
// //admin
// if (roleCodes.contains(constant.ADMIN)) {
// idList = null;
// //部门负责人
// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
// List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
//
// idList.addAll(allDepartIds);
// } else if (roleCodes.contains(constant.XMFZR)) {
// String userId = sysUser.getId();
// idList.add(userId);
// } else {
// ArrayList<AllProjectStatistics> objects = new ArrayList<>();
// return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计");
// }
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
//admin
if (roleCodes.contains(constant.ADMIN)) {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
//获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll(allDepartIds);
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
idList.add(userId);
} else {
ArrayList<AllProjectStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计");
}
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null);
if (pageList != null) {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+4
View File
@@ -270,6 +270,10 @@ public class CompanyComeMoneyStatisticsController {
// return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
// }
List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, null);
PayCompanyManagement byId = payCompanyManagementService.getById(companyComeMoneyDetailSearch.getChargeCompanyId());
for(CompanyComeMoneyDetail s:pageList){
s.setChargeCompanyName(byId.getCompanyName());
}
for (CompanyComeMoneyDetail s : pageList) {
String key = String.valueOf(s.getChargeUse());
String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
+3 -3
View File
@@ -13,12 +13,12 @@ import org.jeecgframework.poi.excel.annotation.Excel;
public class CompanyComeMoneyDetail {
@ApiModelProperty(value = "项目id")
private String projectId;
@Excel(name = "来款企业", width = 15)
@ApiModelProperty(value = "来款企业")
private String chargeCompanyName;
@Excel(name = "来款项目", width = 15)
@ApiModelProperty(value = "来款项目")
private String projectName;
@Excel(name = "来款企业", width = 15)
@ApiModelProperty(value = "来款企业")
private String chargeCompanyName;
@Excel(name = "应收总金额", width = 15)
@ApiModelProperty(value = "应收金额")
private String allMoney;