From d3ba3f590a1903f1f2ec52b8ac685b3bf3879360 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 20 Dec 2022 17:28:23 +0800
Subject: [PATCH] 通行证sql，评价sql修改
---
src/main/java/org/springblade/flow/core/constant/ProcessConstant.java | 12 +++++++++++-
src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.java | 3 ++-
src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml | 16 ++++++++++++----
src/main/java/org/springblade/modules/evaluation/vo/EvaluationVO.java | 1 +
src/main/java/org/springblade/modules/pass/mapper/PassMapper.xml | 9 +++++++--
src/main/java/org/springblade/modules/pass/vo/PassVO.java | 4 ++++
src/main/java/org/springblade/modules/pass/mapper/PassMapper.java | 3 ++-
7 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/flow/core/constant/ProcessConstant.java b/src/main/java/org/springblade/flow/core/constant/ProcessConstant.java
index 692ae56..60aa831 100644
--- a/src/main/java/org/springblade/flow/core/constant/ProcessConstant.java
+++ b/src/main/java/org/springblade/flow/core/constant/ProcessConstant.java
@@ -29,11 +29,21 @@
String LEAVE_KEY = "Leave";
/**
- * 请假流程标识
+ * 通行证审核流程标识
*/
String AUDIT_KEY = "Audit";
/**
+ * 通行证延期审核流程标识
+ */
+ String DELAY_AUDIT = "delayAudit";
+
+ /**
+ * 变更车辆审核流程标识
+ */
+ String CAR_CHANGE_AUDIT = "carChangeAudit";
+
+ /**
* 报销流程标识
*/
String EXPENSE_KEY = "Expense";
diff --git a/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.java b/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.java
index 08c0461..fefefb0 100644
--- a/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.java
+++ b/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.evaluation.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.evaluation.entity.EvaluationEntity;
import org.springblade.modules.evaluation.vo.EvaluationVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,7 @@
* @param evaluation
* @return
*/
- List<EvaluationVO> selectEvaluationPage(IPage page, EvaluationVO evaluation);
+ List<EvaluationVO> selectEvaluationPage(IPage page, @Param("evaluation") EvaluationVO evaluation);
}
diff --git a/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml b/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml
index 6b80308..436e33f 100644
--- a/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml
@@ -5,9 +5,9 @@
<!-- 通用查询映射结果 -->
<resultMap id="evaluationResultMap" type="org.springblade.modules.evaluation.entity.EvaluationEntity">
<result column="id" property="id"/>
- <result column="application_id" property="applicationId"/>
+ <result column="no" property="no"/>
<result column="score" property="score"/>
- <result column="evaluation" property="evaluation"/>
+ <result column="comment" property="comment"/>
<result column="feedback" property="feedback"/>
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
@@ -20,8 +20,16 @@
</resultMap>
- <select id="selectEvaluationPage" resultMap="evaluationResultMap">
- select * from sys_evaluation where is_deleted = 0
+ <select id="selectEvaluationPage" resultType="org.springblade.modules.evaluation.vo.EvaluationVO">
+ select * from sys_evaluation eva
+ LEFT JOIN sys_application app ON app.no = eva.no AND app.is_deleted = 0
+ where eva.is_deleted = 0
+ <if test="evaluation.userId !=null and evaluation.userId !=''">
+ AND app.user_id = #{evaluation.userId}
+ </if>
+ <if test="evaluation.status !=null and evaluation.status !=''">
+ AND eva.status = #{evaluation.status}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/evaluation/vo/EvaluationVO.java b/src/main/java/org/springblade/modules/evaluation/vo/EvaluationVO.java
index 713592e..f1b291f 100644
--- a/src/main/java/org/springblade/modules/evaluation/vo/EvaluationVO.java
+++ b/src/main/java/org/springblade/modules/evaluation/vo/EvaluationVO.java
@@ -32,4 +32,5 @@
public class EvaluationVO extends EvaluationEntity {
private static final long serialVersionUID = 1L;
+ private String userId;
}
diff --git a/src/main/java/org/springblade/modules/pass/mapper/PassMapper.java b/src/main/java/org/springblade/modules/pass/mapper/PassMapper.java
index f51e223..97e4bfb 100644
--- a/src/main/java/org/springblade/modules/pass/mapper/PassMapper.java
+++ b/src/main/java/org/springblade/modules/pass/mapper/PassMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.pass.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.pass.entity.PassEntity;
import org.springblade.modules.pass.vo.PassVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,7 @@
* @param pass
* @return
*/
- List<PassVO> selectPassPage(IPage page, PassVO pass);
+ List<PassVO> selectPassPage(IPage page, @Param("pass") PassVO pass);
}
diff --git a/src/main/java/org/springblade/modules/pass/mapper/PassMapper.xml b/src/main/java/org/springblade/modules/pass/mapper/PassMapper.xml
index 0499564..b1f2c92 100644
--- a/src/main/java/org/springblade/modules/pass/mapper/PassMapper.xml
+++ b/src/main/java/org/springblade/modules/pass/mapper/PassMapper.xml
@@ -17,8 +17,13 @@
</resultMap>
- <select id="selectPassPage" resultMap="passResultMap">
- select * from sys_pass where is_deleted = 0
+ <select id="selectPassPage" resultType="org.springblade.modules.pass.vo.PassVO">
+ select * from sys_pass pass
+ LEFT JOIN sys_application app ON app.no = pass.no and app.is_deleted = 0
+ where pass.is_deleted = 0
+ <if test="pass.userId !=null and pass.userId !='' ">
+ AND app.user_id = #{pass.userId}
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/pass/vo/PassVO.java b/src/main/java/org/springblade/modules/pass/vo/PassVO.java
index 2df3e1b..87c9a18 100644
--- a/src/main/java/org/springblade/modules/pass/vo/PassVO.java
+++ b/src/main/java/org/springblade/modules/pass/vo/PassVO.java
@@ -32,4 +32,8 @@
public class PassVO extends PassEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 用户id
+ */
+ private String userId;
}
--
Gitblit v1.9.3