审批回退图标、记录添加

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

@@ -38,6 +38,8 @@ import java.io.*;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -383,9 +385,14 @@ public class PrjProjectController extends BaseController {
     }
 
     @ApiOperation(value = "修改任务书当前审批状态", notes = "修改任务书当前审批状态")
-    @RequestMapping(value = "/upDataSpzt", method = RequestMethod.POST)
+    @RequestMapping(value = "/upDataSpzt/{id}", method = RequestMethod.POST)
     @ResponseBody
-    public BaseResult upDataSpzt(@RequestBody String data) {
+    public BaseResult upDataSpzt(@RequestBody String data,@PathVariable Integer id){
+
+        System.out.println("当前操作人员ID："+id);
+        LocalDateTime currentTime = LocalDateTime.now();
+        DateTimeFormatter formatter =  DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
 
         if (data.isEmpty()) {
             return BaseResult.failure("回退失败");
@@ -405,9 +412,28 @@ public class PrjProjectController extends BaseController {
             PrjProject project = prjProjectService.queryById(id1);
 
             project.setSpzt("未提交");
+            Integer pr = prjProjectService.update(project);
 
+            // 获取当前账户人员信息
+            SysUserInfo sysUserInfo = sysUserInfoService.queryById(id);
+
+            // 创建一个审批bean，用于存储数据
+            PrjApproverecord prjApproverecord = new PrjApproverecord();
+            // 审批状态、提交时间、完成、审核人、审核时间、审批操作、意见
+
+            prjApproverecord.setSpcz("审批回退");
+            prjApproverecord.setTjsj(currentTime.format(formatter));
+            prjApproverecord.setShr(id);
+            prjApproverecord.setZt("管理员回退任务书至-未提交");
+            prjApproverecord.setShsj(currentTime.format(formatter));
+            prjApproverecord.setXmid(id1);
+            prjApproverecord.setWc(true);
+
+
+
+
+            prjApproverecordService.insert(prjApproverecord);
 
-            Integer pr = prjProjectService.update(project);
 
             if (pr < 1) {
 

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

@@ -95,7 +95,7 @@
 <!--                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表-->
 <!--                </button>-->
                 <button class="layui-btn layui-btn-sm" lay-event="backSpacing" style="background: #FF8040" id="myButton">
-                    <i class="" style="font-size: 10px;"></i>审批回退
+                    <i class="layui-icon layui-icon-return" style="font-size: 10px;"></i>审批回退
                 </button>
             </div>
         </script>
@@ -130,6 +130,7 @@
         var form = layui.form,
             table = layui.table;
         var userId = $("#userId").val();
+
         var currTable = table.render({
             elem: '#currentTableId',
             url: AjaxUtil.ctx + 'prjProject/list',
@@ -168,12 +169,11 @@
                 // 测试打印出后端返回的权限列表
                 // let permissionSet = [[${permissionSet}]];
                 // console.log(JSON.stringify(permissionSet));
+                if ( userId != 40 && userId != 42 && userId != 1) {
+                    document.getElementById("myButton").style.display = 'none';
+                }
             }
         });
-/*        console.log("这是我要获取的当前账户userid" + userId)
-        if (userId != 119 ){
-            document.getElementById("myButton").style.display = 'none';
-        }*/
 
 
         // 监听搜索操作
@@ -223,9 +223,7 @@
             });
         });
 
-        if(userId != 40){
-            document.getElementById("myButton").style.display = 'none';
-        }
+
 
         // 监听行工具事件
         table.on('toolbar(currentTableFilter)', function (obj) {
@@ -506,7 +504,7 @@
                     layer.confirm('确定要将任务书回退至未提交状态吗？', function (index) {
                         layer.close(index);
                         AjaxUtil.post({
-                            url: AjaxUtil.ctx + "prjProject/upDataSpzt",
+                            url: AjaxUtil.ctx + "prjProject/upDataSpzt/"+userId,
                             contentType: "application/json",
                             data: JSON.stringify(data),
                             success: function (res) {