Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mapper/PrjAnnualbudgetDao.xml

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

@@ -26,6 +26,8 @@ public class PrjAnnualBudgetRecordController extends BaseController {
 
     @Resource
     private PrjAnnualBudgetRecordService prjAnnualBudgetRecordService;
+    @Resource
+    private  PrjAnnualbudgetdetailService prjAnnualbudgetdetailService;
 
     /**
      * 在年度预算修改记录表中添加修改前的数据（年度预算明细）
@@ -65,10 +67,11 @@ 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);
-        PageInfo<PrjAnnualBudgetRecord> pageinfo = new PageInfo<>(list);
+//        List<PrjAnnualBudgetRecord> list = prjAnnualBudgetRecordService.queryRecordByNdysid(xmid);
+        List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getXGJL(xmid);
+        PageInfo<PrjAnnualbudgetdetail> pageinfo = new PageInfo<>(list);
         //取出查询结果
-        List<PrjAnnualBudgetRecord> rows = pageinfo.getList();
+        List<PrjAnnualbudgetdetail> rows = pageinfo.getList();
         int total = (int) pageinfo.getTotal();
         Map<String, Object> result = new HashMap<>();
         result.put(RESULT_ROWS, rows);

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

@@ -212,13 +212,18 @@ public class PrjAnnualbudgetController extends BaseController {
                              @RequestParam(required = false, defaultValue = "", value = "rwsmc") String rwsmc,
                              @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
-                             @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
+                             @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
+                             @RequestParam(required = false, defaultValue = "", value = "add") String add) {
         SysUserInfo userInfo = getSysUserInfo();
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
+//                if (PostInfoEnum.KYZZ.postName().equals(postName.get(i))) {
+//                    post = "过";
+//                }
+                if (PostInfoEnum.KYFZR.postName().equals(postName.get(i))||PostInfoEnum.KJBBMZR.equals(postName.get(i))||PostInfoEnum.KJXMGLZZ
+                        .postName().equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -235,10 +240,12 @@ public class PrjAnnualbudgetController extends BaseController {
         paraMap.put("spzt", spzt);
         paraMap.put("rwsmc", rwsmc);
         paraMap.put("nf", nf);
+        paraMap.put("add",add);
 
         if (!userInfo.getAccount().equals("admin")) {
             if (!"过".equals(post)) {
                 paraMap.put("userId", userInfo.getUserId().toString());
+                paraMap.put("deptName",userInfo.getDeptName());
             }
         }
         List<PrjAnnualbudget> list = prjAnnualbudgetService.getNdysList(paraMap);

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

@@ -14,6 +14,7 @@ import com.liang.service.*;
 import io.swagger.annotations.ApiOperation;
 import lombok.Synchronized;
 import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
@@ -189,7 +190,7 @@ public class StaBudgetapprovalController extends BaseController {
         String post = "";
         if (postName.size() > 0) {
             for (int i = 0; i < postName.size(); i++) {
-                if ("科研专责".equals(postName.get(i))) {
+                if (PostInfoEnum.KYZZ.equals(postName.get(i))||PostInfoEnum.KYFZR.equals(postName.get(i))) {
                     post = "过";
                 }
             }
@@ -222,6 +223,9 @@ public class StaBudgetapprovalController extends BaseController {
         if (!userInfo.getAccount().equals("admin")) {
             if (!"过".equals(post)) {
                 paraMap.put("userId", userInfo.getUserId().toString());
+            }else {
+                paraMap.put("deptName",userInfo.getDeptName());
+
             }
         }
         List<StaBudgetapproval> list = staBudgetapprovalService.getFysqList(paraMap);
@@ -238,7 +242,7 @@ public class StaBudgetapprovalController extends BaseController {
     }
 
     /**
-     * 新建数据
+     * 新建数据(年度预算页面)
      *
      * @return
      */
@@ -248,6 +252,26 @@ public class StaBudgetapprovalController extends BaseController {
         model.addAttribute("userInfo", userInfo);
         return "annualbudget/add_apply";
     }
+    /**
+     * 新建数据(费用申请页面)
+     *
+     * @return
+     */
+    @RequestMapping(value = "/forAdd", method = RequestMethod.GET)
+    public String forAdd(Model model) {
+        SysUserInfo userInfo = getSysUserInfo();
+        model.addAttribute("userInfo", userInfo);
+        return "stabudgetapproval/add";
+    }
+
+    @RequestMapping(value = "/init_prjAnnualbudget", method = RequestMethod.GET)
+    public String init_prjAnnualbudget(Model model) {
+        //项目类型
+        List<Map<String, String>> xmlxList = projecttypeService.getXMLX();
+        model.addAttribute("xmlxList", xmlxList);
+
+        return "stabudgetapproval/list_annualbudget";
+    }
 
     /**
      * 保存数据（费用申请）
@@ -1630,5 +1654,20 @@ public class StaBudgetapprovalController extends BaseController {
         String bh = staBudgetapprovalService.getBhById(id);
         return BaseResult.success(bh);
     }
+
+    /**
+     * 获取项目总预算
+     *
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/getXMZYS/{id}")
+    public BaseResult getXMZYS(@PathVariable String id) {
+        Double xmzys = prjAnnualbudgetdetailService.getXMZYS(id);
+//        select YSJE from prj_AnnualBudgetDetail where NYS = b.NYS and FJ = ''
+        return BaseResult.success(xmzys);
+    }
+
+
 }
 

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

@@ -134,5 +134,9 @@ public interface PrjAnnualbudgetdetailDao {
     List<PrjAnnualbudgetYzxqkVo> getNf(@Param("nys")Integer nys);
 
     List<PrjAnnualbudgetdetail> listAllBudgetDetail(@Param("nys") Integer nys);
+
+    List<PrjAnnualbudgetdetail> getXGJL(int xmid);
+
+    Double getXMZYS(String id);
 }
 

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

@@ -91,4 +91,8 @@ public interface PrjAnnualbudgetdetailService {
     Integer getSubNodeCount(@Param("nys") Integer nys, @Param("page") Integer page, @Param("limit") Integer limit);
 
     List<PrjAnnualbudgetdetail> listAllBudgetDetail(@Param("nys") Integer nys);
+
+    List<PrjAnnualbudgetdetail> getXGJL(int xmid);
+
+    Double getXMZYS(String id);
 }

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

@@ -234,4 +234,16 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
         return this.prjAnnualbudgetdetailDao.listAllBudgetDetail(nys);
     }
 
+    @Override
+    public List<PrjAnnualbudgetdetail> getXGJL(int xmid) {
+        return this.prjAnnualbudgetdetailDao.getXGJL(xmid);
+    }
+
+    @Override
+    public Double getXMZYS(String id) {
+        Double xmzys = prjAnnualbudgetdetailDao.getXMZYS(id);
+        System.out.println("xmzys = " + xmzys);
+        return xmzys;
+    }
+
 }

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -378,6 +378,9 @@
         <if test="nf != null and nf != ''">
             and a.NF = #{nf}
         </if>
+        <if test="add != null and add != ''">
+            and a.SPZT = '审批结束'
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -655,5 +655,17 @@
         where
            nys in (select  ID from prj_AnnualBudget where rws = (select  rws from prj_AnnualBudget where id = #{nys}))
     </select>
+    <select id="getXGJL" resultType="com.liang.entity.PrjAnnualbudgetdetail">
+        select a.fymc,a.xmzys,a.ysje,b.nf
+        from
+            prj_AnnualBudgetDetail  a
+        left join prj_AnnualBudget b on  a.NYS = b.id
+        where
+            NYS =#{xmid}
+    </select>
+    <select id="getXMZYS" resultType="java.lang.Double">
+        select YSJE from prj_AnnualBudgetDetail where NYS = #{id} and FJ = ''
+    </select>
+
 </mapper>
 

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -445,6 +445,9 @@
         <if test="userId != null and userId != ''">
             and (b.SQR = #{userId} or #{userId} in (select SHR from prj_ApproveRecord where XMID = b.ID))
         </if>
+        <if test="deptName!= null and deptName != ''">
+            and d.dept_name = #{deptName}
+        </if>
         <if test="sqmc != null and sqmc != ''">
             and b.SQMC like '%'+#{sqmc}+'%'
         </if>

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

@@ -441,7 +441,6 @@
                 </div>
             </div>
 
-</form>
 </div>
 <!--常规结束-->
 <!--其它信息开始-->

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

@@ -55,17 +55,16 @@
                 [
                     {type: 'numbers', align: 'center'},
                     {field: 'fymc', width: '20%', title: '费用名称'},
+                    {field: 'nf', width: '10%', title: '年份'},
                     {field: 'xmzys', width: '20%', title: '项目总预算'},
-                    {field: 'ysje', width: '10%', title: '预算金额', align: 'center'},
-                    {field: 'xmz', width: '10%', title: '项目组', align: 'center'},
-                    {field: 'byj', width: '10%', title: '备用金', align: 'center'},
-                    {field: 'bjsj', width: '15%', title: '编辑时间', align: 'center'}
+                    {field: 'sptgysje', width: '20%', title: '审批通过状态'},
+                    {field: 'ysje', width: '20%', title: '现在'},
                 ]
             ],
             sortName: 'jtsj',
             autoSort: false,
-            limits: [10, 15, 20, 25, 50, 100],
-            limit: 10,
+            limits: [20, 25, 50, 100],
+            limit: 30,
             page: true,
             skin: 'grid',
             parseData: function (res) { //res 即为原始返回的数据

src/main/resources/templates/stabudgetapproval/list_annualbudget.html

@@ -0,0 +1,217 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <title>年度预算列表</title>
+  <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
+  <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
+  <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">
+</head>
+<body>
+<div class="layuimini-container">
+  <div class="layuimini-main" style="margin-bottom: -30px">
+    <fieldset class="table-search-fieldset">
+      <legend>搜索信息(<b>收起-展开</b>)</legend>
+      <div id="search-div" style="margin: 5px 10px -10px 0px">
+        <form class="layui-form" action="" lay-filter="search-form">
+          <div class="layui-form-item">
+            <div class="layui-inline" style="margin-left: -10px">
+              <label class="layui-form-label" style="width: 60px">项目名称</label>
+              <div class="layui-input-inline" style="width: 200px">
+                <input type="text" id="mc" name="xmmc" autocomplete="off" class="layui-input">
+              </div>
+            </div>
+            <div class="layui-inline" style="margin-left: -10px">
+              <label class="layui-form-label" style="width: 60px">ERP编号</label>
+              <div class="layui-input-inline" style="width: 150px">
+                <input type="text" name="erpbh" autocomplete="off" class="layui-input">
+              </div>
+            </div>
+            <div class="layui-inline" style="margin-left: -10px">
+              <label class="layui-form-label" style="width: 60px">年份</label>
+              <div class="layui-input-inline" style="width: 150px">
+                <input type="text" name="nf" autocomplete="off" class="layui-input">
+              </div>
+            </div>
+            <div class="layui-inline" style="margin-left: -10px">
+              <label class="layui-form-label" style="width: 60px">项目类型</label>
+              <div class="layui-input-inline" style="width: 150px">
+                <select name="xmlx" id="xmlx" lay-filter="status">
+                  <option value="">全部</option>
+                  <option th:each="item:${xmlxList}" th:text="${item.name}"
+                          th:value="${item.code}"></option>
+                </select>
+              </div>
+            </div>
+            <div class="layui-inline">
+              <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i
+                      class="layui-icon"></i> 搜 索
+              </button>
+              <button type="submit" class="layui-btn layui-btn-primary" lay-submit
+                      lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+              </button>
+            </div>
+          </div>
+        </form>
+      </div>
+    </fieldset>
+    <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
+
+    <!-- 右侧悬浮按钮 -->
+    <div class="layui-form layuimini-form">
+      <div class="right-bottom-btn">
+        <button class="layui-btn" lay-filter="selectBtn">
+          <i class="layui-icon layui-icon-ok"></i>选择
+        </button>
+        <button class="layui-btn" lay-filter="cancleBtn">
+          <i class="layui-icon layui-icon-close"></i>取消
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+<script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
+<script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
+<script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
+<script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
+<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 () {
+    var form = layui.form,
+            table = layui.table;
+    var project = null;
+    var currTable = table.render({
+      elem: '#currentTableId',
+      url: AjaxUtil.ctx + 'prjAnnualbudget/mylist',
+      method: 'post',
+      where:{
+        add: '1',
+      },
+      // toolbar: '#toolbarDemo',
+      // defaultToolbar: ['filter', 'exports', 'print'],
+      cols: [
+        [
+          {type: 'numbers'},
+          {field: 'xmmc', width: '30%', title: '项目名称'},
+          {field: 'mc', width: '30%', title: '年度预算名称'},
+          {field: 'erpbh', width: '13%', title: 'ERP编号'},
+          {field: 'xmlxmc', width: '18%', title: '项目类型'},
+          {field: 'nf', width: '10%', title: '年份'},
+          {field: 'xmfzrxm', width: '10%', title: '项目负责人'},
+        ]
+      ],
+      autoSort: false,
+      limits: [10, 15, 20, 25, 50, 100],
+      limit: 10,
+      page: true,
+      skin: 'grid',
+      parseData: function (res) { //res 即为原始返回的数据
+        return {
+          "code": res.code, //解析接口状态
+          "msg": res.message, //解析提示文本
+          "count": res.data.total, //解析数据长度
+          "data": res.data.rows //解析数据列表
+        };
+      },
+      done: function (res, curr, count) { // done为数据渲染完的回调
+        // 测试打印出后端返回的权限列表
+        // let permissionSet = [[${permissionSet}]];
+        // console.log(JSON.stringify(permissionSet));
+      }
+    });
+
+    // 监听搜索操作
+    form.on('submit(data-search-btn)', function (data) {
+      // 执行搜索重载
+      currTable.reload({
+        page: {
+          curr: 1 // 页码从1开始
+        },
+        where: form.val("search-form")
+      });
+      return false;
+    });
+
+    // 监听重置操作
+    form.on('submit(data-reset-btn)', function (data) {
+      form.val("search-form", {
+        "xmmc": '',
+        "erpbh": '',
+        "xmlx": '',
+        "nf":''
+      });
+      // 执行搜索重载
+      currTable.reload({
+        page: {
+          curr: 1
+        },
+        where: form.val("search-form")
+      });
+      return false;
+    });
+
+    //监听行选中
+    table.on('row(currentTableFilter)', function (obj) {
+      annualbudget = obj.data;
+      obj.tr.addClass('layui-bg-blue').siblings().removeClass('layui-bg-blue');
+      localStorage.setItem("ysid", annualbudget.id);
+      localStorage.setItem("xmid", annualbudget.rws);
+      localStorage.setItem("nf", annualbudget.nf);
+      localStorage.setItem("xmmc", annualbudget.mc == null ? '' : annualbudget.mc);
+      localStorage.setItem("erpbh", annualbudget.erpbh == null ? '' : annualbudget.erpbh);
+      localStorage.setItem("xmlx", annualbudget.xmlx == null ? '' : annualbudget.xmlx);
+      localStorage.setItem("xmlxmc", annualbudget.xmlxmc == null ? '' : annualbudget.xmlxmc);
+      localStorage.setItem("xmfzr", annualbudget.xmfzr == null ? '' : annualbudget.xmfzr);
+      localStorage.setItem("xmfzrxm", annualbudget.dkyfzrxm == null ? '' : annualbudget.dkyfzrxm);
+      localStorage.setItem("ssbm", annualbudget.ssbm == null ? '' : annualbudget.ssbm);
+      localStorage.setItem("ssbmmc", annualbudget.ssbmmc == null ? '' : annualbudget.ssbmmc);
+      localStorage.setItem("annualbudget",annualbudget.dkyfzr == null ? '' :  annualbudget.dkyfzr);
+    });
+
+    //双击
+    table.on('rowDouble(currentTableFilter)', function (obj) {
+      project = obj.data;
+      obj.tr.addClass('layui-bg-blue').siblings().removeClass('layui-bg-blue');
+
+      localStorage.setItem("ysid", annualbudget.id);
+      localStorage.setItem("xmid", annualbudget.rws);
+      localStorage.setItem("nf", annualbudget.nf);
+      localStorage.setItem("xmmc", annualbudget.mc == null ? '' : annualbudget.mc);
+      localStorage.setItem("erpbh", annualbudget.erpbh == null ? '' : annualbudget.erpbh);
+      localStorage.setItem("xmlx", annualbudget.xmlx == null ? '' : annualbudget.xmlx);
+      localStorage.setItem("xmlxmc", annualbudget.xmlxmc == null ? '' : annualbudget.xmlxmc);
+      localStorage.setItem("xmfzr", annualbudget.xmfzr == null ? '' : annualbudget.xmfzr);
+      localStorage.setItem("xmfzrxm", annualbudget.dkyfzrxm == null ? '' : annualbudget.dkyfzrxm);
+      localStorage.setItem("ssbm", annualbudget.ssbm == null ? '' : annualbudget.ssbm);
+      localStorage.setItem("ssbmmc", annualbudget.ssbmmc == null ? '' : annualbudget.ssbmmc);
+      localStorage.setItem("annualbudget",annualbudget.dkyfzr == null ? '' :  annualbudget.dkyfzr);
+      localStorage.setItem("updateflag", "1");
+
+
+      parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
+    });
+
+    // 监听选择按钮
+    $("button[lay-filter='selectBtn']").click(function () {
+      if (annualbudget == null) {
+        Message.warning("请选择年度预算", 1000);
+        return;
+      }
+      localStorage.setItem("updateflag", "1");
+
+      parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
+    });
+
+    // 监听取消按钮
+    $("button[lay-filter='cancleBtn']").click(function () {
+      localStorage.setItem("xmid", '');
+      localStorage.setItem("updateflag", "0");
+      var iframeIndex = parent.layer.getFrameIndex(window.name);
+      parent.layer.close(iframeIndex);
+    });
+  });
+</script>
+</body>
+</html>

src/main/resources/templates/stabudgetapproval/list_apply.html

@@ -135,9 +135,9 @@
 
         <script type="text/html" id="toolbarDemo">
             <div class="layui-btn-container">
-                <!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add">-->
-                <!--                    <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新建-->
-                <!--                </button>-->
+                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add">
+                    <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新建
+                </button>
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="edit">
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>编辑
                 </button>
@@ -347,7 +347,7 @@
                     shade: 0.3,
                     maxmin: true,
                     area: ['1020px', layerheight + 'px'],
-                    content: AjaxUtil.ctx + 'staBudgetapproval/forApplyAdd',
+                    content: AjaxUtil.ctx + 'staBudgetapproval/forAdd',
                     end: function (index) {
                         // 重载表格
                         if (updateflag == 1)

src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -1263,7 +1263,7 @@
                 title: '查看项目任务书',
                 type: 2,
                 shade: 0.3,
-                // maxmin: true,
+                maxmin: true,
                 shadeClose: true,
                 area: ['1100px', layerheight + 'px'],
                 content: AjaxUtil.ctx + 'prjProject/forView/' + xmId,
@@ -1279,7 +1279,7 @@
                 title: '查看年度预算',
                 type: 2,
                 shade: 0.3,
-                // maxmin: true,
+                maxmin: true,
                 shadeClose: true,
                 area: ['1010px', layerheight + 'px'],
                 content: AjaxUtil.ctx + 'prjAnnualbudget/forNdysView1/' + xmId +'/'+ nf,