Procházet zdrojové kódy

保函订单列表 变更显示字段

chengpan před 2 roky
rodič
revize
ca65877142

+ 119 - 134
ruoyi-admin/src/main/resources/templates/opt/process/process.html

@@ -1,86 +1,93 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('保函订单列表')" />
+    <th:block th:include="include :: header('保函订单列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>订单编号:</label>
-                                <input type="text" name="processId"/>
-                            </li>
-                            <li>
-                                <label>订单状态:</label>
-                                <select name="processStsCd" th:with="type=${@dict.getType('process_status_cd')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>项目编号:</label>
-                                <input type="text" name="projectId"/>
-                            </li>
-                            <li>
-                                <label>企业编号:</label>
-                                <input type="text" name="companyId"/>
-                            </li>
-                            <li class="select-time">
-                                <label>申请时间:</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginApplyTime]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endApplyTime]"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>订单编号:</label>
+                            <input type="text" name="processId"/>
+                        </li>
+                        <li>
+                            <label>订单状态:</label>
+                            <select name="processStsCd" th:with="type=${@dict.getType('process_status_cd')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>项目编号:</label>
+                            <input type="text" name="projectId"/>
+                        </li>
+                        <li>
+                            <label>企业名称:</label>
+                            <input type="text" name="companyNm"/>
+                        </li>
+                        <li class="select-time">
+                            <label>申请时间:</label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                   name="params[beginApplyTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                   name="params[endApplyTime]"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="opt:process:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="opt:process:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="opt:process:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="opt:process:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="opt:process:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="opt:process:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="opt:process:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="opt:process:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('opt:process:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('opt:process:remove')}]];
-        var processStsCdDatas = [[${@dict.getType('process_status_cd')}]];
-        var prefix = ctx + "opt/process";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('opt:process:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('opt:process:remove')}]];
+    var processStsCdDatas = [[${@dict.getType('process_status_cd')}]];
+    var prefix = ctx + "opt/process";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "保函订单",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "保函订单",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'pId',
                     title: '主键',
@@ -90,81 +97,57 @@
                     field: 'processId',
                     title: '订单编号'
                 },
-                {
-                    field: 'processStsCd',
-                    title: '订单状态',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(processStsCdDatas, value);
-                    }
-                },
-                {
-                    field: 'premiumAmt',
-                    title: '保费金额'
-                },
-                {
-                    field: 'loanAmt',
-                    title: '申请保额'
-                },
-                {
-                    field: 'policySignUrl',
-                    title: '保函签署地址'
-                },
-                {
-                    field: 'policyDlUrl',
-                    title: '保函下载地址'
-                },
-                {
-                    field: 'eInvoiceUrl',
-                    title: '电子发票地址'
-                },
                 {
                     field: 'projectId',
                     title: '项目编号'
                 },
                 {
-                    field: 'companyId',
-                    title: '企业编号'
+                    field: 'projectNm',
+                    title: '项目名称'
                 },
                 {
-                    field: 'expireTime',
-                    title: '保函有效期'
+                    field: 'tenderNo',
+                    title: '项目标段'
                 },
                 {
-                    field: 'approvedTime',
-                    title: '审批通过时间'
+                    field: 'bidOpenTime',
+                    title: '开标日期'
                 },
                 {
-                    field: 'postscript',
-                    title: '打款附言'
+                    field: 'companyNm',
+                    title: '公司名称'
                 },
                 {
-                    field: 'rejectReason',
-                    title: '拒绝原因'
+                    field: 'applyNm',
+                    title: '联系人'
                 },
                 {
-                    field: 'applyTime',
-                    title: '申请时间'
+                    field: 'applyTel',
+                    title: '联系人电话'
                 },
                 {
-                    field: 'createBy',
-                    title: '创建者'
+                    field: 'applyTime',
+                    title: '申请时间'
                 },
                 {
-                    field: 'updateBy',
-                    title: '修改者'
+                    field: 'premiumAmt',
+                    title: '保费金额'
                 },
                 {
-                    field: 'updateTime',
-                    title: '修改时间'
+                    field: 'processStsCd',
+                    title: '订单状态',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(processStsCdDatas, value);
+                    }
                 },
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
-                        if('01' == row.processStsCd){
+                        if ('01' == 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> ');
-                        }else if('04' == row.processStsCd){
+                        } else if ('04' == row.processStsCd) {
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="confirmPay(\'' + 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> ');
@@ -172,17 +155,19 @@
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-        // 跳转审核页面
-        function approve(id){
-            $.modal.open("审批", "/opt/process/approve/"+id, '800', '350');
-        }
-        // 确认支付
-        function confirmPay(id){
-            $.operate.save(prefix + "/edit", {"pId":id, "processStsCd":"05"});
-        }
-    </script>
+        };
+        $.table.init(options);
+    });
+
+    // 跳转审核页面
+    function approve(id) {
+        $.modal.open("审批", "/opt/process/approve/" + id, '800', '350');
+    }
+
+    // 确认支付
+    function confirmPay(id) {
+        $.operate.save(prefix + "/edit", {"pId": id, "processStsCd": "05"});
+    }
+</script>
 </body>
 </html>

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

