外委合同支付情况bug 修复

src/main/java/com/liang/controller/StaStatisticalSummaryController.java

@@ -10,6 +10,7 @@ import com.liang.entity.baobiao.UtilEntity;
 import com.liang.service.PrjAnnualbudgetService;
 import com.liang.service.StaStatisticalSummaryService;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
@@ -39,7 +40,9 @@ public class StaStatisticalSummaryController extends BaseController {
 
     //项目报表（外委汇总表）页面
     @RequestMapping(value = "/outPay", method = RequestMethod.GET)
-    public String outPay() {
+    public String outPay(Model model) {
+        List<String> yearList = prjAnnualbudgetService.getYearList();
+        model.addAttribute("yearList", yearList);
         return "statistical/outPay";
     }
 
@@ -47,13 +50,25 @@ public class StaStatisticalSummaryController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/outPayData", method = RequestMethod.POST)
     public BaseResult outPayData(
+            @RequestParam("page")Integer pageNum,
+            @RequestParam("limit") Integer pageSize,
             @RequestParam(required = false, defaultValue = "", value = "XMMC") String xmmc,
             @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
-            @RequestParam(required = false, defaultValue = "", value = "JSRQ") String jsrq
+            @RequestParam(required = false, defaultValue = "", value = "JSRQ") String jsrq,
+            @RequestParam(required = false, defaultValue = "", value = "ERPBH")String erpbh,
+            @RequestParam(required = false, defaultValue = "",value = "FYSQBH")String fysqbh,
+            @RequestParam(required = false, defaultValue = "", value = "NF")String nf
                                  ) {
 
-
-        List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.outPaySummary(xmmc, qsrq, jsrq);
+        PageHelper.startPage(pageNum,pageSize);
+        Map<String, String> map = new HashMap<>();
+        map.put("xmmc",xmmc);
+        map.put("qsrq",qsrq);
+        map.put("jsrq",jsrq);
+        map.put("erpbh",erpbh);
+        map.put("nf",nf);
+        map.put("bh",fysqbh);
+        List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.outPaySummary(map);
 
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
         List<HashMap<String, Object>> rows = pageinfo.getList();

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

@@ -17,7 +17,7 @@ public interface StaStatisticalSummaryDao {
      * @param JSRQ 结束日期
      * @return
      */
-    List<HashMap<String, Object>> outPaySummary(String XMMC, String QSRQ, String JSRQ);
+    List<HashMap<String, Object>> outPaySummary(Map map);
 
     List<HashMap<String, Object>> projectPay(Map map);
 }

src/main/java/com/liang/service/StaStatisticalSummaryService.java

@@ -24,7 +24,7 @@ public interface StaStatisticalSummaryService {
      * @param JSRQ 结束日期
      * @return
      */
-    List<HashMap<String, Object>> outPaySummary(String XMMC, String QSRQ, String JSRQ);
+    List<HashMap<String, Object>> outPaySummary(Map map);
 
     List<HashMap<String, Object>> projectPay(Map map);
 

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

@@ -16,8 +16,8 @@ public class StaStatisticalSummaryServiceImpl implements StaStatisticalSummarySe
     private StaStatisticalSummaryDao staStatisticalSummaryDao;
 
     @Override
-    public List<HashMap<String, Object>> outPaySummary(String XMMC, String QSRQ, String JSRQ) {
-        return staStatisticalSummaryDao.outPaySummary(XMMC, QSRQ, JSRQ);
+    public List<HashMap<String, Object>> outPaySummary(Map map) {
+        return staStatisticalSummaryDao.outPaySummary(map);
     }
 
     @Override

src/main/resources/mapper/StaStatisticalSummaryDao.xml

@@ -3,97 +3,84 @@
 <mapper namespace="com.liang.dao.StaStatisticalSummaryDao">
 
     <!--统计报表外委汇总表-->
-    <select id="outPaySummary" resultType="Map">
+    <select id="outPaySummary" resultType="hashmap">
         SELECT
-        sta_OutPay.ID,
-        prj_Project.BM AS XMBH,
-        sys_dept_info.dept_name AS BM,
-        sta_BudgetApproval.XMMC,
-        sta_OutPay.YQCG,
-        sta_OutPay.QSRQ,
-        sta_OutPay.JSRQ,
-        sta_OutPay.WTDWBM,
-        sta_OutPay.WTDWMC,
+        so.ID,
+        p.BM AS XMBH,
+        d.dept_name AS BM,
+        ba.XMMC,
+        so.YQCG,
+        so.QSRQ,
+        so.JSRQ,
+        so.WTDWBM,
+        so.WTDWMC,
         CASE
-        WHEN base_Company.LX = 2 THEN '是'
-        WHEN base_Company.LX = 1 THEN '否'
-        WHEN base_Company.LX = 4 THEN '否'
-        WHEN base_Company.LX IS null THEN '否'
-        WHEN base_Company.LX = 0 THEN '否'
-        ELSE CAST(base_Company.LX AS varchar(11))
+        WHEN c.LX = 2 THEN '是'
+        ELSE '否'
         END AS SFNBDW,
         CASE
-        WHEN sta_BudgetApproval.SFBYJ = 0 THEN '否'
-        WHEN sta_BudgetApproval.SFBYJ = 1 THEN '是'
-        ELSE CAST(sta_BudgetApproval.SFBYJ AS varchar(11))
+        WHEN ba.SFBYJ = 1 THEN '是'
+        ELSE '否'
         END AS SFBYJ,
-        sta_OutPay.HTBZH,
-        sta_OutPay.HTBZBH,
-        sta_OutPay.ZCCB,
+        so.HTBZH,
+        so.HTBZBH,
+        so.ZCCB,
         (
-        SELECT SUM(bzje) AS CLBN
-        FROM (
-        SELECT b.BZJE AS bzje
-        FROM sta_OutPay, sta_BudgetApproval b
-        LEFT JOIN prj_Project p ON p.ID = b.XMID
+        SELECT SUM(b.BZJE)
+        FROM sta_BudgetApproval b
         LEFT JOIN prj_AnnualBudgetDetail g ON g.ID = b.FYLB
-        LEFT JOIN sta_Reimbursement r ON r.FYSQ = b.ID
-        WHERE
-        b.SFBZ = 1
-        AND b.ID = sta_OutPay.ZB
+        WHERE b.SFBZ = 1
+        AND b.ID = so.ZB
         AND YEAR(GETDATE()) = b.NF
         AND g.FYMC = '(1)材料费'
-        ) AS CLBN
         ) AS CLBN,
         (
-        SELECT SUM(bzje) AS CLBN
-        FROM (
-        SELECT b.BZJE AS bzje
-        FROM sta_OutPay, sta_BudgetApproval b
-        LEFT JOIN prj_Project p ON p.ID = b.XMID
+        SELECT SUM(b.BZJE)
+        FROM sta_BudgetApproval b
         LEFT JOIN prj_AnnualBudgetDetail g ON g.ID = b.FYLB
-        LEFT JOIN sta_Reimbursement r ON r.FYSQ = b.ID
-        WHERE
-        b.SFBZ = 1
-        AND b.ID = sta_OutPay.ZB
+        WHERE b.SFBZ = 1
+        AND b.ID = so.ZB
         AND YEAR(GETDATE()) = b.NF
         AND g.FYMC = '(1)仪器设备使用费'
-        ) AS CLBN
         ) AS YQBN,
         (
-        SELECT SUM(HTBZH)
-        FROM sta_OutPay so
-        WHERE
-        so.ZB = sta_BudgetApproval.ID
-        AND sta_BudgetApproval.XMLX = 'S7'
+        SELECT SUM(so2.HTBZH)
+        FROM sta_OutPay so2
+        WHERE so2.ZB = ba.ID
+        AND ba.XMLX = 'S7'
         ) AS ZBH,
         (
-        SELECT SUM(HTBZBH)
-        FROM sta_OutPay so
-        WHERE
-        so.ZB = sta_BudgetApproval.ID
-        AND sta_BudgetApproval.XMLX = 'S7'
+        SELECT SUM(so2.HTBZBH)
+        FROM sta_OutPay so2
+        WHERE so2.ZB = ba.ID
+        AND ba.XMLX = 'S7'
         ) AS ZBBH
         FROM
-        sta_OutPay,
-        sta_BudgetApproval,
-        prj_Project,
-        sys_dept_info,
-        base_Company
+        sta_OutPay so
+        INNER JOIN sta_BudgetApproval ba ON so.ZB = ba.ID
+        LEFT JOIN prj_Project p ON ba.XMID = p.ID
+        LEFT JOIN sys_dept_info d ON ba.SSBM = d.dept_id
+        LEFT JOIN base_Company c ON so.WTDWBM = c.BM
         WHERE
-        sta_OutPay.ZB = sta_BudgetApproval.ID
-        AND sta_BudgetApproval.XMID = prj_Project.ID
-        AND sta_BudgetApproval.SSBM = sys_dept_info.dept_id
-        AND sta_OutPay.WTDWBM = base_Company.BM
-        AND sta_OutPay.WTDWBM != 'AA20170731220855_18'
-        <if test="XMMC != null and XMMC != ''">
-            AND sta_BudgetApproval.XMMC LIKE '%${XMMC}%'
+        so.WTDWBM != 'AA20170731220855_18'
+
+        <if test="xmmc != null and xmmc != ''">
+            AND  ba.XMMC LIKE '%'+#{xmmc}+'%'
+        </if>
+        <if test="qsrq != null and qsrq != ''">
+            AND so.QSRQ  <![CDATA[>= ]]> #{qsrq}
+        </if>
+        <if test="jsrq != null and jsrq != ''">
+            AND so.JSRQ  <![CDATA[<= ]]> #{jsrq}
         </if>
-        <if test="QSRQ != null and QSRQ != ''">
-            AND sta_OutPay.QSRQ  <![CDATA[>= ]]> #{QSRQ}
+        <if test="erpbh != null and erpbh != ''">
+            AND ba.ERPBH  like '%'+#{erpbh}+'%'
         </if>
-        <if test="JSRQ != null and JSRQ != ''">
-            AND sta_OutPay.JSRQ  <![CDATA[<= ]]> #{JSRQ}
+        <if test="bh != null and bh != ''">
+            AND ba.BH like '%'+#{bh}+'%'
+        </if>
+        <if test="nf != null and nf != ''">
+            AND ba.NF = #{nf}
         </if>
     </select>
 

src/main/resources/templates/statistical/outPay.html

@@ -27,25 +27,29 @@
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">项目名称</label>
                             <div class="layui-input-inline" style="width: 224px;">
-                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
+                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">erp编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                                <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">费用申请号</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
+                                <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 80px;">年度</label>
-                            <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
+                            <label class="layui-form-label" style="width: 60px">年份</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <select name="NF" id="NF" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item.nf}"
+                                            th:value="${item.nf}"></option>
+                                </select>
                             </div>
                         </div>
                     </div>
@@ -58,7 +62,7 @@
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                                <input type="text" name="JSRQ" id="JSRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
@@ -78,6 +82,9 @@
         </fieldset>
 
         <script type="text/html" id="toolbarDemo">
+            <button class="layui-btn layui-btn-sm" lay-event="export" style="background-color: #2f363c" >
+                <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>批量导出
+            </button>
 
         </script>
 
@@ -121,7 +128,7 @@
             elem: '#QSRQ'
         });
         laydate.render({
-            elem: '#JZRQ'
+            elem: '#JSRQ'
         });
 
         var currTable = table.render({
@@ -216,10 +223,29 @@
                 }
             });
         });
-        var cancelIndex;
-        /**
-         * toolbar监听事件
-         */
+        table.on('toolbar(currentTableFilter)',function (obj){
+            var formData = form.val('search-form');
+            console.log(formData);
+            var formDataString = JSON.stringify(formData);
+            if(obj.event === 'export'){
+                var formData = form.val('search-form');
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
+                AjaxUtil.post({
+                    url:AjaxUtil.ctx +'staStatisticalSummary/getAll/'+formDataString,
+                    contentType: "application/json",
+                    timeout: 15000, //大批量导出时会出现超时问题
+                    success: function(res){
+                        console.log(res);
+                        table.exportFile('currentTableId',res.data,'xlsx');
+                    },
+                    error:function (error) {
+                        Message.error(error,2000)
+
+                    }
+                });
+            }
+        });
     });