From f31ae33e37895b9517ee6ace6bd703f4bbb47e81 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 23 六月 2024 23:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml b/performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml
index 3f05f98..50c8939 100644
--- a/performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml
+++ b/performance-server/src/main/resources/mapper/EvaluateGroupMapper.xml
@@ -1,23 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.EvaluateGroupMapper">
-
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.EvaluateGroup">
- <id column="id" property="id" />
- <result column="evaluate_id" property="evaluateId" />
- <result column="seasonable" property="seasonable" />
- <result column="exact" property="exact" />
- <result column="skill" property="skill" />
- <result column="preserve" property="preserve" />
- <result column="discipline" property="discipline" />
- <result column="solidarity" property="solidarity" />
- <result column="tidy" property="tidy" />
- <result column="total" property="total" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="create_user" property="createUser" />
- <result column="update_user" property="updateUser" />
+ <id column="id" property="id"/>
+ <result column="name" property="name"/>
+ <result column="depart_lims" property="departLims"/>
+ <result column="evaluate_id" property="evaluateId"/>
+ <result column="seasonable" property="seasonable"/>
+ <result column="exact" property="exact"/>
+ <result column="skill" property="skill"/>
+ <result column="preserve" property="preserve"/>
+ <result column="discipline" property="discipline"/>
+ <result column="solidarity" property="solidarity"/>
+ <result column="tidy" property="tidy"/>
+ <result column="total" property="total"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="create_user" property="createUser"/>
+ <result column="update_user" property="updateUser"/>
</resultMap>
-
+ <select id="getEvaluateGroup" resultType="com.yuanchu.mom.pojo.EvaluateGroup">
+ select eg.*,u.name,dl.name depart_lims
+ from evaluate_group eg
+ left join evaluate e on eg.evaluate_id = e.id
+ left join user u on e.user_id = u.id
+ left join department_lims dl on FIND_IN_SET(dl.id, depart_lims_id)
+ where 1=1
+ <if test="month!=null and month!=''">
+ and e.month=#{month}
+ </if>
+ <if test="departLims!=null and departLims!=''">
+ and dl.name like concat ('%',#{departLims},'%')
+ </if>
+ <if test="name!=null and name!=''">
+ and u.name like concat ('%',#{name},'%')
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3