@@ -82,6 +82,32 @@ public class ProcessInfo extends BaseEntity
     @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date applyTime;
 
+    // --项目的部分字段
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectNm;
+
+    /** 标段编号 */
+    @Excel(name = "标段编号")
+    private String tenderNo;
+
+    /** 开标日期 */
+    @Excel(name = "开标日期")
+    private String bidOpenTime;
+
+    // 企业部分信息
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    private String companyNm;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String applyNm;
+
+    /** 申请人电话 */
+    @Excel(name = "申请人电话")
+    private String applyTel;
+
     public void setpId(Long pId) 
     {
         this.pId = pId;
@@ -227,6 +253,54 @@ public class ProcessInfo extends BaseEntity
         return applyTime;
     }
 
+    public String getProjectNm() {
+        return projectNm;
+    }
+
+    public void setProjectNm(String projectNm) {
+        this.projectNm = projectNm;
+    }
+
+    public String getTenderNo() {
+        return tenderNo;
+    }
+
+    public void setTenderNo(String tenderNo) {
+        this.tenderNo = tenderNo;
+    }
+
+    public String getBidOpenTime() {
+        return bidOpenTime;
+    }
+
+    public void setBidOpenTime(String bidOpenTime) {
+        this.bidOpenTime = bidOpenTime;
+    }
+
+    public String getCompanyNm() {
+        return companyNm;
+    }
+
+    public void setCompanyNm(String companyNm) {
+        this.companyNm = companyNm;
+    }
+
+    public String getApplyNm() {
+        return applyNm;
+    }
+
+    public void setApplyNm(String applyNm) {
+        this.applyNm = applyNm;
+    }
+
+    public String getApplyTel() {
+        return applyTel;
+    }
+
+    public void setApplyTel(String applyTel) {
+        this.applyTel = applyTel;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -24,26 +24,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+
+        <result property="projectNm"    column="project_nm"    />
+        <result property="tenderNo"    column="tender_no"    />
+        <result property="bidOpenTime"    column="bid_open_time"    />
+        <result property="companyNm"    column="company_nm"    />
+        <result property="applyNm"    column="apply_nm"    />
+        <result property="applyTel"    column="apply_tel"    />
     </resultMap>
 
     <sql id="selectProcessInfoVo">
-        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
+        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
+        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>
 
     <select id="selectProcessInfoList" parameterType="ProcessInfo" resultMap="ProcessInfoResult">
         <include refid="selectProcessInfoVo"/>
         <where>  
-            <if test="processId != null  and processId != ''"> and process_id like concat('%', #{processId}, '%')</if>
-            <if test="processStsCd != null  and processStsCd != ''"> and process_sts_cd = #{processStsCd}</if>
-            <if test="projectId != null "> and project_id like concat('%', #{projectId}, '%')</if>
-            <if test="companyId != null "> and company_id like concat('%', #{companyId}, '%')</if>
-            <if test="params.beginApplyTime != null and params.beginApplyTime != '' and params.endApplyTime != null and params.endApplyTime != ''"> and apply_time between #{params.beginApplyTime} and #{params.endApplyTime}</if>
+            <if test="processId != null  and processId != ''"> and t.process_id like concat('%', #{processId}, '%')</if>
+            <if test="processStsCd != null  and processStsCd != ''"> and t.process_sts_cd = #{processStsCd}</if>
+            <if test="projectId != null "> and t.project_id like concat('%', #{projectId}, '%')</if>
+            <if test="companyNm != null "> and c.company_nm like concat('%', #{companyNm}, '%')</if>
+            <if test="params.beginApplyTime != null and params.beginApplyTime != '' and params.endApplyTime != null and params.endApplyTime != ''"> and t.apply_time between #{params.beginApplyTime} and #{params.endApplyTime}</if>
         </where>
     </select>
     
     <select id="selectProcessInfoByPId" parameterType="Long" resultMap="ProcessInfoResult">
         <include refid="selectProcessInfoVo"/>
-        where p_id = #{pId}
+        where t.p_id = #{pId}
     </select>
         
     <insert id="insertProcessInfo" parameterType="ProcessInfo">