批量审批-bug

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

@@ -1,5 +1,8 @@
 package com.liang.controller;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.base.BaseController;
@@ -12,6 +15,7 @@ import com.liang.service.SysDictInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +23,8 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.DateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -162,9 +168,9 @@ public class PrjApproverecordController extends BaseController {
         record2.setTjr(approverecord.getTjr());
         record2.setTjsj(approverecord.getTjsj());
         if ("sta_FeasibilityReport".equals(approverecord.getTablename()) || "prj_Project".equals(approverecord.getTablename())) {
-            record2.setZt(PostInfoEnum.KYJHZZ.postName()+"审批");//状态
+            record2.setZt(PostInfoEnum.KYJHZZ.postName() + "审批");//状态
         } else {
-            record2.setZt(PostInfoEnum.KJXMGLZZ.postName()+"审批");//状态
+            record2.setZt(PostInfoEnum.KJXMGLZZ.postName() + "审批");//状态
         }
         record2.setWc(false);//完成
         record2.setShr(approverecord.getSjshr());//审核人
@@ -213,7 +219,7 @@ public class PrjApproverecordController extends BaseController {
         record2.setTablename(approverecord.getTablename());
         record2.setTjr(approverecord.getTjr());
         record2.setTjsj(approverecord.getTjsj());
-        record2.setZt(PostInfoEnum.BMZR.postName()+"审批");//状态
+        record2.setZt(PostInfoEnum.BMZR.postName() + "审批");//状态
         record2.setWc(false);//完成
         record2.setShr(approverecord.getSjshr());//审核人
         record2.setShgw(approverecord.getSjshgw());//审核岗位
@@ -261,7 +267,7 @@ public class PrjApproverecordController extends BaseController {
         record2.setTablename(approverecord.getTablename());
         record2.setTjr(approverecord.getTjr());
         record2.setTjsj(approverecord.getTjsj());
-        record2.setZt(PostInfoEnum.KJXMGLZZ1.postName()+"审批");//状态
+        record2.setZt(PostInfoEnum.KJXMGLZZ1.postName() + "审批");//状态
         record2.setWc(false);//完成
         record2.setShr(approverecord.getSjshr());//审核人
         record2.setShgw(approverecord.getSjshgw());//审核岗位
@@ -299,7 +305,7 @@ public class PrjApproverecordController extends BaseController {
             if (!approverecord.getSpcz().equals("提交审批"))
                 record1.setYj(approverecord.getYj());
             //是否需要上级审核
-            if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ.postName()+"审批")) {
+            if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ.postName() + "审批")) {
                 record1.setSfsjsh(false);
             } else {
                 record1.setSfsjsh(true);
@@ -322,7 +328,7 @@ public class PrjApproverecordController extends BaseController {
                 record2.setZt("未提交(返回)");
                 record2.setShr(approverecord.getTjr());//审核人
             } else {
-                record2.setZt(PostInfoEnum.KJXMGLZZ.postName()+"审批");
+                record2.setZt(PostInfoEnum.KJXMGLZZ.postName() + "审批");
                 record2.setShr(approverecord.getSjshr());//审核人
                 record2.setShgw(approverecord.getSjshgw());//审核岗位
             }
@@ -363,7 +369,7 @@ public class PrjApproverecordController extends BaseController {
             if (!approverecord.getSpcz().equals("提交审批"))
                 record1.setYj(approverecord.getYj());
             //是否需要上级审核
-            if (approverecord.getZt().equals(PostInfoEnum.YZ.postName()+"审批") || approverecord.getZt().equals(PostInfoEnum.ZGYLD.postName()+"审批") && dmoney < 1000000) {
+            if (approverecord.getZt().equals(PostInfoEnum.YZ.postName() + "审批") || approverecord.getZt().equals(PostInfoEnum.ZGYLD.postName() + "审批") && dmoney < 1000000) {
                 record1.setSfsjsh(false);
             } else {
                 record1.setSfsjsh(true);
@@ -375,7 +381,7 @@ public class PrjApproverecordController extends BaseController {
         record1.setWc(true);//完成
         recordList.add(record1);
 
-        if (!(approverecord.getZt().equals(PostInfoEnum.YZ.postName()+"审批") || approverecord.getZt().equals(PostInfoEnum.ZGYLD.postName()+"审批") && dmoney < 1000000)
+        if (!(approverecord.getZt().equals(PostInfoEnum.YZ.postName() + "审批") || approverecord.getZt().equals(PostInfoEnum.ZGYLD.postName() + "审批") && dmoney < 1000000)
                 || approverecord.getSpcz().equals("返回修改")) {
             PrjApproverecord record2 = new PrjApproverecord();
             record2.setXm(approverecord.getXm());
@@ -387,16 +393,16 @@ public class PrjApproverecordController extends BaseController {
                 record2.setZt("未提交(返回)");
                 record2.setShr(approverecord.getTjr());//审核人
             } else {
-                if (approverecord.getZt().equals(PostInfoEnum.BMZR.postName()+"审批"))
-                    record2.setZt(PostInfoEnum.KJXMGLZZ.postName()+"审批");
-                else if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ.postName()+"审批"))
-                    record2.setZt(PostInfoEnum.KJBBMZR.postName()+"审批");
-                else if (approverecord.getZt().equals(PostInfoEnum.KJBBMZR.postName()+"审批"))
-                    record2.setZt(PostInfoEnum.ZGYLD.postName()+"审批");
-                else if (approverecord.getZt().equals(PostInfoEnum.ZGYLD.postName()+"审批"))
-                    record2.setZt(PostInfoEnum.YZ.postName()+"审批");
+                if (approverecord.getZt().equals(PostInfoEnum.BMZR.postName() + "审批"))
+                    record2.setZt(PostInfoEnum.KJXMGLZZ.postName() + "审批");
+                else if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ.postName() + "审批"))
+                    record2.setZt(PostInfoEnum.KJBBMZR.postName() + "审批");
+                else if (approverecord.getZt().equals(PostInfoEnum.KJBBMZR.postName() + "审批"))
+                    record2.setZt(PostInfoEnum.ZGYLD.postName() + "审批");
+                else if (approverecord.getZt().equals(PostInfoEnum.ZGYLD.postName() + "审批"))
+                    record2.setZt(PostInfoEnum.YZ.postName() + "审批");
                 else
-                    record2.setZt(PostInfoEnum.BMZR.postName()+"审批");
+                    record2.setZt(PostInfoEnum.BMZR.postName() + "审批");
 
                 record2.setShr(approverecord.getSjshr());//审核人
                 record2.setShgw(approverecord.getSjshgw());//审核岗位
@@ -428,7 +434,7 @@ public class PrjApproverecordController extends BaseController {
         record1.setId(approverecord.getId());
         record1.setSpcz(approverecord.getSpcz());
         record1.setShr(approverecord.getShr());
-        record1.setShsj(approverecord.getShsj());
+        record1.setShsj(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
 
         if (approverecord.getSpcz().equals("返回修改")) {
             record1.setSffh(true);//是否返回
@@ -438,7 +444,7 @@ public class PrjApproverecordController extends BaseController {
             if (!approverecord.getSpcz().equals("提交审批"))
                 record1.setYj("同意。");
             //是否需要上级审核
-            if (approverecord.getZt().equals(PostInfoEnum.KJBBMZR.postName()+"审批")) {
+            if (approverecord.getZt().equals(PostInfoEnum.KJBBMZR.postName() + "审批")) {
                 record1.setSfsjsh(false);
             } else {
                 record1.setSfsjsh(true);
@@ -450,7 +456,7 @@ public class PrjApproverecordController extends BaseController {
         record1.setWc(true);//完成
         recordList.add(record1);
 
-        if (!(approverecord.getZt().equals(PostInfoEnum.KJBBMZR.postName()+"审批")) || approverecord.getSpcz().equals("返回修改")) {
+        if (!(approverecord.getZt().equals(PostInfoEnum.KJBBMZR.postName() + "审批")) || approverecord.getSpcz().equals("返回修改")) {
             PrjApproverecord record2 = new PrjApproverecord();
             record2.setXm(approverecord.getXm());
             record2.setXmid(approverecord.getXmid());
@@ -461,12 +467,12 @@ public class PrjApproverecordController extends BaseController {
                 record2.setZt("未提交(返回)");
                 record2.setShr(approverecord.getTjr());//审核人
             } else {
-                if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ1.postName()+"审批")) {
-                    record2.setZt(PostInfoEnum.KJXMGLZZ2.postName()+"审批");
-                } else if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ2.postName()+"审批")) {
-                    record2.setZt(PostInfoEnum.KJBBMZR.postName()+"审批");
+                if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ1.postName() + "审批")) {
+                    record2.setZt(PostInfoEnum.KJXMGLZZ2.postName() + "审批");
+                } else if (approverecord.getZt().equals(PostInfoEnum.KJXMGLZZ2.postName() + "审批")) {
+                    record2.setZt(PostInfoEnum.KJBBMZR.postName() + "审批");
                 } else {
-                    record2.setZt(PostInfoEnum.KJXMGLZZ1.postName()+"审批");
+                    record2.setZt(PostInfoEnum.KJXMGLZZ1.postName() + "审批");
                 }
 
                 record2.setShr(approverecord.getSjshr());//审核人

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -483,7 +483,7 @@
     </update>
     <update id="updateRWSYS_SX">
         update A
-        set A.ysje = B.ysje from prj_AnnualBudgetDetail A
+        set A.xmzys = B.ysje from prj_AnnualBudgetDetail A
             inner join (SELECT MC,YSJE from prj_Budget where XM = #{id}) B
         on A.FYMC = B.MC
         where

src/main/resources/templates/prjapproverecord/list.html

@@ -244,15 +244,17 @@
                     Message.warning("请选择要审批的记录！", 1500);
                 } else if (data.length > 1) {
                     for (var index in data) {
-                        var flag = bathSP(data[index])
-                        if (index === data.length() && flag) {
-                            layer.msg('操作成功');
-                            // 执行搜索重载
-                            currTable.reload({
-                                page: {
-                                    curr: 1
-                                },
-                                where: form.val("search-form")
+                        bathSP(data[index])
+                        if (index == (data.length - 1)) {
+                            var tc = layer.alert('操作成功', function (index) {
+                                // 执行搜索重载
+                                currTable.reload({
+                                    page: {
+                                        curr: 1
+                                    },
+                                    where: form.val("search-form")
+                                });
+                                layer.close(tc);
                             });
                         }
                     }
@@ -654,7 +656,7 @@
                             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 === '科技部部门主任审批') {