Merge remote-tracking branch 'origin/master'

qhse-common/src/main/java/com/rongwei/bscommon/system/dao/QhseVisitorManagementDao.java

@@ -23,20 +23,11 @@ public interface QhseVisitorManagementDao extends BaseMapper<QhseVisitorManageme
     List<Map<String, String>> getUserByCodes(@Param("fitstDeptId") String fitstDeptId,
                                              @Param("code0") String code0,
                                              @Param("code1") String code1,
-                                             @Param("code2") String code2);
-
-
-    @Select("SELECT\n" +
-            "  a.*,b.NAME \"APPROVALSTATUSNAME\"\n" +
-            "FROM\n" +
-            "  qhse_visitor_management a\n" +
-            "  LEFT JOIN sys_dict b ON a.APPROVALSTATUS = b.VALUE and b.DELETED ='0' and b.DICTTYPE ='fk_audit_status'\n" +
-            "WHERE\n" +
-            "  a.DELETED = '0'\n" +
-            "  AND a.MOBILEPHONENUMBER = #{phone}\n" +
-            "  AND TRUNC(a.CREATEDATE) = TRUNC(CURRENT_DATE)\n" +
-            "ORDER BY\n" +
-            "  a.MODIFYDATE DESC")
+                                             @Param("code2") String code2,
+                                             @Param("code3") String code3 );
+
+
+
     List<QhseVisitorManagementVo> getRecordByPhone(@Param("phone") String phone);
 
 

qhse-common/src/main/java/com/rongwei/bscommon/system/service/impl/QhseVisitorManagementServiceImpl.java

@@ -152,9 +152,10 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
      * 部门安全主管,部门经理，安监部抄送
      */
     private static final String[] CODES ={
-            "role103",
-            "role068",
-            "role084"
+            "role103", //部门安全主任
+            "role068", //部门经理
+            "role084", //安监部(应急办)
+            "role112"  //培训管理员
     };
 
 
@@ -172,8 +173,13 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
             // //1.获取一级部门ID
             String firstDeptId = getFitstDeptId(qhseVisitorManagementDo.getVisiteddepartmentid());
 
+            //技服访客 +需要查询培训管理员
+            String code ="-null";
+            if(qhseVisitorManagementDo.getVisitorcategory().equals("2")){
+                code=CODES[3];
+            }
             //2. 获取对应的部门安全主管，部门经理,安监部
-            List<Map<String, String>> userByCodes = qhseVisitorManagementDao.getUserByCodes(firstDeptId, CODES[0], CODES[1], CODES[2]);
+            List<Map<String, String>> userByCodes = qhseVisitorManagementDao.getUserByCodes(firstDeptId, CODES[0], CODES[1], CODES[2],code);
             userByCodes.forEach(map -> {
                 if ( map.get("code").equals(CODES[0])){
                     qhseVisitorManagementDo.setDepartmentsafesupervisorid( map.get("ids"));

qhse-common/src/main/resources/mybatis/QhseVisitorManagementDao.xml

@@ -19,7 +19,8 @@
                 LEFT JOIN sys_user f ON a.CREATEUSERID = f.id AND f.DELETED = '0'
                 LEFT JOIN sys_user g ON a.MODIFYUSERID = g.id AND g.DELETED = '0'
                 WHERE
-                a.DELETED = '0' and c.ID =#{fitstDeptId}
+                a.DELETED = '0'  and c.LEVEL in ('2','3')
+                AND (c.ID = #{fitstDeptId} OR c.FULLPID LIKE '%${fitstDeptId}%')
                 AND e.CODE =#{code0}
                 GROUP BY
                 e.code
@@ -53,15 +54,31 @@
                 LISTAGG(a.NAME, ',') WITHIN GROUP (ORDER BY a.NAME) AS names
             FROM
                 sys_user a
+               LEFT JOIN sys_user_role d ON a.ID = d.USERID AND d.DELETED = '0'
+               INNER JOIN (
+                    SELECT ID, #{code2} AS CODE
+                    FROM sys_role
+                    WHERE CODE IN (#{code2},#{code3}) AND DELETED = '0'
+                ) e ON d.ROLEID = e.id
 
-                    LEFT JOIN sys_user_role d ON a.ID = d.USERID AND d.DELETED = '0'
-                    LEFT JOIN sys_role e ON d.ROLEID = e.id AND e.DELETED = '0'
                     LEFT JOIN sys_user f ON a.CREATEUSERID = f.id AND f.DELETED = '0'
                     LEFT JOIN sys_user g ON a.MODIFYUSERID = g.id AND g.DELETED = '0'
-            WHERE
-               e.CODE =#{code2}
+
             GROUP BY
                 e.code
 
     </select>
+
+    <select id="getRecordByPhone" resultType="com.rongwei.bsentity.vo.QhseVisitorManagementVo">
+        SELECT
+            a.*,
+            b.NAME "APPROVALSTATUSNAME",
+            c.NAME "REASONSFORTHEVISITNAME"
+        FROM qhse_visitor_management a
+        LEFT JOIN sys_dict b ON a.APPROVALSTATUS = b.VALUE AND b.DELETED = '0' AND b.DICTTYPE = 'fk_audit_status'
+        LEFT JOIN sys_dict c ON a.REASONSFORTHEVISIT = c.VALUE AND c.DELETED = '0' AND c.DICTTYPE = 'visit-reason'
+        WHERE a.DELETED = '0' AND a.MOBILEPHONENUMBER = #{phone}
+          AND TRUNC(a.CREATEDATE) = TRUNC(CURRENT_DATE)
+        ORDER BY a.MODIFYDATE DESC
+    </select>
 </mapper>

qhse-entity/src/main/java/com/rongwei/bsentity/vo/QhseVisitorManagementVo.java

@@ -10,4 +10,9 @@ public class QhseVisitorManagementVo extends QhseVisitorManagementDo {
      * 审批状态名称
      */
     private String APPROVALSTATUSNAME;
+
+    /**
+     * 来访事由名称
+     */
+    private String REASONSFORTHEVISITNAME;
 }