feat: 企业合同信息字段扩展（添加银行信息）

doc/db/33sys_ent_cont_info.sql

@@ -12,6 +12,7 @@ CREATE TABLE `sys_ent_cont_info`
     `info_id`           INT UNSIGNED AUTO_INCREMENT NOT NULL COMMENT '信息',
     `ent_id`            INT                         NOT NULL COMMENT '企业ID',
     `ent_name`          VARCHAR(64)                 NULL COMMENT '企业名称',
+    `reg_code`          VARCHAR(64)                 NULL COMMENT '三合一信用代码',
     `ent_addr`          VARCHAR(255)                NULL COMMENT '企业地址',
     `ent_resp_name`     VARCHAR(64)                 NULL COMMENT '企业法人',
     `ent_contact_name`  VARCHAR(64)                 NULL COMMENT '企业联系人',

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysEntContractInfo.java

@@ -28,6 +28,9 @@ public class SysEntContractInfo implements Serializable {
 
     private String entName;
 
+    @TableField(value = "reg_code")
+    private String regCode;
+
     @TableField(value = "ent_addr")
     private String address;
 

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

@@ -121,7 +121,7 @@ public class PackageContractEventListener {
         Map<String, String> envPaths = OsEnvUtils.getEachEnvPaths();
 
         // 生成合同
-        String templatePath = envPaths.get(OsEnvUtils.TargetFile.TEMPLATE.getName()) + "pkg_tmpl_v19.pdf";
+        String templatePath = envPaths.get(OsEnvUtils.TargetFile.TEMPLATE.getName()) + "pkg_tmpl_v19_1.pdf";
         final String outFilePath =
                 // 根据环境获取临时目录
                 envPaths.get(OsEnvUtils.TargetFile.CONTRACT.getName())
@@ -166,6 +166,9 @@ public class PackageContractEventListener {
         String drugEntName = drugtables.get(0).getDrugEntName();
         MAH mah = MAH.get(drugEntName);
 
+        // 合同号
+        params.put("contract_no", pkg.getPackageSn().toUpperCase());
+
         // 甲方信息
         if (mah != null) {
             params.put("party_a_name", mah.getName());
@@ -173,6 +176,9 @@ public class PackageContractEventListener {
             params.put("party_a_resp_name", mah.getRespName());
             params.put("party_a_contact_name", mah.getContractName());
             params.put("party_a_contact_phone", mah.getContractPhone());
+            BankInfo bankInfo = mah.bankInfo;
+            params.put("party_a_bank_name", bankInfo.getBankName());
+            params.put("party_a_bank_account", bankInfo.getBankAccountNumber());
         }
 
 
@@ -184,6 +190,10 @@ public class PackageContractEventListener {
             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_account", contractInfo.getBankAccount());
+            params.put("party_b_reg_code", contractInfo.getRegCode());
         }
 
         // 合同岂止时间
@@ -195,24 +205,15 @@ public class PackageContractEventListener {
 
         List<WmPackageTaskTypeQty> qtyList = event.getTaskTypeQtiyList();
         int total = qtyList.stream().mapToInt(WmPackageTaskTypeQty::getQty).sum();
-        // Set<Integer> ttIds = qtyList.stream().map(WmPackageTaskTypeQty::getTaskTypeId).collect(Collectors.toSet());
-
-        // List<WmTaskType> list = taskTypeService.list(Wrappers.<WmTaskType>lambdaQuery().in(WmTaskType::getId, ttIds));
-        // Map<Integer, String> collect = qtyList.stream().collect(Collectors.toMap(WmPackageTaskTypeQty::getTaskTypeId, WmPackageTaskTypeQty::getTaskTypeName));
-
 
         for (int i = 0, size = qtyList.size(); i < size; i++) {
-            String prefix = "s" + (i + 1);
             WmPackageTaskTypeQty qty = qtyList.get(i);
-            // WmTaskType taskType = collect.get(qty.getTaskTypeId().toString());
-
             Integer count = qty.getQty();
-            params.put(prefix + "_name", qty.getTaskTypeName());
-            params.put(prefix + "_qty", count.toString());
-            params.put(prefix + "_price", qty.getPrice().toString());
-
-
-            params.put(prefix + "_rate", String.format(".2%f%%", count.doubleValue() / total));
+            params.put("no" + i, String.valueOf(i + 1));
+            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("sign_date", DateTimeFormatter.ofPattern(DatePattern.CHINESE_DATE_PATTERN).format(now.toLocalDate()));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -428,8 +428,9 @@ public class SysImplementPlanManager {
 
     public List<SysImplementPlanVO.ToList> listPlans(UpmsState.ImplementPlanState planState, HnqzUser user) {
 
+        Integer entId = user.getDeptId();
         List<SysImplementPlan> plans = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery()
-                .eq(SysImplementPlan::getConsignorId, user.getDeptId())
+                .eq(SysImplementPlan::getConsignorId, entId)
                 .eq(SysImplementPlan::getPlanState, planState));
 
 
@@ -437,7 +438,39 @@ public class SysImplementPlanManager {
             return Collections.emptyList();
         }
 
-        // 判断拆解拆解状态是否可用 todo
+        // Set<Long> p0Ids = plans.stream().mapToLong(SysImplementPlan::getPlanId).boxed().collect(Collectors.toSet());
+        //
+        // // 判断拆解拆解状态是否可用
+        // int entLevel = roleService.getEntLevel();
+        // if (-1 == entLevel) {
+        //     // 查询区域和服务商
+        //     List<SysImplementPlan> plans1 = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery()
+        //             .in(SysImplementPlan::getParentId, p0Ids)
+        //             .eq(SysImplementPlan::getPlanState, planState));
+        //
+        //     if (CollUtil.isEmpty(plans1)){
+        //         return Collections.emptyList();
+        //     }
+        //     Set<Long> p1Ids = plans1.stream().mapToLong(SysImplementPlan::getPlanId).boxed().collect(Collectors.toSet());
+        //     // 查询区域和服务商
+        //     List<SysImplementPlan> plans2 = implementPlanService.list(Wrappers.<SysImplementPlan>lambdaQuery()
+        //             .in(SysImplementPlan::getParentId, p1Ids)
+        //             .eq(SysImplementPlan::getPlanState, planState));
+        //
+        //     if (CollUtil.isEmpty(plans2)){
+        //         return Collections.emptyList();
+        //     }
+        //
+        //
+        //
+        //
+        // } else if (1 == entLevel) {
+        //
+        // } else if (2 == entLevel) {
+        //
+        // }
+
+
         // plans.stream().map(SysImplementPlanlan::get)