Browse Source

审核管理增加重放

xusl 1 năm trước cách đây
mục cha
commit
e755ba8fb6

+ 13 - 10
backend/src/main/java/com/jiayue/ssi/controller/SysApproveController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jiayue.ssi.annotation.OperateLog;
+import com.jiayue.ssi.annotation.PreventReplay;
 import com.jiayue.ssi.backenum.ApproveOperaterEnum;
 import com.jiayue.ssi.backenum.ApproveStatusEnum;
 import com.jiayue.ssi.backenum.AuditType;
@@ -45,6 +46,7 @@ public class SysApproveController {
      */
     @GetMapping(value = "/getAll")
     @PreAuthorize("@ss.hasPermi('approveManager:approve:list')")
+    @PreventReplay
     public ResponseVO getAll(String currentPage, String pageSize, String approveStatus, String approveResult) throws CustomException {
         try {
             Integer cp;
@@ -83,16 +85,16 @@ public class SysApproveController {
             Page<SysApprove> result = sysApproveService.page(new Page<>(cp, ps), wrapper);
             List<SysApprove> records = result.getRecords();
             //遍历对象数组的方法
-            records.forEach(
-                    record -> {
-                        if (record.getModuleName().equals(ApproveConstants.MODULE_NAME_USER)){
-                            SysUser sysUser = JSONUtil.toBean(record.getParameterContent(),SysUser.class);
-                            if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.DELETE.getCode()))){
-                                record.setParameterContent("{账号:"+sysUser.getUsername()+"}");
-                            }
-                        }
-                    }
-            );
+//            records.forEach(
+//                    record -> {
+//                        if (record.getModuleName().equals(ApproveConstants.MODULE_NAME_USER)){
+//                            SysUser sysUser = JSONUtil.toBean(record.getParameterContent(),SysUser.class);
+//                            if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.DELETE.getCode()))){
+//                                record.setParameterContent("{账号:"+sysUser.getUsername()+"}");
+//                            }
+//                        }
+//                    }
+//            );
             return ResponseVO.success(result);
         } catch (Exception e) {
             throw new CustomException("获取所有审批异常", e);
@@ -105,6 +107,7 @@ public class SysApproveController {
     @PostMapping(value = "/submitApprove")
     @OperateLog(title = "审批管理", businessType = BusinessType.UPDATE, auditType = AuditType.SYS)
     @PreAuthorize("@ss.hasPermi('approveManager:approve:submitApprove')")
+    @PreventReplay
     public ResponseVO submitApprove(@RequestBody SysApprove sysApprove) throws CustomException {
         try {
             sysApprove.setApproveStatus(ApproveStatusEnum.YSP.getCode() + "");

+ 60 - 40
ui/src/views/examineManager/sysApprove/index.vue

@@ -6,18 +6,18 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
           <el-form-item label="审批状态" prop="approveStatus">
             <el-select
-            v-model="queryParams.approveStatus"
-            placeholder="请选择审批状态"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="item in approveStatusOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+              v-model="queryParams.approveStatus"
+              placeholder="请选择审批状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="item in approveStatusOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="审批结果" prop="approveResult">
             <el-select
@@ -99,7 +99,8 @@
 </template>
 
 <script>
-import { debounce } from 'lodash'
+import {debounce} from 'lodash'
+
 export default {
   name: "User",
   data() {
@@ -143,7 +144,7 @@ export default {
         approveStatus: undefined,
         approveResult: undefined
       },
-      edit:false
+      edit: false
     };
   },
   watch: {},
@@ -164,7 +165,7 @@ export default {
           belongTo = "新增"
         } else if (cellValue == "1") {
           belongTo = "修改"
-        }else if (cellValue == "2") {
+        } else if (cellValue == "2") {
           belongTo = "删除"
         }
       }
@@ -193,15 +194,25 @@ export default {
       return belongTo
     },
     /** 查询用户列表 */
-    getList(){
+    async getList() {
+      let sysTime
+      let lk
+      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
+        sysTime = res.data.sysTime
+        lk = res.data.lk
+      }).catch((error) => {
+      })
+
       this.loading = true;
       var searchParams = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         approveStatus: this.queryParams.approveStatus,
-        approveResult: this.queryParams.approveResult
+        approveResult: this.queryParams.approveResult,
+        sysTime: sysTime,
+        lk: lk
       }
-      this.$axios.get('/sysApproveController/getAll',
+      await this.$axios.get('/sysApproveController/getAll',
         {params: searchParams}).then((res) => {
         this.approveList = res.data.records
         this.total = res.data.total
@@ -218,18 +229,17 @@ export default {
       })
     },
     /** 搜索按钮操作 */
-    handleQuery:debounce(function(){
+    handleQuery: debounce(function () {
       this.getList()
-    },1000),
-    handleApprove(row,val){
-      let tips=''
-      if (val==0){
+    }, 1000),
+    handleApprove(row, val) {
+      let tips = ''
+      if (val == 0) {
         tips = '【通过】'
-      }
-      else{
+      } else {
         tips = '【未通过】'
       }
-      this.$confirm('确认审批结果'+tips+'?', '提示', {
+      this.$confirm('确认审批结果' + tips + '?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -240,21 +250,31 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitApprove:debounce(function(row){
-        this.$axios.post('/sysApproveController/submitApprove', row).then((res) => {
-          if (res.code == 0) {
-            this.$message.success('审批成功')
-            this.getList();
-          }
-          if (res.code == 1) {
-            this.$message.error(res.data)
-            this.getList();
-          }
-        }).catch((error) => {
-          // this.$message.error(error)
+    submitApprove: debounce(async function (row) {
+      let sysTime
+      let lk
+      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
+        sysTime = res.data.sysTime
+        lk = res.data.lk
+      }).catch((error) => {
+      })
+
+      row.sysTime = sysTime
+      row.lk = lk
+      await this.$axios.post('/sysApproveController/submitApprove', row).then((res) => {
+        if (res.code == 0) {
+          this.$message.success('审批成功')
           this.getList();
-        })
-    },1000)
+        }
+        if (res.code == 1) {
+          this.$message.error(res.data)
+          this.getList();
+        }
+      }).catch((error) => {
+        // this.$message.error(error)
+        this.getList();
+      })
+    }, 1000)
   }
 };
 </script>