任务书修改申请重新提交，修改审批列表 添加与子课题的校验

子课题完成时间带入异常处理

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

@@ -641,7 +641,9 @@ public class PrjProjectController extends BaseController {
             }
 
         }
-
+        //获取子科目中各公司的总经费
+        List<PrjCompletecompany>prjCompletecompanyListFy=prjCompletecompanyService.getCompanyListFy(id);
+        model.addAttribute("prjCompletecompanyListFy",prjCompletecompanyListFy);
         model.addAttribute("project", project);
 
         String fileUrl = "http://" + webfileip + ":" + webfileport + "/template/";

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

@@ -18,11 +18,9 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * (PrjSubtopic)表控制层
@@ -120,11 +118,13 @@ public class PrjSubtopicController extends BaseController {
     public String forAdd(Model model, @PathVariable Integer xm) {
         //查询项目的时间信息 暂时只需要给子课题默认完成时间
         List<Map<String, Object>> projectDate = prjSubtopicService.queryProjectDate(xm);
-        SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-dd");
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        dateFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
         Date rq = (Date) projectDate.get(0).get("WC");
         Date qs = (Date) projectDate.get(0).get("QS");
-        String wcrq = format.format(rq);
-        String qsrq = format.format(qs);
+
+        String wcrq = dateFormat.format(rq);
+        String qsrq = dateFormat.format(qs);
         model.addAttribute("qsrq", qsrq);
         model.addAttribute("wcrq", wcrq);
         model.addAttribute("xm", xm);

src/main/resources/templates/prjproject/list_myproject.html

@@ -96,7 +96,7 @@
                     <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出
                 </button>
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="Xgsq">
-                    <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>修改申请
+                    <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>预算修改申请
                 </button>
 
             </div>

src/main/resources/templates/prjproject/xg_update.html

@@ -31,12 +31,12 @@
                             <div class="layui-input-inline" style="width: 30%">
                                 <input type="hidden" id="id" name="id" th:value="${project.id}">
                                 <input type="text" id="zwmc" name="zwmc" lay-verify="required" lay-reqtext="中文名称不能为空"
-                                       placeholder="项目名称（中文）不能超过30字（含字符）" autocomplete="off" th:value="${project.zwmc}"
+                                       placeholder="项目名称（中文）不能超过30字（含字符）" readonly autocomplete="off" th:value="${project.zwmc}"
                                        class="layui-input">
                             </div>
-                            <label class="layui-form-label" style="width: 15%">学科分类1</label>
+                            <label class="layui-form-label"  style="width: 15%">学科分类1</label>
                             <div class="layui-input-inline" style="width: 30%">
-                                <select name="xkfl1" id="xkfl1" lay-filter="xkfl">
+                                <select name="xkfl1" id="xkfl1" lay-filter="xkfl" disabled>
                                     <option value="">[无]</option>
                                     <option value="-1">[浏览]</option>
                                     <option th:value="${project.xkfl1}" th:text="${project.xkflmc1}" selected></option>
@@ -47,11 +47,11 @@
                             <label class="layui-form-label" style="width: 10%">英文名称</label>
                             <div class="layui-input-inline" style="width: 30%">
                                 <input type="text" id="ywmc" name="ywmc" placeholder="项目名称（英文）不能超过30字（含字符）"
-                                       autocomplete="off" th:value="${project.ywmc}" class="layui-input">
+                                       readonly autocomplete="off" th:value="${project.ywmc}" class="layui-input">
                             </div>
                             <label class="layui-form-label" style="width: 15%">学科分类2</label>
                             <div class="layui-input-inline" style="width: 30%">
-                                <select name="xkfl2" id="xkfl2" lay-filter="xkfl">
+                                <select name="xkfl2" id="xkfl2" lay-filter="xkfl" disabled>
                                     <option value="">[无]</option>
                                     <option value="-1">[浏览]</option>
                                     <option th:value="${project.xkfl2}" th:text="${project.xkflmc2}" selected></option>
@@ -62,12 +62,12 @@
                             <label class="layui-form-label required" style="width: 10%">ERP编号</label>
                             <div class="layui-input-inline" style="width: 30%">
                                 <input type="text" id="erpbh" name="erpbh" th:value="${project.erpbh}"
-                                       autocomplete="off" class="layui-input" lay-verify="required"
+                                       autocomplete="off" class="layui-input" lay-verify="required" readonly
                                        lay-reqtext="ERP编号不能为空">
                             </div>
                             <label class="layui-form-label" style="width: 15%">学科分类3</label>
                             <div class="layui-input-inline" style="width: 30%">
-                                <select name="xkfl3" id="xkfl3" lay-filter="xkfl">
+                                <select name="xkfl3" id="xkfl3" lay-filter="xkfl" disabled>
                                     <option value="">[无]</option>
                                     <option value="-1">[浏览]</option>
                                     <option th:value="${project.xkfl3}" th:text="${project.xkflmc3}" selected></option>
@@ -84,7 +84,7 @@
                             </div>
                             <label class="layui-form-label" style="width: 15%">所属国民经济行业</label>
                             <div class="layui-input-inline" style="width: 30%">
-                                <select name="ssgmjjhy" id="ssgmjjhy" lay-filter="gmjjhy">
+                                <select name="ssgmjjhy" id="ssgmjjhy" lay-filter="gmjjhy" disabled>
                                     <option value="">[无]</option>
                                     <option value="-1">[浏览]</option>
                                     <option th:value="${project.ssgmjjhy}" th:text="${project.ssgmjjhymc}"
@@ -103,13 +103,13 @@
                             <label class="layui-form-label" style="width: 15%">是否国家秘密技术项目</label>
                             <div class="layui-input-inline">
                                 <input type="checkbox" name="sfgjmmjsxm" lay-skin="primary"
-                                       th:checked="${project.sfgjmmjsxm}">
+                                       th:checked="${project.sfgjmmjsxm}" disabled>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
                             <label class="layui-form-label" style="width: 10%">费用来源</label>
                             <div class="layui-input-inline" style="width: 30%">
-                                <input type="text" id="fyly" name="fyly" autocomplete="off" th:value="${project.fyly}"
+                                <input type="text" id="fyly" name="fyly" autocomplete="off" th:value="${project.fyly}" readonly
                                        class="layui-input">
                             </div>
                             <label class="layui-form-label required" style="width: 15%">项目起止时间</label>
@@ -117,13 +117,13 @@
                                 <div class="layui-input-inline" style="width: 138px">
                                     <input type="text" name="qs" id="qs" lay-verify="required|date" placeholder="开始日期"
                                            lay-reqtext="开始日期不能为空" autocomplete="off" th:value="${project.qs}"
-                                           class="layui-input">
+                                           class="layui-input" disabled>
                                 </div>
                                 <div class="layui-form-mid">-</div>
                                 <div class="layui-input-inline" style="width: 138px">
                                     <input type="text" name="wc" id="wc" lay-verify="required|date" placeholder="结束日期"
                                            lay-reqtext="结束日期不能为空" autocomplete="off" th:value="${project.wc}"
-                                           class="layui-input">
+                                           class="layui-input" disabled>
                                 </div>
                                 <br>
                                 <tip>日期格式：yyyy-MM-dd</tip>
@@ -208,7 +208,7 @@
                             <div class="layui-input-inline" style="width: 75%">
                                 <input type="hidden" id="dkyfzr" name="dkyfzr" th:value="${project.dkyfzr}"
                                        class="layui-input">
-                                <input type="text" id="dkyfzrxm" name="dkyfzrxm" placeholder="可多选"
+                                <input type="text" id="dkyfzrxm" name="dkyfzrxm" placeholder="可多选" disabled
                                        th:value="${project.dkyfzrxm}" autocomplete="off" class="layui-input"
                                        lay-verify="required" lay-reqtext="电科院负责人不能为空" readonly>
                             </div>
@@ -320,6 +320,12 @@
         var initFlag = 0;
         var zwmc = [[${project.zwmc}]]
         var xmid = [[${project.id}]]
+        //子课题单位分工费用统计
+        var prjCompletecompanyListFy = [[${prjCompletecompanyListFy}]];
+
+        //用于审批列表重新提交
+        var spList;
+        var spListId;
         //日期
         // 监听器
         laydate.render({
@@ -381,7 +387,18 @@
 
            }
        });
-
+        AjaxUtil.get({
+            url: AjaxUtil.ctx + 'prjApproverecord/spLists/' + xmid + '/prj_ProjectRecord',
+            success: function (res) {
+                var a   = res.length -1;
+                if (res[a] != null) {
+                    spList = res[a].wc
+                    spListId =res[a].id
+                } else {
+                    spList = -1;
+                }
+            }
+        });
         //下拉框回显
         function set_select(id, value) {
             let obj = $("#" + id)
@@ -1602,39 +1619,93 @@
             for (var i = 0; i < data.length; i++) {
                 getBudget(budgets, data[i]);
             }
-            var index = layer.load(0, {shade: 0.1});
-            // 将数据存储到中间表中
-            AjaxUtil.post({
-                url: AjaxUtil.ctx + 'prjBudgetRecord/addUpdateApplyRecord1/',
-                contentType: "application/json",
-                data: JSON.stringify(budgets),
-                success: function (res) {
-                    layer.close(index);
-                    if (res.code === 0) {
-                        var project = {
-                            "xm":zwmc,
-                            "xmid":xmid,
-                            "zt":"未提交"
+            for (let i = 0; i < prjCompletecompanyListFy.length; i++) {
+                if (prjCompletecompanyListFy[i].sumjf == null){
+                    prjCompletecompanyListFy[i].sumjf =0;
+                }
+                if ( budgets[0]['dw' + (i + 1)] == null ||  budgets[0]['dw' + (i + 1)] ==''){
+                    budgets[0]['dw' + (i + 1)] ==0;
+                }
+                if (budgets[0]['dw' + (i + 1)] != prjCompletecompanyListFy[i].sumjf ){
+                    alert("保存失败,"+prjCompletecompanyListFy[i].dwmc+'在子课题单位分工中所有经费总和为:'
+                        +prjCompletecompanyListFy[i].sumjf+'万元,请确保所填数据一致!!!')
+                    return false
+                }
+            }
+            // var index = layer.load(0, {shade: 0.1});
+            if (spList == false){
+                layer.confirm("该年度预算的修改申请还存在未结束的审批流程，是否重新提交?",function (index) {
+                    layer.close(index)
+                    AjaxUtil.get({
+                        url: AjaxUtil.ctx + 'prjApproverecord/updatSpList/' + spListId,
+                        success: function (res) {
+                            // 将数据存储到中间表中
+                            AjaxUtil.post({
+                                url: AjaxUtil.ctx + 'prjBudgetRecord/addUpdateApplyRecord1/',
+                                contentType: "application/json",
+                                data: JSON.stringify(budgets),
+                                success: function (res) {
+                                    // layer.close(index);
+                                    if (res.code === 0) {
+                                        var project = {
+                                            "xm": zwmc,
+                                            "xmid": xmid,
+                                            "zt": "未提交"
+                                        }
+                                        //添加审批记录
+                                        AjaxUtil.post({
+                                            url: AjaxUtil.ctx + "prjApproverecord/doUpdatPrjProject",
+                                            data: project,
+                                            success: function (res) {
+                                                Message.success('修改申请提交成功，可在审批列表中查看审批进度.', 2000);
+                                                setTimeout(function () {
+                                                    parent.layer.close(parent.layer.getFrameIndex(window.name)); // 关闭子窗口
+                                                }, 1000);
+                                            },
+                                            error: function (error) {
+                                            }
+                                        });
+                                    } else {
+                                        Message.error("修改记录添加失败", 2000);
+                                    }
+                                }
+                            });
                         }
-                        //添加审批记录
-                        AjaxUtil.post({
-                            url: AjaxUtil.ctx + "prjApproverecord/doUpdatPrjProject",
-                            data:project,
-                            success: function (res) {
-                                Message.success(res.message, 2000);
-                                layer.load(0, {shade: 0.1});
-                                setTimeout(function() {
-                                    parent.layer.close(parent.layer.getFrameIndex(window.name)); // 关闭子窗口
-                                }, 1000);
-                            },
-                            error: function (error) {
+                    })
+                })
+                }else {
+                AjaxUtil.post({
+                    url: AjaxUtil.ctx + 'prjBudgetRecord/addUpdateApplyRecord1/',
+                    contentType: "application/json",
+                    data: JSON.stringify(budgets),
+                    success: function (res) {
+                        // layer.close(index);
+                        if (res.code === 0) {
+                            var project = {
+                                "xm": zwmc,
+                                "xmid": xmid,
+                                "zt": "未提交"
                             }
-                        });
-                    } else {
-                        Message.error("修改记录添加失败", 2000);
+                            //添加审批记录
+                            AjaxUtil.post({
+                                url: AjaxUtil.ctx + "prjApproverecord/doUpdatPrjProject",
+                                data: project,
+                                success: function (res) {
+                                    Message.success('修改申请提交成功，可在审批列表中查看审批进度.', 2000);
+                                    setTimeout(function () {
+                                        parent.layer.close(parent.layer.getFrameIndex(window.name)); // 关闭子窗口
+                                    }, 3000);
+                                },
+                                error: function (error) {
+                                }
+                            });
+                        } else {
+                            Message.error("修改记录添加失败", 2000);
+                        }
                     }
-                }
-            });
+                });
+
+            }
             return false;
         });
         //出资方案

src/main/resources/templates/prjsubtopic/add.html

@@ -103,14 +103,14 @@
                             <label class="layui-form-label required" style="width: 15%;margin-left: -70px">起止时间</label>
                             <div class="layui-input-inline" style="width:20%">
                                 <input type="text" name="qssj" id="qssj" placeholder="开始日期" lay-verify="required"
-                                       lay-reqtext="开始日期不能为空" autocomplete="off" class="layui-input" disabled>
+                                       lay-reqtext="开始日期不能为空" autocomplete="off" class="layui-input" >
                                 <tip>日期格式：yyyy-MM-dd</tip>
 
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 20%">
                                 <input type="text" name="jssj" id="jssj" placeholder="结束日期" lay-verify="required"
-                                       lay-reqtext="结束日期不能为空" autocomplete="off" class="layui-input" disabled>
+                                       lay-reqtext="结束日期不能为空" autocomplete="off" class="layui-input" >
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
@@ -196,11 +196,13 @@
         var qsrq = [[${qsrq}]]
         var xmId = parseInt($("#xm").val());//项目任务书ID
         var wcrq = document.getElementById('wcrq').value;//项目任务书完成日期
+        console.log(wcrq)
         var zktId = -1;//子课题ID
 
         //申请时间
         laydate.render({
             elem: '#qssj',
+            value: qsrq,
             done: function (value, date, endDate) {
                 if (value<qsrq){
                     alert("开始时间不能早于任务书执行周期!!")