FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

Optimized code

Browse Source
This commit is contained in:
Fat Snake
2023-06-11 18:20:57 +08:00
parent d2c9b557f3
commit 80190dc6bc
98 changed files with 478 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Pinnacle/src/main/resources/mapper/AffairMapper.xml
View File

@@ -2,27 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.AffairMapper">
<select id="getSameDepartmentUser" resultMap="userMap">
select t_user.id as user_id,
t_user.username as user_username,
t_user.department_id as user_department_id,
t_user.enable as user_enable,
t_user.deleted as user_deleted,
t_user.version as user_version,
ts.id as staff_id,
ts.first_name as staff_first_name,
ts.last_name as staff_last_name,
ts.deleted as staff_deleted,
ts.version as staff_version,
from t_user
left join (select * from t_staff where deleted = 0) as ts on ts.user_id = t_user.id
where t_user.id=#{id}
t_user.deleted = 0;
</select>
<select id="getFuzzyQueriesByAffairTitle" resultMap="affairMap">
select
*
*
from t_affair
<where>
<if test=" applicantId !=null">
@@ -30,7 +12,7 @@
</if>
<if test=" title!=null and title!='' ">
and instr(title,#{title})&gt;0
and instr(title,#{title})&gt;0
</if>
<if test=" typeId!=null ">
and instr(type_id,#{typeId})>0
@@ -45,8 +27,6 @@
</select>
<resultMap id="userMap" type="user">
<id property="id" column="user_id"/>
<result property="username" column="user_username"/>
@@ -67,7 +47,6 @@
<id property="id" column="id"/>
</resultMap>
<select id="getNotApprovedByFuzzyQueries" resultMap="affairMap2">
select
*
@@ -79,7 +58,7 @@
</if>
<if test=" title!=null and title!='' ">
and instr(title,#{title})&gt;0
and instr(title,#{title})&gt;0
</if>
<if test=" typeId!=null ">
and instr(type_id,#{typeId})>0
@@ -104,7 +83,7 @@
</if>
<if test=" title!=null and title!='' ">
and instr(title,#{title})&gt;0
and instr(title,#{title})&gt;0
</if>
<if test=" typeId!=null ">
and instr(type_id,#{typeId})>0
@@ -128,8 +107,4 @@
</resultMap>
</mapper>

10
Pinnacle/src/main/resources/mapper/AttendanceMapper.xml
View File

@@ -35,10 +35,7 @@
</resultMap>
<select id="getAttendanceAndUserByid" resultMap="AttendAndUserResult">
<select id="getAttendanceAndUserById" resultMap="AttendAndUserResult">
select att.id attId,
att.user_id,
att.att_time,
@@ -56,7 +53,8 @@
from t_attendance att,
t_user u
where att.user_id = u.id
and att.deleted = 0 and att.user_id=#{userid}
and att.deleted = 0
and att.user_id = #{userid}
order by att_time DESC
</select>
<resultMap id="AttendAndUserResult" type="attendance" autoMapping="true">
@@ -70,4 +68,4 @@
</association>
</resultMap>
</mapper>
</mapper>

4
Pinnacle/src/main/resources/mapper/NoticeReceiveMapper.xml
View File

@@ -1,7 +1,7 @@
<?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.cfive.pinnacle.mapper.NoticeReceiveMapper">
<!--查询所有或根据用户阅读状态进行查询-->
<!--查询所有或根据用户阅读状态进行查询-->
<select id="selectByUserId" resultMap="selectAllMap">
select u.id uid,
u.username,
@@ -57,7 +57,7 @@
<id property="id" column="uid"/>
</association>
</resultMap>
<!-- 所接收到公告的前五条公告 -->
<!-- 所接收到公告的前五条公告 -->
<select id="selectLimitByUserId" resultMap="selectAllMap">
select u.id uid,
u.username,

73
Pinnacle/src/main/resources/mapper/WorkMapper.xml
View File

@@ -26,20 +26,20 @@
select w.id,
content,
publisher_id,
u.username publisher_name,
u.username publisher_name,
create_time,
deadline,
tuw.user_id worker_id,
tu.username worker_name,
tuw.status status,
tuw.user_id worker_id,
tu.username worker_name,
tuw.status status,
tuw.complete_time complete_time,
first_name,
last_name
from t_work w
left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
where w.deleted = 0
and w.old = 0
order by w.id desc;
@@ -48,20 +48,20 @@
select w.id,
content,
publisher_id,
u.username publisher_name,
u.username publisher_name,
create_time,
deadline,
tuw.user_id worker_id,
tu.username worker_name,
tuw.status status,
tuw.user_id worker_id,
tu.username worker_name,
tuw.status status,
tuw.complete_time completeTime,
first_name,
last_name
from t_work w
left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
left join (select * from t_staff where deleted = 0) as ts on tuw.user_id = ts.user_id
where w.id = #{id}
and w.deleted = 0
and w.old = 0;
@@ -70,11 +70,11 @@
select w.id,
content,
publisher_id,
u.username publisher_name,
u.username publisher_name,
create_time,
deadline,
tuw.user_id worker_id,
tu.username worker_name,
tu.username worker_name,
tuw.status status,
tuw.complete_time completeTime,
first_name,
@@ -93,18 +93,17 @@
select w.id,
content,
publisher_id,
u.username publisher_name,
u.username publisher_name,
create_time,
deadline,
tuw.user_id worker_id,
tu.username worker_name,
tu.username worker_name,
tuw.status status
from t_work w
left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
where
tuw.user_id = #{userId}
where tuw.user_id = #{userId}
and status = false
and w.deleted = 0
and w.old = 0
@@ -112,22 +111,22 @@
</select>
<select id="getCard" parameterType="long" resultMap="workMap">
select w.id,
content,
publisher_id,
u.username publisher_name,
create_time,
deadline,
tuw.user_id worker_id,
tu.username worker_name,
tuw.status status
content,
publisher_id,
u.username publisher_name,
create_time,
deadline,
tuw.user_id worker_id,
tu.username worker_name,
tuw.status status
from t_work w
left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id
left join (select * from t_user_work where deleted = 0) as tuw on w.id = tuw.work_id
left join (select * from t_user where deleted = 0) as tu on tuw.user_id = tu.id
where tuw.user_id = #{userId}
and status = false
and w.deleted = 0
and w.old = 0
and status = false
and w.deleted = 0
and w.old = 0
order by w.deadline asc, w.id desc
limit 5;
@@ -136,12 +135,12 @@
select w.id,
content,
publisher_id,
u.username publisher_name,
u.username publisher_name,
create_time,
deadline,
tuw.user_id worker_id,
u.username worker_name,
tuw.status status,
tuw.user_id worker_id,
u.username worker_name,
tuw.status status,
tuw.complete_time complete_time
from t_work w
left join (select * from t_user where deleted = 0) as u on w.publisher_id = u.id

4
Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
View File

@@ -5,8 +5,8 @@
<select id="filterGroupByRoleId" resultType="long">
select distinct t_group.id as group_id
from (select * from t_group where deleted = 0) as t_group
left join (select * from t_role_group where deleted = 0) as trg on t_group.id = trg.group_id
left join (select * from t_role where deleted = 0) as tr on tr.id = trg.role_id
left join (select * from t_role_group where deleted = 0) as trg on t_group.id = trg.group_id
left join (select * from t_role where deleted = 0) as tr on tr.id = trg.role_id
<where>
<if test="roleId != null">
tr.id = #{roleId}