年度预算修改记录功能实现

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

@@ -1,21 +1,28 @@
 package com.liang.controller;
+import com.google.common.collect.Lists;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.PostInfoEnum;
 import com.liang.entity.*;
-import com.liang.service.PrjAnnualBudgetRecordService;
-import com.liang.service.PrjAnnualbudgetdetailService;
+import com.liang.service.*;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.sql.Date;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 年度预算修改记录控制器
@@ -29,23 +36,48 @@ public class PrjAnnualBudgetRecordController extends BaseController {
     @Resource
     private  PrjAnnualbudgetdetailService prjAnnualbudgetdetailService;
 
+    @Resource
+    private PrjAnnualbudgetXgjlService prjAnnualbudgetXgjlService;
+
+    @Resource
+    private PrjAnnualbudgetService prjAnnualbudgetService;
+
+    @Resource
+    private SysPostInfoService sysPostInfoService;
+    @Resource
+    private PrjApproverecordService prjApproverecordService;
+
     /**
      * 在年度预算修改记录表中添加修改前的数据（年度预算明细）
      *
-     * @param ndys 年度预算ID
+     * @param nys 年度预算ID
      * @return
      */
     @ResponseBody
     @PostMapping("/addBudgetRecord/{ysId}")
-    public BaseResult addBudgetRecord(@PathVariable("ysId") Integer ndys) {
-        System.out.println("进入了添加预算的方法");
-        List<PrjAnnualBudgetRecord> prjAnnualBudgetRecords = prjAnnualBudgetRecordService.queryDetailByNys(ndys, getSysUserInfo().getUserId());
-        if (prjAnnualBudgetRecords != null) {
-            prjAnnualBudgetRecordService.addHistoryRecord(prjAnnualBudgetRecords);
-            return BaseResult.success("添加成功");
-        } else {
-            return BaseResult.failure("未查询到该年度预算明细");
+    @Transactional
+    public BaseResult addBudgetRecord(@PathVariable("ysId") Integer nys) {
+//        1.获取年度预算明细列表中的数据
+        List<PrjAnnualbudgetdetail> xgjl = prjAnnualbudgetdetailService.getXGJL(nys);
+//        查询当前为第几次记录
+        List<PrjAnnualbudgetXgjl> xgjls = prjAnnualbudgetXgjlService.getXGJL(nys);
+//        获取当前年度预算审批状态
+        PrjAnnualbudget prjAnnualbudget = prjAnnualbudgetService.queryById(nys);
+        int xh = xgjls.size()+1;
+        List<PrjAnnualbudgetXgjl> prjAnnualbudgetXgjlList = new ArrayList<>();
+        for (int i = 0; i < xgjl.size(); i++) {
+            PrjAnnualbudgetXgjl prjAnnualbudgetXgjl= new PrjAnnualbudgetXgjl();
+            prjAnnualbudgetXgjl.setNys(nys);
+            prjAnnualbudgetXgjl.setFymc(xgjl.get(i).getFymc());
+            prjAnnualbudgetXgjl.setXg(xgjl.get(i).getXgjlxz());
+            prjAnnualbudgetXgjl.setXgrq(new Date(System.currentTimeMillis()).toString());
+            prjAnnualbudgetXgjl.setXh(xh);
+            prjAnnualbudgetXgjlList.add(prjAnnualbudgetXgjl);
+        }
+        if (prjAnnualbudget.getSpzt().equals("审批结束")){
+            prjAnnualbudgetXgjlService.batchinsertXGJL(prjAnnualbudgetXgjlList);
         }
+        return BaseResult.success();
     }
 
     /**
@@ -67,7 +99,6 @@ public class PrjAnnualBudgetRecordController extends BaseController {
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                              @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
         PageHelper.startPage(pageNum, pageSize);
-//        List<PrjAnnualBudgetRecord> list = prjAnnualBudgetRecordService.queryRecordByNdysid(xmid);
         List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getXGJL(xmid);
         PageInfo<PrjAnnualbudgetdetail> pageinfo = new PageInfo<>(list);
         //取出查询结果
@@ -79,6 +110,20 @@ public class PrjAnnualBudgetRecordController extends BaseController {
 
         return BaseResult.success(result);
     }
+    @ResponseBody
+    @RequestMapping(value = "/addUpdateApplyRecord", method = RequestMethod.POST)
+    @Transactional
+    public BaseResult addUpdateApplyRecord(
+                             @RequestParam("budgets") List<PrjAnnualBudgetRecord> record) {
+//插入到修改申请表中
+        int i = prjAnnualBudgetRecordService.addHistoryRecord(record);
+
+        if (i>0){
+            return BaseResult.success();
+        }else {
+            return BaseResult.failure("");
+        }
+    }
 
 
 }

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

@@ -590,6 +590,44 @@ public class PrjAnnualbudgetController extends BaseController {
 
         return "annualbudget/update_annualbudget";
     }
+    /**
+     * 修改申请
+     *
+     * @return
+     */
+    @RequestMapping(value = "/forUpdateApply/{id}", method = RequestMethod.GET)
+    public String forUpdateApply(Model model, @PathVariable Integer id) {
+        PrjAnnualbudget annualbudget = prjAnnualbudgetService.queryById(id);
+        model.addAttribute("annualbudget", annualbudget);
+
+        String xmzxq = annualbudget.getXmzxq();
+        model.addAttribute("qs", xmzxq.substring(0, 4));
+        int index = xmzxq.trim().indexOf("至") + 2;
+        model.addAttribute("wc", xmzxq.substring(index, index + 4));
+
+        PrjProject project = prjProjectService.queryById(annualbudget.getRws());
+        model.addAttribute("rwsys", project.getYsje());
+
+        Map<String, String> paraMap = new HashMap<>();
+        if (ProjectTypeEnnum.ZFLXM.msg().equals(annualbudget.getXmlxmc())) {
+            List<Integer> nfList = prjFeeschemeService.getYearList(annualbudget.getRws());
+            paraMap.put("xm", annualbudget.getRws().toString());
+            paraMap.put("nf", nfList.get(nfList.size() - 1).toString());
+        } else {
+            paraMap.put("xm", annualbudget.getRws().toString());
+            paraMap.put("nf", annualbudget.getNf());
+        }
+        Double ndczje;
+        if (ProjectTypeEnnum.GWGSKJXM.msg().equals((annualbudget.getXmlxmc()))) {
+            ndczje = prjFeeschemeService.getNdFeeSchemeofDKY(paraMap);
+        } else {
+            ndczje = prjFeeschemeService.getNdFeeScheme(paraMap);
+
+        }
+        model.addAttribute("ndczje", ndczje);
+
+        return "annualbudget/updateApply_annualbudget";
+    }
 
 
     /**
@@ -866,5 +904,6 @@ public class PrjAnnualbudgetController extends BaseController {
 
         ExcelPoiUtil.excelPort("年度预算", listName, list, null, response);
     }
+
 }
 

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

@@ -0,0 +1,36 @@
+package com.liang.controller;
+
+import com.liang.common.JsonTool;
+import com.liang.entity.PrjAnnualbudgetXgjl;
+import com.liang.service.PrjAnnualbudgetService;
+import com.liang.service.PrjAnnualbudgetXgjlService;
+import com.liang.vo.PrjAnnualbudgetNfVo;
+import com.liang.vo.PrjAnnualbudgetYzxqkVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Controller
+@Slf4j
+@RequestMapping("prjAnnualbudgetXgjl")
+public class PrjAnnualbudgetXgjlController {
+
+    @Resource
+    private PrjAnnualbudgetXgjlService prjAnnualbudgetXgjlService;
+
+    /**
+     * 获取项目修改记录
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getXGJL/{nys}", method = RequestMethod.POST)
+    public Object getXGJL(@PathVariable Integer nys) {
+        List<PrjAnnualbudgetXgjl> prjAnnualbudgetXgjlList=prjAnnualbudgetXgjlService.getXGJL(nys);
+        return JsonTool.toJsonString(prjAnnualbudgetXgjlList);
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.liang.dao;
+
+import com.liang.entity.PrjAnnualbudgetXgjl;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PrjAnnualbudgetXgjlDao {
+    List<PrjAnnualbudgetXgjl> getXGJL(Integer nys);
+
+    List<PrjAnnualbudgetXgjl> getXG(@Param("xh") int i, @Param("nys") Integer nys);
+
+    void insertXGJL(@Param("xgjl") PrjAnnualbudgetXgjl prjAnnualbudgetXgjl);
+
+    void batchinsertXGJL(@Param("xgjlList") List<PrjAnnualbudgetXgjl> prjAnnualbudgetXgjlList);
+}

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

@@ -0,0 +1,36 @@
+package com.liang.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PrjAnnualbudgetXgjl {
+
+    private Integer id;
+//    年度预算id
+    private Integer nys;
+//     费用名称
+    private String fymc;
+//    修改内容
+    private String xg;
+//    修改日期
+    private String  xgrq;
+//    修改序号
+    private Integer xh;
+//    修改记录
+    private List<PrjAnnualbudgetXgjl> xglist;
+
+
+
+
+
+
+
+
+
+}

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

@@ -213,5 +213,16 @@ public class PrjAnnualbudgetdetail implements Serializable {
     private BigDecimal bndsqje;
     private BigDecimal bndbzje;
 
+    private String xg1;
+    private String xg2;
+    private String xg3;
+    private String xg4;
+    private String xg5;
+    private String xg6;
+    private String xg7;
+    private String xg8;
+    private String xg9;
+    private String xg10;
+
 }
 

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

@@ -0,0 +1,16 @@
+package com.liang.service;
+
+import com.liang.entity.PrjAnnualbudgetXgjl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+public interface PrjAnnualbudgetXgjlService {
+    List<PrjAnnualbudgetXgjl> getXGJL(Integer nys);
+
+    List<PrjAnnualbudgetXgjl> getXG(int i,Integer nys);
+
+    void insertXGJL(PrjAnnualbudgetXgjl prjAnnualbudgetXgjl);
+
+    void batchinsertXGJL(List<PrjAnnualbudgetXgjl> prjAnnualbudgetXgjlList);
+}

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

@@ -0,0 +1,35 @@
+package com.liang.service.impl;
+
+import com.liang.dao.PrjAnnualbudgetXgjlDao;
+import com.liang.entity.PrjAnnualbudgetXgjl;
+import com.liang.service.PrjAnnualbudgetXgjlService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("prjAnnualbudgetXgjlService")
+public class PrjAnnualbudgetXgjlServiceImpl implements PrjAnnualbudgetXgjlService {
+    @Resource
+    private PrjAnnualbudgetXgjlDao prjAnnualbudgetXgjlDao;
+
+    @Override
+    public List<PrjAnnualbudgetXgjl> getXGJL(Integer nys) {
+        return this.prjAnnualbudgetXgjlDao.getXGJL(nys);
+    }
+
+    @Override
+    public List<PrjAnnualbudgetXgjl> getXG(int i,Integer nys) {
+        return this.prjAnnualbudgetXgjlDao.getXG(i,nys);
+    }
+
+    @Override
+    public void insertXGJL(PrjAnnualbudgetXgjl prjAnnualbudgetXgjl) {
+        prjAnnualbudgetXgjlDao.insertXGJL(prjAnnualbudgetXgjl);
+    }
+
+    @Override
+    public void batchinsertXGJL(List<PrjAnnualbudgetXgjl> prjAnnualbudgetXgjlList) {
+        prjAnnualbudgetXgjlDao.batchinsertXGJL(prjAnnualbudgetXgjlList);
+    }
+}

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

@@ -1,11 +1,14 @@
 package com.liang.service.impl;
 
+import com.liang.dao.PrjAnnualbudgetXgjlDao;
 import com.liang.dao.PrjBudgetDao;
 import com.liang.dao.PrjCompletecompanyDao;
+import com.liang.entity.PrjAnnualbudgetXgjl;
 import com.liang.entity.PrjAnnualbudgetdetail;
 import com.liang.dao.PrjAnnualbudgetdetailDao;
 import com.liang.entity.PrjBudget;
 import com.liang.entity.PrjCompletecompany;
+import com.liang.service.PrjAnnualbudgetXgjlService;
 import com.liang.service.PrjAnnualbudgetdetailService;
 import org.springframework.stereotype.Service;
 import org.springframework.data.domain.Page;
@@ -32,6 +35,9 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
     @Resource
     private PrjCompletecompanyDao prjCompletecompanyDao;
 
+    @Resource
+    private PrjAnnualbudgetXgjlService prjAnnualbudgetXgjlService;
+
 
     /**
      * 通过ID查询单条数据
@@ -241,6 +247,56 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
           String xgjlxz = xgjl.get(i).getXmz() + ","+xgjl.get(i).getYsje()+","+xgjl.get(i).getByj();
           xgjl.get(i).setXgjlxz(xgjlxz);
         }
+        List<PrjAnnualbudgetXgjl> prjAnnualbudgetXgjlList=prjAnnualbudgetXgjlService.getXGJL(xmid);
+//        获取修改记录
+        for (int i = 0; i < prjAnnualbudgetXgjlList.size(); i++) {
+            int k=i+1;
+            List<PrjAnnualbudgetXgjl> xg   =prjAnnualbudgetXgjlService.getXG(k,xmid);
+            switch (k){
+                case 1:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg1(xg.get(j).getXg());
+                    };break;
+                case 2:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg2(xg.get(j).getXg());
+                    };break;
+                case 3:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg3(xg.get(j).getXg());
+                    };break;
+                case 4:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg4(xg.get(j).getXg());
+                    };break;
+                case 5:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg5(xg.get(j).getXg());
+                    };break;
+                case 6:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg6(xg.get(j).getXg());
+                    };break;
+                case 7:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg7(xg.get(j).getXg());
+                    };break;
+                case 8:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg8(xg.get(j).getXg());
+                    };break;
+                case 9:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg9(xg.get(j).getXg());
+                    };break;
+                case 10:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg10(xg.get(j).getXg());
+                    };break;
+            }
+
+        }
+
         return xgjl;
     }
 

src/main/resources/mapper/PrjAnnualbudgetXgjlDao.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liang.dao.PrjAnnualbudgetXgjlDao">
+    <resultMap type="com.liang.entity.PrjAnnualbudgetXgjl" id="PrjAnnualbudgetXgjlMap">
+    <result property="id" column="ID" jdbcType="INTEGER"/>
+    <result property="nys" column="NYS" jdbcType="INTEGER"/>
+    <result property="fymc" column="FYMC" jdbcType="VARCHAR"/>
+    <result property="xg" column="XG" jdbcType="VARCHAR"/>
+    <result property="xh" column="XH" jdbcType="INTEGER"/>
+    <result property="xgrq" column="XGRQ" jdbcType="DATE"/>
+    </resultMap>
+    <insert id="insertXGJL" keyProperty="id" useGeneratedKeys="true">
+        INSERT INTO prj_AnnualBudget_xgjl (nys, fymc, xg, xgrq, xh)
+        VALUES (#{xgjl.nys},#{xgjl.fymc}, #{xgjl.xg}, #{xgjl.xgrq}, #{xgjl.xh});
+    </insert>
+    <insert id="batchinsertXGJL" keyProperty="id" useGeneratedKeys="true">
+        INSERT INTO prj_AnnualBudget_xgjl (nys, fymc, xg, xgrq, xh)
+        VALUES
+        <foreach collection="xgjlList" item="xgjl" separator=",">
+        (#{xgjl.nys},#{xgjl.fymc}, #{xgjl.xg}, #{xgjl.xgrq}, #{xgjl.xh})
+        </foreach>
+    </insert>
+    <select id="getXGJL" resultType="com.liang.entity.PrjAnnualbudgetXgjl">
+        SELECT XH,xgrq
+        FROM prj_AnnualBudget_xgjl
+        WHERE NYS = #{nys}
+        GROUP BY XH,xgrq
+        ORDER BY XH ASC
+    </select>
+    <select id="getXG" resultType="com.liang.entity.PrjAnnualbudgetXgjl">
+        SELECT b.FYMC,a.xg
+        FROM prj_AnnualBudget_xgjl a
+                 RIGHT JOIN prj_AnnualBudgetDetail b on a.nys=b.nys and a.fymc = b.FYMC
+        WHERE a.NYS = #{nys}
+          AND  a.XH = #{xh}
+    </select>
+
+
+</mapper>

src/main/resources/templates/annualbudget/update_annualbudget.html

@@ -615,30 +615,29 @@
                 success: function (res) {
                     layer.close(index);
                     if (res.code === 0) {
-
-                    } else {
-                        Message.error("修改记录添加失败", 2000);
-                    }
-                }
-            });
-            AjaxUtil.post({
-                url: AjaxUtil.ctx + "prjAnnualbudgetdetail/doUpdate",
-                contentType: "application/json",
-                data: JSON.stringify(budgets),
-                success: function (res) {
-                    if (res.code === 0) {
-                        Message.success(1500, res.message, function () {
-                            loadTreetable();
-                            parent.setUpdateFlag();
-                            parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
+                        AjaxUtil.post({
+                            url: AjaxUtil.ctx + "prjAnnualbudgetdetail/doUpdate",
+                            contentType: "application/json",
+                            data: JSON.stringify(budgets),
+                            success: function (res) {
+                                if (res.code === 0) {
+                                    Message.success(1500, res.message, function () {
+                                        loadTreetable();
+                                        parent.setUpdateFlag();
+                                        parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
+                                    });
+                                } else {
+                                    Message.error(res.message, 1000);
+                                }
+                                layer.close(index);
+                            },
+                            error: function (error) {
+                                layer.close(index);
+                            }
                         });
                     } else {
-                        Message.error(res.message, 1000);
+                        Message.error("修改记录添加失败", 2000);
                     }
-                    layer.close(index);
-                },
-                error: function (error) {
-                    layer.close(index);
                 }
             });
         });

src/main/resources/templates/annualbudget/view_record.html

@@ -36,35 +36,50 @@
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
 <script th:inline="javascript" type="text/javascript">
     AjaxUtil.ctx = /*[[@{/}]]*/'';
-    layui.use(['form', 'table'], function () {
+    layui.use(['form', 'treeTable', 'tableSelect', 'laydate','table'], function () {
 
         var form = layui.form,
             table = layui.table;
-
         var xmApprove = parent.getXmApproval();
         $("#xm").val(xmApprove.xm);
         form.render();
 
+        var xgjl = new Array();
+        $.ajax({
+            url: AjaxUtil.ctx + 'prjAnnualbudgetXgjl/getXGJL/' + xmApprove.xmid,
+            type: "post",
+            async: false,
+            dataType: "json",
+            success: function (result) {
+                xgjl = result;
+            }
+        });
+        var field = '';
+        var title = '修改';
+        var dynamicColumns = [];
+
+        for (var i = 0; i < xgjl.length; i++) {
+            field = 'xg'+xgjl[i].xh;
+            title = xgjl[i].xgrq+'修改';
+            dynamicColumns.push({field: field, width: '13%', title: title});
+        }
+        var newcols =[
+            {type: 'numbers', align: 'center'},
+            {field: 'fymc', width: '15%', title: '费用名称'},
+            {field: 'nf', width: '7%', title: '年份'},
+            {field: 'xmzys', width: '5%', title: '项目总预算'},
+            {field: 'sptgzt', width: '10%', title: '审批通过状态'},
+            {field: 'xgjlxz', width: '13%', title: '现在'},
+        ].concat(dynamicColumns);
         var currTable = table.render({
             elem: '#currentTableId',
             url: AjaxUtil.ctx + 'PrjAnnualBudgetRecord/redordData/' + xmApprove.xmid,
             method: 'post',
-            // toolbar: '#toolbarDemo',
-            // defaultToolbar: ['filter', 'exports', 'print'],
-            cols: [
-                [
-                    {type: 'numbers', align: 'center'},
-                    {field: 'fymc', width: '20%', title: '费用名称'},
-                    {field: 'nf', width: '10%', title: '年份'},
-                    {field: 'xmzys', width: '20%', title: '项目总预算'},
-                    {field: 'sptgzt', width: '20%', title: '审批通过状态'},
-                    {field: 'xgjlxz', width: '20%', title: '现在'},
-                ]
-            ],
-            sortName: 'jtsj',
+            cols:[newcols],
             autoSort: false,
             limits: [20, 25, 50, 100],
             limit: 30,
+            maxmin:true,
             page: true,
             skin: 'grid',
             parseData: function (res) { //res 即为原始返回的数据
@@ -72,7 +87,7 @@
                     "code": res.code, //解析接口状态
                     "msg": res.message, //解析提示文本
                     "count": res.data.total, //解析数据长度
-                    "data": res.data.rows //解析数据列表
+                    "data": res.data.rows, //解析数据列表
                 };
             }
         });