Merge branch 'master' of http://114.115.215.112:3000/yuncaikeji_gogs/RuoYi

ruoyi-admin/src/main/java/com/ruoyi/web/controller/opt/ProcessInfoController.java

@@ -109,6 +109,9 @@ public class ProcessInfoController extends BaseController
     public String approve(@PathVariable("pId") Long pId, ModelMap mmap)
     {
         ProcessInfo processInfo = processInfoService.selectProcessInfoByPId(pId);
+        // 保函编号生成规则： bankId+区域编号+订单编号
+        String policyNo = "ZLTX" + processInfo.getAreaCd() + processInfo.getProcessId();
+        processInfo.setPolicyNo(policyNo);
         mmap.put("processInfo", processInfo);
         return prefix + "/approve";
     }

ruoyi-admin/src/main/resources/application-dev.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为80
-    port: 89
+    port: 80
     servlet:
         # 应用的访问路径
         context-path: /

ruoyi-admin/src/main/resources/templates/opt/process/approve.html

@@ -15,7 +15,7 @@
                        class="form-control" type="text">
             </div>
         </div>
-        <div class="form-group" style="display: none;">
+        <div class="form-group">
             <label class="col-sm-3 control-label">保函编号：</label>
             <div class="col-sm-8">
                 <input name="policyNo" th:field="*{processInfo.policyNo}" readonly="true" class="form-control"

ruoyi-system/src/main/java/com/ruoyi/opt/domain/ProcessInfo.java

@@ -119,6 +119,10 @@ public class ProcessInfo extends BaseEntity
     @TableField(exist = false)
     private String tenderNo;
 
+    /** 项目地区区域码（6位） */
+    @Excel(name = "项目地区区域码", readConverterExp = "6=位")
+    private String areaCd;
+
     /** 开标日期 */
     @Excel(name = "开标日期")
     @TableField(exist = false)
@@ -301,6 +305,14 @@ public class ProcessInfo extends BaseEntity
         this.tenderNo = tenderNo;
     }
 
+    public String getAreaCd() {
+        return areaCd;
+    }
+
+    public void setAreaCd(String areaCd) {
+        this.areaCd = areaCd;
+    }
+
     public String getBidOpenTime() {
         return bidOpenTime;
     }

ruoyi-system/src/main/resources/mapper/opt/ProcessInfoMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="projectNm"    column="project_nm"    />
         <result property="tenderNo"    column="tender_no"    />
+        <result property="areaCd"    column="area_cd"    />
         <result property="bidOpenTime"    column="bid_open_time"    />
         <result property="companyNm"    column="company_nm"    />
         <result property="applyNm"    column="apply_nm"    />
@@ -35,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectProcessInfoVo">
         select t.p_id, t.process_id, t.process_sts_cd, t.premium_amt, t.policy_no, t.loan_amt, t.policy_sign_url, t.policy_dl_url, t.e_invoice_url, t.project_id, t.company_id, t.expire_time, t.approved_time, t.postscript, t.reject_reason, t.apply_time, t.create_by, t.update_by, t.update_time,
-               p.project_nm, p.tender_no, p.bid_open_time, c.company_nm, c.apply_nm, c.apply_tel
+               p.project_nm, p.tender_no, p.area_cd, p.bid_open_time, c.company_nm, c.apply_nm, c.apply_tel
         from t_process_info t INNER JOIN t_project_info p ON p.project_id = t.project_id INNER JOIN t_company_info c ON c.company_id = t.company_id
     </sql>