From 3bd3d5dfe3628c7b96f3c76fe31f302a3093c38b Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Mon, 23 Nov 2020 14:12:19 +0800
Subject: [PATCH] 'commit'

---
 .../controller/VerificationController.java    | 24 +++++++++----------
 .../Verification/model/VerificationModel.java |  8 +++----
 .../src/main/resources/Sql/Verification.sql   |  2 +-
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/controller/VerificationController.java b/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/controller/VerificationController.java
index 29a7152..0c33028 100644
--- a/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/controller/VerificationController.java
+++ b/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/controller/VerificationController.java
@@ -24,18 +24,16 @@ public class VerificationController extends Controller {
     VerificationModel model = new VerificationModel();
 
     /**
-     * 功能：获取当前人员可见的审核列表（全部(2)，待审核(0)，已通过(1)，已拒绝(-1)四种）
+     * 功能：获取当前人员可见的审核列表（-1：全部，1：待提交，2：已提交，待审批，3：已通过，4：退回修改）
      * 作者：黄海
-     * 时间：2018-12-22
+     * 时间：2020-11-23
      */
     @Before(GET.class)
     public void getVerificationList(int module_id, int verification_status, int page, int limit) {
-        //(1)当前人员的职务
-        String person_id = getCookie("person_id");
-        BaseModel bm = new BaseModel();
-        String[] ids = bm.getDutyList(person_id);
+        //(1)当前人员的身份
+        String identity_id = getCookie("identity_id");
         //(2)获取审核的列表数据
-        Page<Record> _page = model.getVerificationList(module_id, verification_status, ids, page, limit);
+        Page<Record> _page = model.getVerificationList(module_id, verification_status, identity_id, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(_page));
         return;
     }
@@ -87,12 +85,12 @@ public class VerificationController extends Controller {
      */
     @Before(POST.class)
     public void passCurrentVerification(int record_id, String verification_judgement, int module_id, int business_id) {
-        String person_id = getCookie("person_id");
-        Record personList = model.getPersonInfoById(person_id);
-        String person_name = personList.get("person_name");
-        sendAdoptTemplateNotice(module_id, business_id, person_name, 1);
-        model.passCurrentVerification(record_id, person_id, verification_judgement);
-        renderJson(CommonUtil.returnMessageJson(true, "操作成功！"));
+//        String person_id = getCookie("person_id");
+//        Record personList = model.getPersonInfoById(person_id);
+//        String person_name = personList.get("person_name");
+//        sendAdoptTemplateNotice(module_id, business_id, person_name, 1);
+//        model.passCurrentVerification(record_id, person_id, verification_judgement);
+//        renderJson(CommonUtil.returnMessageJson(true, "操作成功！"));
     }
 
     /**
diff --git a/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/model/VerificationModel.java b/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/model/VerificationModel.java
index db46e06..3c3fc85 100644
--- a/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/model/VerificationModel.java
+++ b/baseServiceJava/src/main/java/com/dsideal/baseService/Verification/model/VerificationModel.java
@@ -188,15 +188,15 @@ public class VerificationModel {
      *
      * @param module_id
      * @param verification_status
-     * @param ids
      * @param page
      * @param limit
      * @return
      */
-    public Page<Record> getVerificationList(int module_id, int verification_status, String[] ids, int page, int limit) {
+    public Page<Record> getVerificationList(int module_id, int verification_status,String identity_id, int page, int limit) {
         Kv kv = Kv.create();
-        kv = kv.set("module_id", module_id).set("ids", ids);
-        if (verification_status < 2) {
+        kv = kv.set("module_id", module_id).set("identity_id", identity_id);
+
+        if (verification_status >0) {
             kv = kv.set("verification_status", verification_status);
         }
         SqlPara sp = Db.getSqlPara("Verification.getVerifcationList", kv);
diff --git a/baseServiceJava/src/main/resources/Sql/Verification.sql b/baseServiceJava/src/main/resources/Sql/Verification.sql
index 0aac3ab..8b2048d 100644
--- a/baseServiceJava/src/main/resources/Sql/Verification.sql
+++ b/baseServiceJava/src/main/resources/Sql/Verification.sql
@@ -2,6 +2,6 @@
 #namespace("Verification")
     -- 获取审核列表
     #sql("getVerifcationList")
-
+        select * from t_verification_record where module_id=#para(module_id)
     #end
 #end
\ No newline at end of file