Home Explore Help
Register Sign In
chengpan
/
yuncai-scm
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'chengpan'

chengpan 2 years ago
parent
22fa2886c0 a5c5cdc910
commit
48f20c43f4
10 changed files with 104 additions and 7 deletions
Unified View Show Diff Stats
  1. 12 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/opt/ProcessInfoController.java
  2. 1 1
      ruoyi-admin/src/main/resources/templates/opt/config/add.html
  3. 1 1
      ruoyi-admin/src/main/resources/templates/opt/config/config.html
  4. 1 1
      ruoyi-admin/src/main/resources/templates/opt/config/edit.html
  5. 1 1
      ruoyi-admin/src/main/resources/templates/opt/process/add.html
  6. 61 0
      ruoyi-admin/src/main/resources/templates/opt/process/approve.html
  7. 9 1
      ruoyi-admin/src/main/resources/templates/opt/process/process.html
  8. 14 1
      ruoyi-system/src/main/java/com/ruoyi/opt/domain/ProcessInfo.java
  9. 2 1
      ruoyi-system/src/main/resources/mapper/opt/ProcessInfoMapper.xml
  10. 2 0
      sql/ry_20210924.sql

+ 12 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/opt/ProcessInfoController.java
View File 

@@ -101,6 +101,18 @@ public class ProcessInfoController extends BaseController
 
         return prefix + "/edit";
 
         return prefix + "/edit";
 
     }
 
     }
 
 
 
+    /**
 
+     * 审核保函订单
 
+     */
 
+    @RequiresPermissions("opt:process:approve")
 
+    @GetMapping("/approve/{pId}")
 
+    public String approve(@PathVariable("pId") Long pId, ModelMap mmap)
 
+    {
 
+        ProcessInfo processInfo = processInfoService.selectProcessInfoByPId(pId);
 
+        mmap.put("processInfo", processInfo);
 
+        return prefix + "/approve";
 
+    }
 
+
 
     /**
 
     /**
 
      * 修改保存保函订单
 
      * 修改保存保函订单
 
      */
 
      */

+ 1 - 1
ruoyi-admin/src/main/resources/templates/opt/config/add.html
View File 

@@ -17,7 +17,7 @@
 
             <div class="form-group">    
             <div class="form-group">    
                 <label class="col-sm-3 control-label">接口请求类型：</label>
 
                 <label class="col-sm-3 control-label">接口请求类型：</label>
 
                 <div class="col-sm-8">
 
                 <div class="col-sm-8">
 
-                    <select name="methTpCd" class="form-control m-b" th:with="type=${@dict.getType('meth_tp_cd')}">
 
+                    <select name="methTpCd" class="form-control m-b" th:with="type=${@dict.getType('process_status_cd')}">
 
                         <option value="">--请选择--</option>
 
                         <option value="">--请选择--</option>
 
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 
                     </select>
 
                     </select>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/opt/config/config.html
View File 

@@ -77,7 +77,7 @@
 
         var editFlag = [[${@permission.hasPermi('opt:config:edit')}]];
 
         var editFlag = [[${@permission.hasPermi('opt:config:edit')}]];
 
         var removeFlag = [[${@permission.hasPermi('opt:config:remove')}]];
 
         var removeFlag = [[${@permission.hasPermi('opt:config:remove')}]];
 
         var sysTpCdDatas = [[${@dict.getType('sys_tp_cd')}]];
 
         var sysTpCdDatas = [[${@dict.getType('sys_tp_cd')}]];
 
-        var methTpCdDatas = [[${@dict.getType('meth_tp_cd')}]];
 
+        var methTpCdDatas = [[${@dict.getType('process_status_cd')}]];
 
         var statusDatas = [[${@dict.getType('sys_normal_disable')}]];
 
         var statusDatas = [[${@dict.getType('sys_normal_disable')}]];
 
         var prefix = ctx + "opt/config";
 
         var prefix = ctx + "opt/config";

+ 1 - 1
ruoyi-admin/src/main/resources/templates/opt/config/edit.html
View File 

