修复bug

jiangping

2023-08-21 2837bdd57f72e386bbf9a725e7b3a13e5eb9e930

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
<?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="doumeemes.dao.ext.DeviceCheckExtMapper">
 
  <!-- 管理页面查询 -->
  <resultMap id="DeviceCheckExtListVO" type="doumeemes.dao.ext.vo.DeviceCheckExtListVO" autoMapping="true">
    <id column="ID" jdbcType="INTEGER" property="id"/>
  </resultMap>
  <select id="selectList" parameterType="doumeemes.dao.ext.dto.QueryDeviceCheckExtDTO" resultMap="DeviceCheckExtListVO">
    SELECT
      `deviceCheck`.`ID`,
      `deviceCheck`.`CODE`,
      `deviceCheck`.`DELETED`,
      `deviceCheck`.`CREATE_USER`,
      `deviceCheck`.`CREATE_TIME`,
      `deviceCheck`.`UPDATE_USER`,
      `deviceCheck`.`UPDATE_TIME`,
      `deviceCheck`.`REMARK`,
      `deviceCheck`.`ROOT_DEPART_ID`,
      `deviceCheck`.`COM_DEPART_ID`,
      `deviceCheck`.`DEVICE_ID`,
      `deviceCheck`.`CHECKDATE`,
      `deviceCheck`.`STATUS`,
      `deviceCheck`.`CONTENT`,
      `deviceCheck`.`DEAL_DATE`,
      `deviceCheck`.`DEAL_USER_ID`,
      `deviceCheck`.`DEAL_INFO` ,
       d.NAME as deviceName,
       d.CODE as deviceCode,
       p.NAME as proceduresName,
       s.REALNAME as userName
    FROM `device_check` `deviceCheck`
        left join device d on `deviceCheck`.DEVICE_ID = d.id
        left join procedures p on p.id =  d.PROCEDURE_ID
        left join `system_user` s on s.id = `deviceCheck`.CREATE_USER
    <where>
      <if test="deviceName != null and deviceName != ''">
        AND d.NAME like concat('%',#{deviceName},'%')
      </if>
 
      <if test="deviceCode != null and deviceCode != ''">
        AND d.CODE like concat('%',#{deviceCode},'%')
      </if>
 
      <if test="status != null ">
        AND `deviceCheck`.`STATUS` = #{status}
      </if>
 
      <if test="proceduresId != null ">
        AND d.PROCEDURE_ID = #{proceduresId}
      </if>
 
      <if test="checkDateStart != null">
        AND `deviceCheck`.`CHECKDATE` >= #{checkDateStart}
      </if>
      <if test="checkDateEnd != null">
        AND   #{checkDateEnd} >= `deviceCheck`.`CHECKDATE`
      </if>
 
      <if test="rootDepartId != null">
        AND `deviceCheck`.`ROOT_DEPART_ID` = #{rootDepartId}
      </if>
 
      <if test="comDepartId != null">
        AND `deviceCheck`.`COM_DEPART_ID` = #{comDepartId}
      </if>
 
      <if test="departIds != null and departIds.size()>0">
        AND exists (select d.id from company_user d where   d.user_id= `deviceCheck`.`CREATE_USER` and d.department_id
        in <foreach collection="departIds" item="item" separator="," open="(" close=")">#{item}</foreach>)
      </if>
    </where>
        order by `deviceCheck`.`CHECKDATE` desc
  </select>
 
 
  <select id="selectOneById"  resultType="doumeemes.dao.business.model.DeviceCheck">
    SELECT
    `deviceCheck`.`ID`,
    `deviceCheck`.`CODE`,
    `deviceCheck`.`DELETED`,
    `deviceCheck`.`CREATE_USER`,
    `deviceCheck`.`CREATE_TIME`,
    `deviceCheck`.`UPDATE_USER`,
    `deviceCheck`.`UPDATE_TIME`,
    `deviceCheck`.`REMARK`,
    `deviceCheck`.`ROOT_DEPART_ID`,
    `deviceCheck`.`COM_DEPART_ID`,
    `deviceCheck`.`DEVICE_ID`,
    `deviceCheck`.`CHECKDATE`,
    `deviceCheck`.`STATUS`,
    `deviceCheck`.`CONTENT`,
    `deviceCheck`.`DEAL_DATE`,
    `deviceCheck`.`DEAL_USER_ID`,
    `deviceCheck`.`DEAL_INFO` ,
    d.NAME as deviceName,
    d.CODE as deviceCode,
    p.NAME as proceduresName,
    s.REALNAME as userName
    FROM `device_check` `deviceCheck`
    left join device d on `deviceCheck`.DEVICE_ID = d.id
    left join procedures p on p.id =  d.PROCEDURE_ID
    left join `system_user` s on s.id = `deviceCheck`.CREATE_USER
    <where>
      <if test="id != null ">
        AND `deviceCheck`.id = #{id}
      </if>
    </where>
  </select>
 
 
</mapper>