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

收入合同bug修改#40228

Browse Source
This commit is contained in:
梁琦涛
2021-10-09 10:31:23 +08:00
parent dcb772cf7c
commit 055b587e58
3 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+6 -1
View File
@@ -108,10 +108,15 @@ public class PayIncomeContractCommon {
* @param RSAPublicKey 公钥 * @param RSAPublicKey 公钥
* @return String 加密后的字符串 * @return String 加密后的字符串
*/ */
public static String encryptByRsaPriKey(String token,String RSAPublicKey) { public final static String encryptByRsaPriKey(String token,String RSAPublicKey) {
RSA rsa = new RSA(null, RSAPublicKey); RSA rsa = new RSA(null, RSAPublicKey);
byte[] encrypt = rsa.encrypt(token, KeyType.PublicKey); byte[] encrypt = rsa.encrypt(token, KeyType.PublicKey);
return new String(encrypt); return new String(encrypt);
} }
/**
* 来款方式（1：无，2：合同，3：收费通知）
*/
public final static Integer CHARGE_WAY2 = 2;
} }
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+1 -1
View File
@@ -184,7 +184,7 @@
LEFT JOIN tb_member_project tmember ON tmember.id=tmsub.project_id LEFT JOIN tb_member_project tmember ON tmember.id=tmsub.project_id
WHERE pica.contract_id = #{contractId} WHERE pica.contract_id = #{contractId}
) a ) a
ORDER BY createTime,projectId DESC ORDER BY createTime DESC,projectId DESC
</select> </select>
<select id="queryCompanyPageList" resultType="com.jero.contract.entity.PayIncomeContract"> <select id="queryCompanyPageList" resultType="com.jero.contract.entity.PayIncomeContract">
select pic.*,pmc.post_status as postStatus from pay_income_contract pic select pic.*,pmc.post_status as postStatus from pay_income_contract pic
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+40 -48
View File
@@ -336,23 +336,21 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
} }
// 验证项目是否已被关联 // 验证项目是否已被关联
getIncomeContractAssociated(p.getContractId(),p.getProjectId()); getIncomeContractAssociated(p.getContractId(),p.getProjectId());
// 关联合同，项目选了合同，变更合同编号
// 合同选择打包 && 企业没有打包，添加打包企业 LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) && !Objects.equals(payCommonProject.getPack(),PayIncomeContractCommon.PACK1)){ updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId());
LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>(); updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername());
updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId()); updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date());
if(!StringUtils.isBlank(payCommonProject.getContractNum())){ if(Objects.equals(payCommonProject.getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
updatePayCommonProject.set(PayCommonProject::getContractNum,payIncomeContract.getContractNum()); updatePayCommonProject.set(PayCommonProject::getContractNum,payIncomeContract.getContractNum());
} }
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
updatePayCommonProject.set(PayCommonProject::getPack,PayIncomeContractCommon.PACK1); updatePayCommonProject.set(PayCommonProject::getPack,PayIncomeContractCommon.PACK1);
updatePayCommonProject.set(PayCommonProject::getUpdateBy,sysUser.getUsername()); payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
updatePayCommonProject.set(PayCommonProject::getUpdateTime,new Date()); }
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(payCommonProject.getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
payCommonProjectService.update(updatePayCommonProject); payCommonProjectService.update(updatePayCommonProject);
// 添加打包企业
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContract.getPackYear(),payCommonProject.getId(),PayIncomeContractCommon.PROJECT_TYPE1,payIncomeContract.getPack());
}
} }
principalId = payCommonProject.getPrincipalId(); principalId = payCommonProject.getPrincipalId();
projectName = payCommonProject.getChargeProject(); projectName = payCommonProject.getChargeProject();
@@ -379,23 +377,21 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
// 验证项目是否已被关联 // 验证项目是否已被关联
getIncomeContractAssociated(p.getContractId(),listPayWorkingGroupSubItem.get(0).getId()); getIncomeContractAssociated(p.getContractId(),listPayWorkingGroupSubItem.get(0).getId());
// 合同选择打包,运行年份不是打包企业，添加打包企业 // 关联合同，项目选了合同，变更合同编号
LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId());
if(Objects.equals(listPayWorkingGroupSubItem.get(0).getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,payIncomeContract.getContractNum());
}
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){ if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
// 打包,将关联项目设置成打包
LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
if(!StringUtils.isBlank(listPayWorkingGroupSubItem.get(0).getContractNum())){
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,payIncomeContract.getContractNum());
}
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK1); updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK1);
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId()); payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
}
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(listPayWorkingGroupSubItem.get(0).getChargeWay(),PayIncomeContractCommon.CHARGE_WAY2)){
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
// 添加打包企业
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
payPackCompanyProjectService.setPack(listPayWorkingGroupSubItem.get(0).getChargeCompanyId(),listPayWorkingGroupSubItem.get(0).getContactsIdOne(),payIncomeContract.getPackYear(),listPayWorkingGroupSubItem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE2,payIncomeContract.getPack());
}
} }
principalId = payWorkingGroup.getPrincipalIdA(); principalId = payWorkingGroup.getPrincipalIdA();
projectName = payWorkingGroup.getWorkingGroupProject(); projectName = payWorkingGroup.getWorkingGroupProject();
@@ -423,12 +419,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
} }
// 验证项目是否已被关联 // 验证项目是否已被关联
getIncomeContractAssociated(p.getContractId(),payMeetingSituation.getId()); getIncomeContractAssociated(p.getContractId(),payMeetingSituation.getId());
// 合同选择打包,运行年份不是打包企业，添加打包企业 // 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){ if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
// 合同选择了打包，查看打包年份&&打包企业是否存在 payPackCompanyProjectService.setPack(payMeetingSituation.getCompanyId(),payMeetingSituation.getContractId(),payIncomeContract.getPackYear(),payMeetingSituation.getId(),PayIncomeContractCommon.PROJECT_TYPE3,payIncomeContract.getPack());
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
payPackCompanyProjectService.setPack(payMeetingSituation.getCompanyId(),payMeetingSituation.getContractId(),payIncomeContract.getPackYear(),payMeetingSituation.getId(),PayIncomeContractCommon.PROJECT_TYPE3,payIncomeContract.getPack());
}
} }
principalId = payMeeting.getDirectorId(); principalId = payMeeting.getDirectorId();
projectName = payMeeting.getMeetingName(); projectName = payMeeting.getMeetingName();
@@ -454,23 +447,22 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
} }
// 验证项目是否已被关联 // 验证项目是否已被关联
getIncomeContractAssociated(p.getContractId(),listPayMemberProjectSubitem.get(0).getId()); getIncomeContractAssociated(p.getContractId(),listPayMemberProjectSubitem.get(0).getId());
// 合同选择打包,运行年份不是打包企业，添加打包企业
// 关联合同，项目选了合同，变更合同编号,选择了打包，变更打包状态
LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateBy,sysUser.getUsername());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateTime,new Date());
updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,listPayMemberProjectSubitem.get(0).getId());
if(Objects.equals(listPayMemberProjectSubitem.get(0).getPaymentMethod(),PayIncomeContractCommon.CHARGE_WAY2)){
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,payIncomeContract.getContractNum());
}
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){ if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
// 打包,将关联项目设置成打包
LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateBy,sysUser.getUsername());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getUpdateTime,new Date());
if(!StringUtils.isBlank(listPayMemberProjectSubitem.get(0).getContractNo())){
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,payIncomeContract.getContractNum());
}
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getPack,PayIncomeContractCommon.PACK1); updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getPack,PayIncomeContractCommon.PACK1);
updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,listPayMemberProjectSubitem.get(0).getId()); payPackCompanyProjectService.setPack(listPayMemberProjectSubitem.get(0).getCompanyId(),listPayMemberProjectSubitem.get(0).getCompanyContactId(),payIncomeContract.getPackYear(),listPayMemberProjectSubitem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE4,payIncomeContract.getPack());
}
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1) || Objects.equals(listPayMemberProjectSubitem.get(0).getPaymentMethod(),PayIncomeContractCommon.CHARGE_WAY2)){
memberProjectSubitemService.update(updatePayMemberProjectSubitem); memberProjectSubitemService.update(updatePayMemberProjectSubitem);
// 添加打包企业
// 合同选择了打包，查看打包年份&&打包企业是否存在
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
payPackCompanyProjectService.setPack(listPayMemberProjectSubitem.get(0).getCompanyId(),listPayMemberProjectSubitem.get(0).getCompanyContactId(),payIncomeContract.getPackYear(),listPayMemberProjectSubitem.get(0).getId(),PayIncomeContractCommon.PROJECT_TYPE4,payIncomeContract.getPack());
}
} }
principalId = payMemberProject.getDirectorId(); principalId = payMemberProject.getDirectorId();
projectName = payMemberProject.getProjectName(); projectName = payMemberProject.getProjectName();