@@ -18,7 +18,7 @@
 
             <div class="form-group">    
             <div class="form-group">    
                 <label class="col-sm-3 control-label">接口请求类型：</label>
 
                 <label class="col-sm-3 control-label">接口请求类型：</label>
 
                 <div class="col-sm-8">
 
                 <div class="col-sm-8">
 
-                    <select name="methTpCd" class="form-control m-b" th:with="type=${@dict.getType('meth_tp_cd')}">
 
+                    <select name="methTpCd" class="form-control m-b" th:with="type=${@dict.getType('process_status_cd')}">
 
                         <option value="">--请选择--</option>
 
                         <option value="">--请选择--</option>
 
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{methTpCd}"></option>
 
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{methTpCd}"></option>
 
                     </select>
 
                     </select>

+ 1 - 1
ruoyi-admin/src/main/resources/templates/opt/process/add.html
View File 

@@ -16,7 +16,7 @@
 
             <div class="form-group">    
             <div class="form-group">    
                 <label class="col-sm-3 control-label">订单状态：</label>
 
                 <label class="col-sm-3 control-label">订单状态：</label>
 
                 <div class="col-sm-8">
 
                 <div class="col-sm-8">
 
-                    <select name="processStsCd" class="form-control m-b" th:with="type=${@dict.getType('process_status')}">
 
+                    <select name="processStsCd" class="form-control m-b" th:with="type=${@dict.getType('process_status_cd')}">
 
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 
                     </select>
 
                     </select>
 
                 </div>
 
                 </div>

+ 61 - 0
ruoyi-admin/src/main/resources/templates/opt/process/approve.html
View File 

@@ -0,0 +1,61 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 
+<head>
 
+    <th:block th:include="include :: header('新增保函订单')"/>
 
+    <th:block th:include="include :: datetimepicker-css"/>
 
+</head>
 
+<body class="white-bg">
 
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 
+    <form class="form-horizontal m" id="form-process-add">
 
+        <input name="pId" th:field="*{processInfo.pId}" type="hidden">
 
+        <div class="form-group">
 
+            <label class="col-sm-3 control-label">保费金额：</label>
 
+            <div class="col-sm-8">
 
+                <input name="premiumAmt" th:field="*{processInfo.premiumAmt}" readonly="true"
 
+                       class="form-control" type="text">
 
+            </div>
 
+        </div>
 
+        <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"
 
+                       type="text">
 
+            </div>
 
+        </div>
 
+
 
+        <div class="form-group">
 
+            <label class="col-sm-3 control-label is-required">审核结果：</label>
 
+            <div class="col-sm-8">
 
+                <div class="radio">
 
+                    <label class="radio-box">
 
+                        <input type="radio" checked="" value="04" name="processStsCd">通过</label>
 
+                    <label class="radio-box">
 
+                        <input type="radio" value="03" name="processStsCd">未通过</label>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div>
 
+            <label class="col-sm-3 control-label">未通过原因：</label>
 
+            <div class="col-sm-8">
 
+                <textarea name="rejectReason" class="form-control"></textarea>
 
+            </div>
 
+        </div>
 
+    </form>
 
+</div>
 
+<th:block th:include="include :: footer"/>
 
+<th:block th:include="include :: datetimepicker-js"/>
 
+<script th:inline="javascript">
 
+    var prefix = ctx + "opt/process"
 
+    $("#form-process-add").validate({
 
+        focusCleanup: true
 
+    });
 
+
 
+    function submitHandler() {
 
+        if ($.validate.form()) {
 
+            $.operate.save(prefix + "/edit", $('#form-process-add').serialize());
 
+        }
 
+    }
 
+
 
+</script>
 
+</body>
 
+</html>

+ 9 - 1
ruoyi-admin/src/main/resources/templates/opt/process/process.html
View File 

