shc 10 月之前
父節點
當前提交
fa420a7c13

+ 6 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/listener/PackageContractEventListener.java

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.listener;
 
 import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.util.StrUtil;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysEntContractInfo;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageContract;
@@ -154,7 +155,7 @@ public class PackageContractEventListener {
 
     private Map<String, String> buildContractParams(PackageContractEvent event, LocalDateTime now) {
 
-        Map<String, String> params = new HashMap<>(29);
+        Map<String, String> params = new HashMap<>(80);
 
         // 获取积分包
         WmScorePackage pkg = packageService.getById(event.getPackageId().toString());
@@ -167,7 +168,8 @@ public class PackageContractEventListener {
         MAH mah = MAH.get(drugEntName);
 
         // 合同号
-        params.put("contract_no", pkg.getPackageSn().toUpperCase());
+        String pkgSn = StrUtil.isNotBlank( pkg.getPackageSn()) ? pkg.getPackageSn().toUpperCase() : DateTimeFormatter.ofPattern(DatePattern.PURE_DATETIME_MS_PATTERN).format(LocalDateTime.now());
+        params.put("contract_no",pkgSn);
 
         // 甲方信息
         if (mah != null) {
@@ -196,6 +198,8 @@ public class PackageContractEventListener {
             params.put("party_b_reg_code", contractInfo.getRegCode());
         }
 
+        params.put("agreement_no", pkgSn);
+
         // 合同岂止时间
         params.put("issue_date", DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_PATTERN).format(pkg.getCreateTime()));
         params.put("expiry_date", DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_PATTERN).format(pkg.getEndTime()));