Merge remote-tracking branch 'origin/master'

src/main/java/com/liang/ServletInitializer.java

@@ -9,5 +9,5 @@ public class ServletInitializer extends SpringBootServletInitializer {
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
         return application.sources(KYGKApplication.class);
     }
-
+    //提交1
 }

src/main/java/com/liang/common/advice/ExceptionHandlerAdvice.java

@@ -39,8 +39,8 @@ public class ExceptionHandlerAdvice {
     @ExceptionHandler({CustomDivException.class})
     @ResponseBody
     public String customDivException(RuntimeException exception) {
-        return " <div class='grid-demo layui-bg-red'>" + exception.getMessage() +
-                "</div>";
+        return " <h1 class='grid-demo layui-bg-red'>" + exception.getMessage() +
+                "</h1>";
     }
 
     @ExceptionHandler({IllegalArgumentException.class})

src/main/java/com/liang/dao/PrjAnnualbudgetdetailDao.java

@@ -96,7 +96,7 @@ public interface PrjAnnualbudgetdetailDao {
      */
     List<PrjAnnualbudgetdetail> getFysqBudgetList(Integer nys);
 
-    List<PrjAnnualbudgetdetail> getSubNode(Integer nys);
+    List<PrjAnnualbudgetdetail> getSubNode(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit, String mc);
 
     /**
      * 批量删除年度预算明细
@@ -125,5 +125,7 @@ public interface PrjAnnualbudgetdetailDao {
     BigDecimal selectXMZYS_SX(Integer rws);
 
     int updateRWSYS_SX(Integer rws);
+
+    Integer getSubNodeCount(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit);
 }
 

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/java/com/liang/service/PrjAnnualbudgetdetailService.java

@@ -1,14 +1,11 @@
 package com.liang.service;
 
-import com.liang.entity.PrjAnnualbudget;
 import com.liang.entity.PrjAnnualbudgetdetail;
-import com.liang.entity.PrjBudget;
-import com.liang.entity.StaBudget;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 年度预算明细(PrjAnnualbudgetdetail)表服务接口
@@ -80,7 +77,7 @@ public interface PrjAnnualbudgetdetailService {
      */
     List<PrjAnnualbudgetdetail> getFysqBudgetList(Integer nys);
 
-    List<PrjAnnualbudgetdetail> getSubNode(Integer nys);
+    List<PrjAnnualbudgetdetail> getSubNode(Integer nys, Integer page, Integer limit, String mc);
 
     /**
      * 更新预算
@@ -91,4 +88,5 @@ public interface PrjAnnualbudgetdetailService {
     int updateBatch(List<PrjAnnualbudgetdetail> budgetDetails);
 
 
+    Integer getSubNodeCount(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit);
 }

src/main/java/com/liang/service/impl/PrjAnnualbudgetdetailServiceImpl.java

@@ -211,8 +211,8 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
     }
 
     @Override
-    public List<PrjAnnualbudgetdetail> getSubNode(Integer nys) {
-        return this.prjAnnualbudgetdetailDao.getSubNode(nys);
+    public List<PrjAnnualbudgetdetail> getSubNode(Integer nys, Integer page, Integer limit, String mc) {
+        return this.prjAnnualbudgetdetailDao.getSubNode(nys,page,limit,mc);
     }
 
     @Override
@@ -224,4 +224,9 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
         return count;
     }
 
+    @Override
+    public Integer getSubNodeCount(Integer nys, Integer page, Integer limit) {
+        return this.prjAnnualbudgetdetailDao.getSubNodeCount(nys,page,limit);
+    }
+
 }

src/main/java/com/liang/vo/Page.java

@@ -0,0 +1,72 @@
+package com.liang.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ApiModel
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Page<T> implements Serializable {
+    private static final long serialVersionUID = -880132266597087829L;
+
+    /**
+     * 包装Page对象
+     *
+     * @param list
+     */
+    public Page(List<? extends T> list) {
+        PageInfo<? extends T> page = new PageInfo<>(list);
+        this.total = page.getTotal();
+        this.pageNum = page.getPageNum();
+        this.pageSize = page.getPageSize();
+        this.rows = page.getList();
+    }
+
+    /**
+     * 包装Page对象
+     *
+     * @param list
+     */
+    public Page(List<? extends T> list, Map<String,Object> other) {
+        PageInfo<? extends T> page = new PageInfo<>(list);
+        this.total = page.getTotal();
+        this.pageNum = page.getPageNum();
+        this.pageSize = page.getPageSize();
+        this.rows = page.getList();
+        this.other = other;
+    }
+    //当前页
+    @ApiModelProperty(value = "当前页数",required = true)
+    private int pageNum =1;
+    //每页的数量
+    @ApiModelProperty(value = "每页显示数",required = true)
+    private int pageSize = 10;
+
+    private long total = 0;
+
+    /**
+     * 列表查询入参实体类
+     */
+    @ApiModelProperty(value = "列表查询返回附加数据实体类",dataType = "java.util.HashMap",hidden = true)
+    private Map<String,Object> other;
+    /**
+     * 列表查询入参实体类
+     */
+    @ApiModelProperty(value = "列表查询入参实体类")
+    @Valid
+    private transient T data;
+    @ApiModelProperty(hidden = true)
+    private  List<? extends T> rows;
+}

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -536,11 +536,22 @@
 
     <!--获取费用申请年度预算-->
     <select id="getSubNode" resultMap="PrjAnnualbudgetdetailMap">
-        select (select FYMC from prj_AnnualBudgetDetail where BM = b.FJ and NYS = b.NYS) as FJMC, b.*
-        from prj_AnnualBudgetDetail b
-        where NYS = #{nys}
-          and BM not in (select distinct FJ from prj_AnnualBudgetDetail where FJ != ''
-          AND NYS=#{nys})
+        select top ${limit} *
+        from (
+            select
+            (select FYMC from prj_AnnualBudgetDetail where BM = b.FJ and NYS = b.NYS) as FJMC,
+              b.*,
+              row_number() over (order by b.id asc) as rownumber
+                 from prj_AnnualBudgetDetail b
+                 where NYS = #{nys}
+                   and BM not in (select distinct FJ from prj_AnnualBudgetDetail where FJ != ''
+                   AND NYS=#{nys})
+                 <if test="mc != null and mc != ''">
+                   AND b.FYMC LIKE  CONCAT('%',#{mc},'%')
+                  </if>
+
+                   ) temp_row
+        where rownumber  > ((${page} - 1) * ${limit})
     </select>
     <select id="selectWWYJZCF_GW" resultType="java.math.BigDecimal">
         select ((SELECT SUM(SKJE)
@@ -573,5 +584,13 @@
         from prj_feescheme
         where ZB = #{id}
     </select>
+    <select id="getSubNodeCount" resultType="java.lang.Integer">
+        select
+        count(*)
+        from prj_AnnualBudgetDetail b
+        where NYS = #{nys}
+        and BM not in (select distinct FJ from prj_AnnualBudgetDetail where FJ != ''
+        AND NYS=#{nys})
+    </select>
 </mapper>
 

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/annualbudget/add_apply.html

@@ -651,7 +651,7 @@
             searchPlaceholder: '搜索费用名称',
             table: {
                 url: AjaxUtil.ctx + 'staBudgetapproval/getSubNode/' + ysId,
-                method: 'post',
+                method: 'get',
                 cols: [
                     [
                         {type: "radio", fixed: 'left'},
@@ -776,6 +776,7 @@
                         }
                         ybzjeOne = parseFloat(dataTj[0].ybzje);
                         currTable_tj.reload();
+                        $("#sqmc").val('费用申请-'+$("#xmmc").val()+"-"+$("#fylbmc").val());
                     }
                 });
             }

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/prjapproverecord/list.html

@@ -648,31 +648,33 @@
                         url: AjaxUtil.ctx + "prjApproverecord/doUpdateApproveFksq",
                         data: bathUpdateRes.approveInfo,
                         success: function (res) {
-                            //更新审批状态
-                            var project = {
-                                "id": xmApprovalBath.xmid,
-                                "spzt": ''
-                            }
-                            if (bathUpdateRes.approveInfo.spcz == '返回修改') {
-                                project.spzt = '未提交(返回)';
-                            } else if (bathUpdateRes.approveInfo.zt == '科技项目管理专责1审批') {
-                                project.spzt = '科技项目管理专责2审批';
-                            } else if (bathUpdateRes.approveInfo.zt == '科技项目管理专责2审批') {
-                                project.spzt = '科技部部门主任审批';
-                            } else if (bathUpdateRes.approveInfo.zt === '科技部部门主任审批') {
-                                project.spzt = '审批结束';
-                            }
-
-                            AjaxUtil.post({
-                                url: AjaxUtil.ctx + "staPayapproval/updateSpzt",
-                                contentType: "application/json",
-                                data: JSON.stringify(project),
-                                success: function (res) {
-                                    return true;
-                                },
-                                error: function (error) {
+                            if (res.code == 0) {
+                                //更新审批状态
+                                var project = {
+                                    "id": xmApprovalBath.xmid,
+                                    "spzt": ''
                                 }
-                            });
+                                if (bathUpdateRes.approveInfo.spcz == '返回修改') {
+                                    project.spzt = '未提交(返回)';
+                                } else if (bathUpdateRes.approveInfo.zt == '科技项目管理专责1审批') {
+                                    project.spzt = '科技项目管理专责2审批';
+                                } else if (bathUpdateRes.approveInfo.zt == '科技项目管理专责2审批') {
+                                    project.spzt = '科技部部门主任审批';
+                                } else if (bathUpdateRes.approveInfo.zt === '科技部部门主任审批') {
+                                    project.spzt = '审批结束';
+                                }
+
+                                AjaxUtil.post({
+                                    url: AjaxUtil.ctx + "staPayapproval/updateSpzt",
+                                    contentType: "application/json",
+                                    data: JSON.stringify(project),
+                                    success: function (res) {
+                                        return true;
+                                    },
+                                    error: function (error) {
+                                    }
+                                });
+                            }
                         },
                         error: function (error) {
                         }

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>