@@ -67,7 +67,7 @@
 
     <script th:inline="javascript">
 
     <script th:inline="javascript">
 
         var editFlag = [[${@permission.hasPermi('opt:process:edit')}]];
 
         var editFlag = [[${@permission.hasPermi('opt:process:edit')}]];
 
         var removeFlag = [[${@permission.hasPermi('opt:process:remove')}]];
 
         var removeFlag = [[${@permission.hasPermi('opt:process:remove')}]];
 
-        var processStsCdDatas = [[${@dict.getType('process_status')}]];
 
+        var processStsCdDatas = [[${@dict.getType('process_status_cd')}]];
 
         var prefix = ctx + "opt/process";
 
         var prefix = ctx + "opt/process";
 
 
 
         $(function() {
 
         $(function() {
 
@@ -162,6 +162,10 @@
 
                     align: 'center',
 
                     align: 'center',
 
                     formatter: function(value, row, index) {
 
                     formatter: function(value, row, index) {
 
                         var actions = [];
 
                         var actions = [];
 
+                        if('01' == row.processStsCd){
 
+                            console.log(row.processStsCd)
 
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="approve(\'' + row.pId + '\')"><i class="fa fa-edit"></i>审核</a> ');
 
+                        }
 
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.pId + '\')"><i class="fa fa-remove"></i>删除</a>');
 
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.pId + '\')"><i class="fa fa-remove"></i>删除</a>');
 
                         return actions.join('');
 
                         return actions.join('');
 
@@ -170,6 +174,10 @@
 
             };
 
             };
 
             $.table.init(options);
 
             $.table.init(options);
 
         });
 
         });
 
+        // 跳转审核页面
 
+        function approve(id){
 
+            $.modal.open("审批", "/opt/process/approve/"+id, '800', '350');
 
+        }
 
     </script>
 
     </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 14 - 1
ruoyi-system/src/main/java/com/ruoyi/opt/domain/ProcessInfo.java
View File 

@@ -32,6 +32,10 @@ public class ProcessInfo extends BaseEntity
 
     @Excel(name = "保费金额")
 
     @Excel(name = "保费金额")
 
     private String premiumAmt;
 
     private String premiumAmt;
 
 
 
+    /** 保函编号 **/
 
+    @Excel(name = "保函编号")
 
+    private String policyNo;
 
+
 
     /** 申请保额 */
 
     /** 申请保额 */
 
     @Excel(name = "申请保额")
 
     @Excel(name = "申请保额")
 
     private String loanAmt;
 
     private String loanAmt;
 
@@ -114,7 +118,16 @@ public class ProcessInfo extends BaseEntity
 
     {
 
     {
 
         return premiumAmt;
 
         return premiumAmt;
 
     }
 
     }
 
-    public void setLoanAmt(String loanAmt) 
+
 
+    public String getPolicyNo() {
 
+        return policyNo;
 
+    }
 
+
 
+    public void setPolicyNo(String policyNo) {
 
+        this.policyNo = policyNo;
 
+    }
 
+
 
+    public void setLoanAmt(String loanAmt)
 
     {
 
     {
 
         this.loanAmt = loanAmt;
 
         this.loanAmt = loanAmt;
 
     }
 
     }

+ 2 - 1
ruoyi-system/src/main/resources/mapper/opt/ProcessInfoMapper.xml
View File 

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="processId"    column="process_id"    />
 
         <result property="processId"    column="process_id"    />
 
         <result property="processStsCd"    column="process_sts_cd"    />
 
         <result property="processStsCd"    column="process_sts_cd"    />
 
         <result property="premiumAmt"    column="premium_amt"    />
 
         <result property="premiumAmt"    column="premium_amt"    />
 
+        <result property="policyNo"    column="policy_no"    />
 
         <result property="loanAmt"    column="loan_amt"    />
 
         <result property="loanAmt"    column="loan_amt"    />
 
         <result property="policySignUrl"    column="policy_sign_url"    />
 
         <result property="policySignUrl"    column="policy_sign_url"    />
 
         <result property="policyDlUrl"    column="policy_dl_url"    />
 
         <result property="policyDlUrl"    column="policy_dl_url"    />
 
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </resultMap>
 
     </resultMap>
 
 
 
     <sql id="selectProcessInfoVo">
 
     <sql id="selectProcessInfoVo">
 
