From 3a898aa0014cfbaeea39174fbda0dfa6ef28bfe3 Mon Sep 17 00:00:00 2001 From: liangqitao <12345678> Date: Tue, 14 Dec 2021 20:19:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86-=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SendMessageServiceImpl.java | 46 ++++++++++++++++++- .../common/PayContactsManagementCommon.java | 8 +++- .../PayContactsManagementController.java | 1 + .../impl/PayCompanyManagementServiceImpl.java | 4 +- .../PayContactsManagementServiceImpl.java | 2 + .../PayIncomeContractController.java | 15 +----- .../mapper/xml/PayIncomeContractMapper.xml | 2 +- .../impl/PayIncomeContractServiceImpl.java | 24 ++-------- 8 files changed, 61 insertions(+), 41 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 431c36ba..db1326be 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -83,7 +83,9 @@ public class SendMessageServiceImpl implements SendMessageService { || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.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("wxName",env.getProperty("message.wxName")); } @@ -327,8 +329,20 @@ public class SendMessageServiceImpl implements SendMessageService { //中汽中心标准所-管理端-邮寄通知-14 sender = "8821092414406"; signature = "中汽中心标准所"; + templateId = "c90ee6f41349451c959285a01ebaaf73"; + break; + case "GL_15_XMTZ_UPLOAD_VOUCHER": + //中汽中心标准所-管理端-项目通知-15 + sender = "8821092414406"; + signature = "中汽中心标准所"; templateId = "6f054af3cfc345168e1e2e3cbf03403b"; break; + case "GL_16_HTTZ_HT_CANCELLATION": + //中汽中心标准所-管理端-合同通知-16 + sender = "8821092414406"; + signature = "中汽中心标准所"; + templateId = "5c8f7a24fe1d4611b296fd942bea88a1"; + break; case "QY_1_HYTZ_WORK_GROUP_CREATE": //中汽中心标准所-企业端-会议通知-1 sender = "8821092414406"; @@ -429,6 +443,36 @@ public class SendMessageServiceImpl implements SendMessageService { signature = "中汽中心标准所"; templateId = "54d0f666c03f4de7ac9d9ac87fa60f4c"; 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: throw new JeroBootException("codeType flase."); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java index 89ddc98a..b8587d89 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java @@ -22,9 +22,13 @@ public class PayContactsManagementCommon { */ 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"; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index e635edd0..a98a9f45 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -221,6 +221,7 @@ public class PayContactsManagementController extends JeroController listProject = new ArrayList<>(); // 获取关联项目id - if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){ - LambdaQueryWrapper queryPayIncomeContractAssociatedCancellation = new LambdaQueryWrapper(); - queryPayIncomeContractAssociatedCancellation.eq(PayIncomeContractAssociatedCancellation::getContractId,payIncomeContract.getId()); - List listPayIncomeContractAssociatedCancellation = payIncomeContractAssociatedCancellationService.list(queryPayIncomeContractAssociatedCancellation); - if(!CollectionUtils.isEmpty(listPayIncomeContractAssociatedCancellation)){ - List 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{ + if(!Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){ listProject = payIncomeContractService.getAssociated(id); } 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 edc73250..68a0c57d 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 @@ -8,7 +8,7 @@ SELECT pic.id, 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_temporary_id AS signedCompanyTemporaryId, pic.signed_company_temporary_name AS signedCompanyTemporaryName, 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 cfe06907..5092fefa 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 @@ -1030,27 +1030,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updatePayCommonProject = new LambdaUpdateWrapper<>(); - updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId()); - updatePayCommonProject.set(PayCommonProject::getContractNum,null); - payCommonProjectService.update(updatePayCommonProject); - }else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE2)){ - LambdaUpdateWrapper 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 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 updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>(); - updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,p.getProjectId()); - updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,null); - memberProjectSubitemService.update(updatePayMemberProjectSubitem); - } + PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated(); + payIncomeContractAssociated.setId(p.getId()); + cancelAssociated(payIncomeContractAssociated); }); payIncomeContractAssociatedCancellationService.saveBatch(list); }