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

修改bug#40897

Browse Source
This commit is contained in:
梁琦涛
2021-10-20 10:03:40 +08:00
parent a207384214
commit ba77bc1810
8 changed files with 69 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+1 -1
View File
@@ -91,7 +91,7 @@
AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
</if>
<if test="payIncomeContract.principalId != null and payIncomeContract.principalId != ''">
AND aa.principal_id = #{payIncomeContract.principalId}
AND aa.principalId = #{payIncomeContract.principalId}
</if>
</where>
ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+17 -10
View File
@@ -251,7 +251,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(!Objects.equals(sysUser.getId(),payIncomeContract.getPrincipalId())){
if(!Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
throw new JeroBootException("收入合同不可操作！");
}
}
@@ -743,7 +743,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(!Objects.equals(sysUser.getId(),payIncomeContract.getPrincipalId())){
if(!Objects.equals(sysUser.getId(),payIncomeContractNew.getPrincipalId())){
throw new JeroBootException("收入合同不可操作！");
}
}
@@ -1004,12 +1004,12 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(!Objects.equals(sysUser.getId(),payIncomeContractStatus.getPrincipalId())){
throw new JeroBootException("收入合同不可操作！");
throw new JeroBootException(payIncomeContractStatus.getContractName() + "收入合同不可操作！");
}
}
if(!Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS1)
&& !Objects.equals(payIncomeContractStatus.getStatus(),PayIncomeContractCommon.STATUS4)){
throw new JeroBootException("收入合同不可删除！");
throw new JeroBootException(payIncomeContractStatus.getContractName() + "收入合同不可删除！");
}
payIncomeContractService.removeById(id);
LambdaUpdateWrapper<PayIncomeContractInstallment> updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>();
@@ -1033,18 +1033,25 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
throw new JeroBootException("收入合同不存在！");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
StringBuilder msg = new StringBuilder();
StringBuilder msg1 = new StringBuilder();
listPayIncomeContractStatus.forEach(p->{
if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1)
&& !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){
throw new JeroBootException("收入合同不可删除！");
}
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){
throw new JeroBootException("收入合同不可操作！");
msg.append("收入合同不可操作！");
}
}
if(!Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS1)
&& !Objects.equals(p.getStatus(),PayIncomeContractCommon.STATUS4)){
msg1.append("收入合同不可删除！");
}
});
if(!StringUtils.isEmpty(msg)){
throw new JeroBootException(msg.toString());
}
if(!StringUtils.isEmpty(msg1)){
throw new JeroBootException(msg1.toString());
}
payIncomeContractService.removeByIds(ids);
LambdaUpdateWrapper<PayIncomeContractInstallment> updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>();
updatePayIncomeContractInstallment.in(PayIncomeContractInstallment::getContractId,ids);
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+27
View File
@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.common.RoleCommon;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.DateUtils;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.ValidUtil;
@@ -25,6 +27,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.shiro.SecurityUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -156,6 +159,12 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
if(Objects.isNull(paySpendingContractStatus)){
throw new JeroBootException("支出合同不存在！");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(!Objects.equals(sysUser.getId(),paySpendingContractStatus.getPrincipalId())){
throw new JeroBootException("支出合同不可操作！");
}
}
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = new ArrayList<>();
if(!CollectionUtils.isEmpty(input.getInstallment())){
listPaySpendingContractInstallment = input.getInstallment();
@@ -217,6 +226,12 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
if(Objects.isNull(paySpendingContractStatus)){
throw new JeroBootException("支出合同不存在！");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(!Objects.equals(sysUser.getId(),paySpendingContractStatus.getPrincipalId())){
throw new JeroBootException(paySpendingContractStatus.getContractName() + "支出合同不可操作！");
}
}
paySpendingContractService.removeById(id);
LambdaUpdateWrapper<PaySpendingContractInstallment> updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
updatePaySpendingContractInstallment.eq(PaySpendingContractInstallment::getContractId,id);
@@ -229,9 +244,21 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
LambdaQueryWrapper<PaySpendingContract> query = new LambdaQueryWrapper<>();
query.in(PaySpendingContract::getId,ids);
List<PaySpendingContract> listPaySpendingContractStatus = paySpendingContractService.list(query);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(CollectionUtils.isEmpty(listPaySpendingContractStatus)){
throw new JeroBootException("收入合同不存在！");
}
StringBuilder msg = new StringBuilder();
listPaySpendingContractStatus.forEach(p->{
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(!Objects.equals(sysUser.getId(),p.getPrincipalId())){
msg.append(p.getContractName() + "支出合同不可操作！<br/>");
}
}
});
if(!StringUtils.isEmpty(msg)){
throw new JeroBootException(msg.toString());
}
paySpendingContractService.removeByIds(ids);
LambdaUpdateWrapper<PaySpendingContractInstallment> updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
updatePaySpendingContractInstallment.in(PaySpendingContractInstallment::getContractId,ids);
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+3 -20
View File
@@ -166,28 +166,11 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
if(!StringUtils.isBlank(workingGroupProject)){
workingGroupProject = oConvertUtils.replaceAllPercent(workingGroupProject);
}
List<PayWorkingGroupVO> list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2);
List<PayWorkingGroupVO> listNew = new ArrayList<>();
List<PayWorkingGroupVO> list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2,payIncomeContract.getPack(),payIncomeContract.getPackYear());
if(!CollectionUtils.isEmpty(list)){
// 查询打包年份的打包企业
List<String> listProject = new ArrayList<>();
if(Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){
listProject = payPackCompanyProjectService.queryPackToYear(payIncomeContract.getSignedCompanyId(),PayProjectCommon.PROJECT_TYPE2,payIncomeContract.getPackYear());
}
List<String> finalListProject = listProject;
list.forEach(p->{
// 去掉已打包&&打包年份不一致的数据
if(!CollectionUtils.isEmpty(finalListProject) && Objects.equals(p.getPack(),PayProjectCommon.PACKAGING1)
&& !finalListProject.contains(p.getId())){
return;
}
listNew.add(p);
});
setPayWorkingGroupSubItem(list);
}
if(!CollectionUtils.isEmpty(listNew)){
setPayWorkingGroupSubItem(listNew);
}
return Result.OK(listNew);
return Result.OK(list);
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+2 -1
View File
@@ -39,7 +39,8 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
* @Exception
*/
List<PayWorkingGroupVO> queryListByCompany(@Param("companyId") String companyId,@Param("workingGroupProject") String workingGroupProject,
@Param("year") String year,@Param("projectType") String projectType);
@Param("year") String year,@Param("projectType") String projectType,
@Param("pack")Integer pack, @Param("packYear") String packYear);
/**
* @Description 查询不存在成员单位的列表
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+16 -8
View File
@@ -68,14 +68,22 @@
pwgs.id AS proejctId
FROM pay_working_group_subitem pwgs
LEFT JOIN pay_working_group pwg ON pwg.id = pwgs.working_group_id
WHERE pwg.id is not null AND pwg.id !='' AND pwgs.charge_company_id = #{companyId}
AND pwgs.id NOT IN (SELECT project_id FROM pay_income_contract_associated WHERE project_type=#{projectType})
<if test="workingGroupProject != null and workingGroupProject != ''">
AND pwg.working_group_project LIKE concat('%',concat(#{workingGroupProject},'%'))
</if>
<if test="year != null and year != ''">
AND pwg.year = #{year}
</if>
LEFT JOIN pay_pack_company_project ppcp ON ppcp.project_id = pwgs.id
LEFT JOIN pay_pack_company ppc ON ppc.id = ppcp.pack_id
LEFT JOIN pay_income_contract_associated pica ON pica.project_id = pwgs.id
WHERE
pwg.id is not null AND pwg.id !=''
AND pwgs.charge_company_id = #{companyId}
AND ( pica.id IS NULL OR pica.id = '' )
<if test="pack == 1 and packYear != '' and packYear != null">
AND (ppc.pack_year=#{packYear} or ppc.id is null OR ppc.id ='')
</if>
<if test="workingGroupProject != null and workingGroupProject != ''">
AND pwg.working_group_project LIKE concat('%',concat(#{workingGroupProject},'%'))
</if>
<if test="year != null and year != ''">
AND pwg.year = #{year}
</if>
GROUP BY pwg.id ORDER BY pwg.create_time DESC
</select>
<select id="queryListByNotCompany" resultType="com.jero.project.entity.PayWorkingGroup">
jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java
+1 -1
View File
@@ -36,7 +36,7 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
* @Return
* @Exception
*/
List<PayWorkingGroupVO> queryListByCompany(String companyId,String workingGroupProject,String year,String projectType);
List<PayWorkingGroupVO> queryListByCompany(String companyId,String workingGroupProject,String year,String projectType,Integer pack,String packYear);
/**
* @Description 查询不存在成员单位的列表
* @Author lqt
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+2 -2
View File
@@ -65,8 +65,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
}
@Override
public List<PayWorkingGroupVO> queryListByCompany(String companyId,String workingGroupProject, String year,String projectType) {
return payWorkingGroupMapper.queryListByCompany(companyId,workingGroupProject,year,projectType);
public List<PayWorkingGroupVO> queryListByCompany(String companyId,String workingGroupProject, String year,String projectType,Integer pack,String packYear) {
return payWorkingGroupMapper.queryListByCompany(companyId,workingGroupProject,year,projectType, pack, packYear);
}
@Override