-        select p_id, process_id, process_sts_cd, premium_amt, loan_amt, policy_sign_url, policy_dl_url, e_invoice_url, project_id, company_id, expire_time, approved_time, postscript, reject_reason, apply_time, create_by, update_by, update_time from t_process_info
 
+        select p_id, process_id, process_sts_cd, premium_amt, policy_no, loan_amt, policy_sign_url, policy_dl_url, e_invoice_url, project_id, company_id, expire_time, approved_time, postscript, reject_reason, apply_time, create_by, update_by, update_time from t_process_info
 
     </sql>
 
     </sql>
 
 
 
     <select id="selectProcessInfoList" parameterType="ProcessInfo" resultMap="ProcessInfoResult">
 
     <select id="selectProcessInfoList" parameterType="ProcessInfo" resultMap="ProcessInfoResult">

+ 2 - 0
sql/ry_20210924.sql
View File 

@@ -268,6 +268,8 @@ INSERT INTO `sys_menu` VALUES (2008, '保函订单新增', 2006, 2, '#', '', 'F'
 
 INSERT INTO `sys_menu` VALUES (2009, '保函订单修改', 2006, 3, '#', '', 'F', '0', '1', 'opt:process:edit', '#', 'admin', '2022-09-06 10:51:50', '', NULL, '');
 
 INSERT INTO `sys_menu` VALUES (2009, '保函订单修改', 2006, 3, '#', '', 'F', '0', '1', 'opt:process:edit', '#', 'admin', '2022-09-06 10:51:50', '', NULL, '');
 
 INSERT INTO `sys_menu` VALUES (2010, '保函订单删除', 2006, 4, '#', '', 'F', '0', '1', 'opt:process:remove', '#', 'admin', '2022-09-06 10:51:50', '', NULL, '');
 
 INSERT INTO `sys_menu` VALUES (2010, '保函订单删除', 2006, 4, '#', '', 'F', '0', '1', 'opt:process:remove', '#', 'admin', '2022-09-06 10:51:50', '', NULL, '');
 
 INSERT INTO `sys_menu` VALUES (2011, '保函订单导出', 2006, 5, '#', '', 'F', '0', '1', 'opt:process:export', '#', 'admin', '2022-09-06 10:51:50', '', NULL, '');
 
 INSERT INTO `sys_menu` VALUES (2011, '保函订单导出', 2006, 5, '#', '', 'F', '0', '1', 'opt:process:export', '#', 'admin', '2022-09-06 10:51:50', '', NULL, '');
 
+INSERT INTO `sys_menu` VALUES (1062, '保函订单审核', 2006, 6, '#', '', 'F', '0', '1', 'opt:process:approve', '#', 'admin', '2022-09-06 10:51:50', '', NULL, '');
 
+
 
 -- 企业信息
 
 -- 企业信息
 
 INSERT INTO `sys_menu` VALUES (2012, '企业信息', 0, 3, '/opt/company', 'menuItem', 'C', '0', '1', 'opt:company:view', '#', 'admin', '2022-09-07 01:17:40', '', NULL, '');
 
 INSERT INTO `sys_menu` VALUES (2012, '企业信息', 0, 3, '/opt/company', 'menuItem', 'C', '0', '1', 'opt:company:view', '#', 'admin', '2022-09-07 01:17:40', '', NULL, '');
 
 INSERT INTO `sys_menu` VALUES (2013, '企业信息查询', 2012, 1, '#', '', 'F', '0', '1', 'opt:company:list', '#', 'admin', '2022-09-07 01:23:22', '', NULL, '');
 
 INSERT INTO `sys_menu` VALUES (2013, '企业信息查询', 2012, 1, '#', '', 'F', '0', '1', 'opt:company:list', '#', 'admin', '2022-09-07 01:23:22', '', NULL, '');