fix: pkg contract gen

hnqz-common/hnqz-common-core/src/main/java/com/qunzhixinxi/hnqz/common/core/util/PdfUtils.java

@@ -77,8 +77,8 @@ public final class PdfUtils {
 
     public static void main(String[] args) {
 
-        String templatePath = "/Users/jimmy/Documents/pkg_tmpl_v19.pdf";
-        String outFilePath = "/Users/jimmy/Desktop/temp/" + UUID.randomUUID() + ".pdf";
+        String templatePath = "/Users/jimmy/pkg_temp_v19_1.pdf";
+        String outFilePath = "/Users/jimmy/Desktop/" + UUID.randomUUID() + ".pdf";
         Map<String, String> params = new HashMap<>();
         params.put("party_a_name", "中国生物水痘生产企业");
         params.put("party_a_address", "北京市朝阳区双桥路123号中国生物基地10-12号");

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

@@ -2,6 +2,7 @@ package com.qunzhixinxi.hnqz.admin.listener;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysEntContractInfo;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPackageContract;
@@ -168,8 +169,8 @@ public class PackageContractEventListener {
         MAH mah = MAH.get(drugEntName);
 
         // 合同号
-        String pkgSn = StrUtil.isNotBlank( pkg.getPackageSn()) ? pkg.getPackageSn().toUpperCase() : DateTimeFormatter.ofPattern(DatePattern.PURE_DATETIME_MS_PATTERN).format(LocalDateTime.now());
-        params.put("contract_no",pkgSn);
+        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) {
@@ -185,15 +186,15 @@ public class PackageContractEventListener {
 
 
         // 乙方信息
-        SysEntContractInfo contractInfo = entContractInfoMapper.selectById(pkg.getDeptId());
+        SysEntContractInfo contractInfo = entContractInfoMapper.selectOne(Wrappers.<SysEntContractInfo>lambdaQuery().eq(SysEntContractInfo::getDeptId, pkg.getDeptId()));
         if (contractInfo != null) {
             params.put("party_b_name", contractInfo.getEntName());
             params.put("party_b_address", contractInfo.getAddress());
             params.put("party_b_resp_name", contractInfo.getRespName());
             params.put("party_b_contact_name", contractInfo.getContactName());
             params.put("party_b_contact_phone", contractInfo.getContactPhone());
-            params.put("party_b_bank_name", contractInfo.getBankName() );
-            params.put("party_b_bank_no", contractInfo.getBankNo() );
+            params.put("party_b_bank_name", contractInfo.getBankName());
+            params.put("party_b_bank_no", contractInfo.getBankNo());
             params.put("party_b_bank_account", contractInfo.getBankAccount());
             params.put("party_b_reg_code", contractInfo.getRegCode());
         }
@@ -217,7 +218,7 @@ public class PackageContractEventListener {
             params.put("name" + i, qty.getTaskTypeName());
             params.put("qty" + i, count.toString());
             params.put("price" + i, qty.getPrice().toString());
-            params.put("rate" + i, String.format(".2%f%%", count.doubleValue() / total));
+            params.put("rate" + i, String.format("%.2f%%", count.doubleValue() / total));
         }
 
         params.put("sign_date", DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_PATTERN).format(now.toLocalDate()));