Merge remote-tracking branch 'origin/master' into dev-lgl

src/main/java/com/liang/entity/StaPayapproval.java

@@ -78,7 +78,15 @@ public class StaPayapproval implements Serializable {
      * @return
      */
     private String sqmc;
+    private String bh;
 
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
 
     public Integer getId() {
         return id;

src/main/resources/mapper/PrjApproverecordDao.xml

@@ -518,9 +518,10 @@
         </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
-                order by ${sortName} ${sortOrder}
+                order by ${sortName} ${sortOrder} DESC
             </when>
         </choose>
+        order by a.TJSJ DESC
     </select>
 
     <update id="updateRevokeRecord">

src/main/resources/mapper/StaPayapprovalDao.xml

@@ -15,6 +15,7 @@
         <result property="yszl" column="YSZL" jdbcType="VARCHAR"/>
         <result property="fkjh" column="FKJH" jdbcType="INTEGER"/>
         <result property="sqmc" column="SQMC" jdbcType="VARCHAR"/>
+        <result property="bh" column="BH" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
@@ -201,7 +202,7 @@
 
     <!--获取付款申请列表-->
     <select id="getFksqList" resultMap="StaPayapprovalMap" parameterType="map">
-        select b.*, u.name as CJRXM, FORMAT(b.CJSJ, 'yyyy-MM-dd') as CJRQ, c.HTMC, c.WJ as HTWJ, p.JHMC as FKJHMC,
+        select b.*,g.bh, u.name as CJRXM, FORMAT(b.CJSJ, 'yyyy-MM-dd') as CJRQ, c.HTMC, c.WJ as HTWJ, p.JHMC as FKJHMC,
         g.SQMC as FYSQMC, g.XMMC as RWSMC
         from sta_PayApproval b
         left join prj_PayPlan p on p.ID = b.FKJH

src/main/resources/templates/payapply/list.html

@@ -25,7 +25,7 @@
                         <div class="layui-input-inline"  style="width: 200px">
                             <input type="text" name="erpbh" autocomplete="off" class="layui-input">
                         </div>
-                        <label class="layui-form-label" style="width: 60px;left: 5px">申请编号</label>
+                        <label class="layui-form-label" style="width: 90px;left: 5px">费用申请编号</label>
                         <div class="layui-input-inline"  style="width: 225px">
                             <input type="text" name="bh" autocomplete="off" class="layui-input">
                         </div>
@@ -51,7 +51,7 @@
 
 
                             <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 60px">创建时间</label>
+                                <label class="layui-form-label" style="width: 90px">创建时间</label>
                                 <div class="layui-input-inline" style="width: 100px">
                                     <input type="text" name="cjsj1" id="cjsj1" placeholder="开始日期" class="layui-input" readonly>
                                 </div>
@@ -146,6 +146,7 @@
                     {type: 'numbers', fixed: 'left'},
                     {field: 'spzt', width: '11%',title: '审批状态', fixed: 'left'},
                     {field: 'rwsmc', width: '11%', title: '项目名称'},
+                    {field: 'bh', width: '11%', title: '费用申请编号'},
                     {field: 'htmc', width: '11%', title: '合同'},
                     {field: 'fysqmc', width: '15%',title: '费用申请'},
                     {field: 'bcfkje', width: '10%', title: '本次付款金额(万元)'},

src/main/resources/templates/stafeemanage/list_allapply.html

@@ -30,7 +30,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 90px">费用申请编号</label>
+                            <label class="layui-form-label" style="width: 90px">编号</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
                             </div>