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:
liangqitao
2021-12-14 20:19:09 +08:00
parent fa2636002d
commit 3a898aa001
8 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+45 -1
View File
@@ -83,7 +83,9 @@ public class SendMessageServiceImpl implements SendMessageService {
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG20.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG21.getCode())){
map.put("systemAddress",env.getProperty("message.systemUrl")); map.put("systemAddress",env.getProperty("message.systemUrl"));
map.put("wxName",env.getProperty("message.wxName")); map.put("wxName",env.getProperty("message.wxName"));
} }
@@ -327,8 +329,20 @@ public class SendMessageServiceImpl implements SendMessageService {
//中汽中心标准所-管理端-邮寄通知-14 //中汽中心标准所-管理端-邮寄通知-14
sender = "8821092414406"; sender = "8821092414406";
signature = "中汽中心标准所"; signature = "中汽中心标准所";
templateId = "c90ee6f41349451c959285a01ebaaf73";
break;
case "GL_15_XMTZ_UPLOAD_VOUCHER":
//中汽中心标准所-管理端-项目通知-15
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "6f054af3cfc345168e1e2e3cbf03403b"; templateId = "6f054af3cfc345168e1e2e3cbf03403b";
break; break;
case "GL_16_HTTZ_HT_CANCELLATION":
//中汽中心标准所-管理端-合同通知-16
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "5c8f7a24fe1d4611b296fd942bea88a1";
break;
case "QY_1_HYTZ_WORK_GROUP_CREATE": case "QY_1_HYTZ_WORK_GROUP_CREATE":
//中汽中心标准所-企业端-会议通知-1 //中汽中心标准所-企业端-会议通知-1
sender = "8821092414406"; sender = "8821092414406";
@@ -429,6 +443,36 @@ public class SendMessageServiceImpl implements SendMessageService {
signature = "中汽中心标准所"; signature = "中汽中心标准所";
templateId = "54d0f666c03f4de7ac9d9ac87fa60f4c"; templateId = "54d0f666c03f4de7ac9d9ac87fa60f4c";
break; break;
case "QY_17_JFTZ_UPLOAD_VOUCHER":
//中汽中心标准所-企业端-缴费通知-17
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "b84b4c425dae4d39b0ae14cd1fbe83c6";
break;
case "QY_18_JFTZ_VOUCHER_CHECK":
//中汽中心标准所-企业端-缴费通知-18
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "365c477feb2f4e7b96a0344984627994";
break;
case "QY_19_HYTZ_CANCELLATION":
// 中汽中心标准所-企业端-合同通知-19
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "572fb0a9da684bf6a47a530e5be467e0";
break;
case "QY_20_HYTZ_NOT_AUDIT_CREATE":
// 中汽中心标准所-企业端-项目通知-20
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "fc2838a86f794d1891a3d4ce1ff9139e";
break;
case "QY_21_HYTZ_NOT_AUDIT_CREATE":
// 中汽中心标准所-企业端-合同通知-21
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "c6608053b3a2482bb3db7c00820bbd4a";
break;
default: default:
throw new JeroBootException("codeType flase."); throw new JeroBootException("codeType flase.");
} }
jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java
+6 -2
View File
@@ -22,9 +22,13 @@ public class PayContactsManagementCommon {
*/ */
public final static String FLAG_STATUS = "1"; public final static String FLAG_STATUS = "1";
/** /**
* 删除状态(0为未通过，1为审核通过)只有企业端登录需要判断此字段 * 删除状态 0:通过 1：未通过只有企业端登录需要判断此字段
*/ */
public final static String DEL_FLAG = "0"; public final static String DEL_FLAG0 = "0";
/**
* 删除状态 0:通过 1：未通过只有企业端登录需要判断此字段
*/
public final static String DEL_FLAG1 = "1";
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+1
View File
@@ -221,6 +221,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
log.error("手机号、邮箱加密异常！",e); log.error("手机号、邮箱加密异常！",e);
} }
payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE1); payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE1);
payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1);
payContactsManagementService.save(payContactsManagement); payContactsManagementService.save(payContactsManagement);
return Result.OK("添加成功！",payContactsManagement); return Result.OK("添加成功！",payContactsManagement);
} }
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+2 -2
View File
@@ -446,7 +446,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
throw new JeroBootException("此用户已在其他企业下"); throw new JeroBootException("此用户已在其他企业下");
} }
addMeeting(payCompanyManagement); addMeeting(payCompanyManagement);
payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG); payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1);
payContactsManagement.setCompanyId(payCompanyManagement.getId()); payContactsManagement.setCompanyId(payCompanyManagement.getId());
payContactsManagementService.addMeeting(payContactsManagement); payContactsManagementService.addMeeting(payContactsManagement);
}else{// 编辑 }else{// 编辑
@@ -473,7 +473,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
payContactsManagementService.contactsEdit(payContactsManagement); payContactsManagementService.contactsEdit(payContactsManagement);
} }
}else{ }else{
payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG); payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1);
payContactsManagementService.addMeeting(payContactsManagement); payContactsManagementService.addMeeting(payContactsManagement);
} }
payCompanyManagement.setId(listPayCompanyManagement.get(0).getId()); payCompanyManagement.setId(listPayCompanyManagement.get(0).getId());
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+2
View File
@@ -106,6 +106,8 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
} }
if(StringUtils.isBlank(payContactsManagement.getFlagStatus())){ if(StringUtils.isBlank(payContactsManagement.getFlagStatus())){
payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE1); payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE1);
}else{
payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1);
} }
save(payContactsManagement); save(payContactsManagement);
} }
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+1 -14
View File
@@ -476,20 +476,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
PayIncomeContractDetailOutput payIncomeContractDetailOutput = JSONObject.parseObject(str,PayIncomeContractDetailOutput.class); PayIncomeContractDetailOutput payIncomeContractDetailOutput = JSONObject.parseObject(str,PayIncomeContractDetailOutput.class);
List<ProjectOutput> listProject = new ArrayList<>(); List<ProjectOutput> listProject = new ArrayList<>();
// 获取关联项目id // 获取关联项目id
if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){ if(!Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){
LambdaQueryWrapper<PayIncomeContractAssociatedCancellation> queryPayIncomeContractAssociatedCancellation = new LambdaQueryWrapper();
queryPayIncomeContractAssociatedCancellation.eq(PayIncomeContractAssociatedCancellation::getContractId,payIncomeContract.getId());
List<PayIncomeContractAssociatedCancellation> listPayIncomeContractAssociatedCancellation = payIncomeContractAssociatedCancellationService.list(queryPayIncomeContractAssociatedCancellation);
if(!CollectionUtils.isEmpty(listPayIncomeContractAssociatedCancellation)){
List<ProjectOutput> finalListProject = listProject;
listPayIncomeContractAssociatedCancellation.forEach(p->{
String s = JSON.toJSONString(p);
ProjectOutput projectOutput = JSONObject.parseObject(s,ProjectOutput.class);
projectOutput.setId(p.getAssociatedId());
finalListProject.add(projectOutput);
});
}
}else{
listProject = payIncomeContractService.getAssociated(id); listProject = payIncomeContractService.getAssociated(id);
} }
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+1 -1
View File
@@ -8,7 +8,7 @@
SELECT SELECT
pic.id, pic.id,
pic.contract_num AS contractNum, pic.contract_num AS contractNum,
pic.contract_name AS contractName, if(pic.status = 6,CONCAT(pic.contract_name,'已作废'),pic.contract_name) AS contractName,
pic.signed_company_id AS signedCompanyId, pic.signed_company_id AS signedCompanyId,
pic.signed_company_temporary_id AS signedCompanyTemporaryId, pic.signed_company_temporary_id AS signedCompanyTemporaryId,
pic.signed_company_temporary_name AS signedCompanyTemporaryName, pic.signed_company_temporary_name AS signedCompanyTemporaryName,
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+3 -21
View File
@@ -1030,27 +1030,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payIncomeContractAssociatedCancellation.setId(null); payIncomeContractAssociatedCancellation.setId(null);
payIncomeContractAssociatedCancellation.setAssociatedId(p.getId()); payIncomeContractAssociatedCancellation.setAssociatedId(p.getId());
list.add(payIncomeContractAssociatedCancellation); list.add(payIncomeContractAssociatedCancellation);
if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE1)){ PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>(); payIncomeContractAssociated.setId(p.getId());
updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId()); cancelAssociated(payIncomeContractAssociated);
updatePayCommonProject.set(PayCommonProject::getContractNum,null);
payCommonProjectService.update(updatePayCommonProject);
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE2)){
LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,p.getProjectId());
updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,null);
payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE3)){
LambdaUpdateWrapper<PayMeetingSituation> updatePayMeetingSituation = new LambdaUpdateWrapper<>();
updatePayMeetingSituation.eq(PayMeetingSituation::getId,p.getProjectId());
updatePayMeetingSituation.set(PayMeetingSituation::getContractId,null);
payMeetingSituationService.update(updatePayMeetingSituation);
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE4)){
LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,p.getProjectId());
updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,null);
memberProjectSubitemService.update(updatePayMemberProjectSubitem);
}
}); });
payIncomeContractAssociatedCancellationService.saveBatch(list); payIncomeContractAssociatedCancellationService.saveBatch(list);
} }