diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
index aa375ee1..665948b1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
@@ -91,7 +91,7 @@
AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
- AND aa.principal_id = #{payIncomeContract.principalId}
+ AND aa.principalId = #{payIncomeContract.principalId}
ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index 4b02e333..35b77973 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -251,7 +251,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>();
@@ -1033,18 +1033,25 @@ public class PayIncomeContractServiceImpl extends ServiceImpl{
- 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 updatePayIncomeContractInstallment = new LambdaUpdateWrapper<>();
updatePayIncomeContractInstallment.in(PayIncomeContractInstallment::getContractId,ids);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index b9782216..fcab462b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -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 listPaySpendingContractInstallment = new ArrayList<>();
if(!CollectionUtils.isEmpty(input.getInstallment())){
listPaySpendingContractInstallment = input.getInstallment();
@@ -217,6 +226,12 @@ public class PaySpendingContractServiceImpl extends ServiceImpl updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
updatePaySpendingContractInstallment.eq(PaySpendingContractInstallment::getContractId,id);
@@ -229,9 +244,21 @@ public class PaySpendingContractServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>();
query.in(PaySpendingContract::getId,ids);
List 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() + "支出合同不可操作！
");
+ }
+ }
+ });
+ if(!StringUtils.isEmpty(msg)){
+ throw new JeroBootException(msg.toString());
+ }
paySpendingContractService.removeByIds(ids);
LambdaUpdateWrapper updatePaySpendingContractInstallment = new LambdaUpdateWrapper<>();
updatePaySpendingContractInstallment.in(PaySpendingContractInstallment::getContractId,ids);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 1cf60804..7107b0b3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -166,28 +166,11 @@ public class PayWorkingGroupController extends JeroController list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2);
- List listNew = new ArrayList<>();
+ List list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2,payIncomeContract.getPack(),payIncomeContract.getPackYear());
if(!CollectionUtils.isEmpty(list)){
- // 查询打包年份的打包企业
- List listProject = new ArrayList<>();
- if(Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){
- listProject = payPackCompanyProjectService.queryPackToYear(payIncomeContract.getSignedCompanyId(),PayProjectCommon.PROJECT_TYPE2,payIncomeContract.getPackYear());
- }
- List 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);
}
/**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
index 55050c08..c4356f7d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
@@ -39,7 +39,8 @@ public interface PayWorkingGroupMapper extends BaseMapper {
* @Exception
*/
List 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 查询不存在成员单位的列表
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 981078fb..e5f66c5a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -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})
-
- AND pwg.working_group_project LIKE concat('%',concat(#{workingGroupProject},'%'))
-
-
- AND pwg.year = #{year}
-
+ 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 = '' )
+
+ AND (ppc.pack_year=#{packYear} or ppc.id is null OR ppc.id ='')
+
+
+ AND pwg.working_group_project LIKE concat('%',concat(#{workingGroupProject},'%'))
+
+
+ AND pwg.year = #{year}
+
GROUP BY pwg.id ORDER BY pwg.create_time DESC