From 079fe43c2dff379fba95d43d8ec55b0a86fba180 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Wed, 2 Sep 2020 08:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=83=E6=A0=B8=E5=AE=A1?=
=?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jxzxkhgl/TsbzJxzxkhshController.java | 2 +
.../mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml | 6 +-
ruoyi-ui/src/views/jxjs/jdcx/index.vue | 119 +----------
.../src/views/jxzxkhgl/jxzxxxsh/index.vue | 195 +++++++++---------
4 files changed, 104 insertions(+), 218 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
index 6317e111c..6251af845 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
@@ -96,6 +96,8 @@ public class TsbzJxzxkhshController extends BaseController {
@Log(title = "考核审核过程", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) {
+ tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId());
+ tsbzJxzxkhsh.setStatus("2");
return toAjax(tsbzJxzxkhshService.updateTsbzJxzxkhsh(tsbzJxzxkhsh));
}
diff --git a/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml b/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
index edf967c4c..18784b401 100644
--- a/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
@@ -47,10 +47,8 @@
-select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name from tsbz_jxzxmd a
-left join tsbz_jxjsjbxx b on b.id=a.jsid
-left join sys_dept c on b.prdwid=c.schoolid
-left join tsbz_jxzxkhsh d on a.jsid=d.jsid
+select d.id,d.faid,d.jsid,d.status,d.xjshr,d.xjshyj,d.xjshjy,d.qjshr,d.qjshjy,d.qjshyj,d.createuseird,d.create_time,b.name from tsbz_jxzxkhsh d
+left join tsbz_jxjsjbxx b on b.id=d.jsid