Просмотр исходного кода

费用申请-批量审批时不插入科研编号

lgl месяцев назад: 11
Родитель
Сommit
7a51c540ab

+ 2 - 1
src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -1,5 +1,6 @@
1 1
 package com.liang.controller;
2 2
 
3
+import cn.hutool.core.util.StrUtil;
3 4
 import com.fasterxml.jackson.databind.ObjectMapper;
4 5
 import com.github.pagehelper.PageHelper;
5 6
 import com.github.pagehelper.PageInfo;
@@ -994,7 +995,7 @@ public class StaBudgetapprovalController extends BaseController {
994 995
     @RequestMapping(value = "/updateSpzt", method = RequestMethod.POST)
995 996
     public BaseResult updateSpzt(@RequestBody String strData) {
996 997
         StaBudgetapproval fysq = JsonTool.parseObject(strData, StaBudgetapproval.class);
997
-        if (fysq.getSpzt().equals("审批结束")) {
998
+        if (fysq.getSpzt().equals("审批结束")&&(StrUtil.isNotBlank(fysq.getOperations())&&!"bathsp".equals(fysq.getOperations()))) {
998 999
             DateFormat dateFormat = new SimpleDateFormat("yyyy");
999 1000
             PrjProject project = prjProjectService.queryById(fysq.getXmid());
1000 1001
             if (project != null && project.getXmlxmc().indexOf("政府") > 0) {

+ 6 - 0
src/main/java/com/liang/entity/StaBudgetapproval.java

@@ -159,5 +159,11 @@ public class StaBudgetapproval implements Serializable {
159 159
      */
160 160
     private String xmndjfysq;
161 161
 
162
+
163
+    /**
164
+     * 批量审批新增字段
165
+     */
166
+    private String operations;
167
+
162 168
 }
163 169
 

+ 3 - 4
src/main/resources/templates/prjapproverecord/list.html

@@ -557,7 +557,8 @@
557 557
                             var project = {
558 558
                                 "id": xmApprovalBath.xmid,
559 559
                                 "spzt": '',
560
-                                "sqje": xmApprovalBath.sqje
560
+                                "sqje": xmApprovalBath.sqje,
561
+                                "operations":"bathsp"
561 562
                             }
562 563
                             if (bathUpdateRes.approveInfo.spcz == '返回修改') {
563 564
                                 project.spzt = '未提交(返回)';
@@ -581,9 +582,7 @@
581 582
                                 contentType: "application/json",
582 583
                                 data: JSON.stringify(project),
583 584
                                 success: function (res) {
584
-                                    setTimeout(() => {
585
-                                        console.log('睡眠0.09秒');
586
-                                    }, 0.09);
585
+
587 586
                                 },
588 587
                                 error: function (error) {
589 588
                                 }