guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

曹煤炭问题处理

0927cmt
zhaoyu 2024-04-15 09:22:18 +08:00
parent 26fca05aca
commit 515b953f8e
8 changed files with 182 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zcloud/controller/bus/HiddenExcelController.java
View File

@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import com.zcloud.entity.Page;
import com.zcloud.service.hiddenApi.HiddenApiService;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -158,7 +159,11 @@ public class HiddenExcelController extends BaseController {
vpd.put("var5", hidden.getString("HIDDENDESCR")); // 隐患描述
vpd.put("var6", hidden.getString("HIDDENPARTNAME")); //隐患部位
vpd.put("var7", hidden.getString("POSITIONDESC")); // 隐患位置描述
vpd.put("var8", hidden.getString("fxUserDeptName"));//隐患发现部门
if(StringUtils.equals("6aa255d41602497fa0f934a822820df4",hidden.getString("fxUserDeptNameId"))){
vpd.put("var8", hidden.getString("fxUserDeptName"));//隐患发现部门
}else {
vpd.put("var8", hidden.getString("fxUserDeptDName"));//隐患发现部门
}
vpd.put("var9", hidden.getString("fxUserName")); // 发现人
vpd.put("var10", hidden.getString("DISCOVERYTIME")); //发现时间
vpd.put("var11", this.zyRectificationtype(hidden.getString("RECTIFICATIONTYPE"))); //隐患处置
@ -178,7 +183,11 @@ public class HiddenExcelController extends BaseController {
}
}
vpd.put("var19", hidden.getString("RECTIFYDESCR"));//整改描述
vpd.put("var20", hidden.getString("zgUserDeptName"));
if(StringUtils.equals("6aa255d41602497fa0f934a822820df4",hidden.getString("zgUserDeptId"))){
vpd.put("var20", hidden.getString("zgUserDeptName"));
}else {
vpd.put("var20", hidden.getString("zgUserDeptDName"));
}
vpd.put("var21", hidden.getString("zgUserName")); // 整改人
vpd.put("var22", hidden.getString("RECTIFICATIONTIME"));//整改时间
vpd.put("var23", hidden.getString("INVESTMENT_FUNDS"));//投入资金

12
src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java
View File

@ -850,6 +850,18 @@ public class HiddenApiController extends BaseController {
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
// 增加隐患整改部门查询 开始
if(StringUtils.isNotBlank(pd.getString("RECTIFICATIONDEPT"))){
String url ="department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(pd.getString("RECTIFICATIONDEPT"), url);
List<String> departmentIds = new ArrayList<>();
departmentIds.add(pd.getString("RECTIFICATIONDEPT"));
for(Department department:departments){
departmentIds.add(department.getDEPARTMENT_ID());
}
pd.put("departmentIds",departmentIds);
}
// 增加隐患整改部门查询 结束
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
if (!Jurisdiction.getIS_MAIN().equals("1")) { //主账号
pd.put("queryUserId", Jurisdiction.getUSER_ID());

28
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.entity.system.Department;
import com.zcloud.entity.system.Dictionaries;
import com.zcloud.entity.system.User;
import com.zcloud.service.bus.*;
@ -2452,4 +2453,31 @@ public class UsersController extends BaseController {
return map;
}
/**
* 列表
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/listAllNew")
@ResponseBody
public Object listAllNew() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
if(StringUtils.isNotBlank(pd.getString("DEPARTMENT_ID"))){
String url ="department_list.html?DEPARTMENT_ID=";
List<Department> departments = departmentService.listAllDepartment(pd.getString("DEPARTMENT_ID"), url);
List<String> departmentIds = new ArrayList<>();
departmentIds.add(pd.getString("DEPARTMENT_ID"));
for(Department department:departments){
departmentIds.add(department.getDEPARTMENT_ID());
}
pd.put("departmentIds",departmentIds);
}
List<PageData> userList = usersService.listAllUserNew(pd); //列出Post列表
map.put("userList", userList);
map.put("result", errInfo);
return map;
}
}

6
src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
View File

@ -313,4 +313,10 @@ public interface UsersMapper {
List<PageData> findEightsByUserId(PageData pd);
void updateCardNoByPhone(String phone, String devidno);
/**用户列表(全部) 曹煤炭用
* @param pd
* @return
* @throws Exception
*/
List<PageData> listAllUserNew(PageData pd);
}

7
src/main/java/com/zcloud/service/system/UsersService.java
View File

@ -373,4 +373,11 @@ public interface UsersService {
List<PageData> findEightsByUserId(PageData pd);
void updateCardNoByPhone(String phone, String cardId);
/**用户列表(全部)
* @param pd
* @return
* @throws Exception
*/
public List<PageData> listAllUserNew(PageData pd)throws Exception;
}

6
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -513,6 +513,12 @@ public class UsersServiceImpl implements UsersService {
public void updateCardNoByPhone(String phone, String devidno) {
usersMapper.updateCardNoByPhone(phone, devidno);
}
@Override
public List<PageData> listAllUserNew(PageData pd) throws Exception {
return usersMapper.listAllUserNew(pd);
}
@Override
public Object getCurrentLocation(PageData pd) {
// Map<String,Object> map = new HashMap<String,Object>();

29
src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
View File

@ -354,7 +354,10 @@
f.RECTIFICATIONTIME,
f.RECTIFICATIONOR,
f.CREATOR,
(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1' and eax.type in ('1','2')) as exaCount
(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1' and eax.type in ('1','2')) as exaCount,
d.PARENT_ID,
d.NAME DEPARTMENT_NAME,
dd.NAME PARENT_NAME
FROM
bus_hidden f
left join SYS_DICTIONARIES lv on f.HIDDENLEVEL = lv.BIANMA
@ -364,6 +367,8 @@
left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
left join sys_user bhuUser on bhuUser.user_id = bhu.user_id
LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
left join oa_department d on d.DEPARTMENT_ID = f.RECTIFICATIONDEPT
left join oa_department dd on dd.DEPARTMENT_ID = d.PARENT_ID
WHERE f.ISDELETE = '0'
and f.STATE not in ('0','7','8','100','101','102')
AND f.HIDDENLEVEL != 'hiddenLevel2002'
@ -486,6 +491,13 @@
and f.STATE = '2'
and (select count(1) from BUS_HIDDENCHECK bh where bh.HIDDEN_ID=f.HIDDEN_ID and bh.USER_ID=#{pd.checkUser} )>0
</if>
<if test='pd.RECTIFICATIONDEPT != null and pd.RECTIFICATIONDEPT != ""'><!-- 验收隐患 -->
AND
f.RECTIFICATIONDEPT IN
<foreach item="item" index="index" collection="pd.departmentIds" open="(" separator="," close=")">
#{pd.departmentIds[${index}]}
</foreach>
</if>
GROUP BY f.HIDDEN_ID
order by FIELD ( f.STATE, '-2' ) desc,<!-- 因为这是隐患确认列表有确认按钮的排在前面 -->
f.DISCOVERYTIME desc <!-- 剩下的按隐患发现时间排序 -->
@ -498,26 +510,33 @@
<select id="getListAll" parameterType="pd" resultType="pd">
SELECT
bhuUser.name as fxUserName,
bhuUserDeptD.DEPARTMENT_ID as fxUserDeptNameId,
bhuUserDept.name as fxUserDeptName,
bhuUserDeptD.name as fxUserDeptNameDName,
type1.name as type1Name,
confirmUser.name as conUsername,
zgUserDeptD.DEPARTMENT_ID as zgUserDeptId,
zgUserDept.name as zgUserDeptName,
zgUserDeptD.name as zgUserDeptDName,
zgUser.name as zgUserName,
hreg.HIDDENREGION as HIDDENPARTNAME,
f.*
FROM
bus_hidden f
left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
left join vi_user_all bhuUser on bhuUser.user_id = bhu.user_id
left join oa_department bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID
left join oa_department bhuUserDeptD on bhuUserDeptD.DEPARTMENT_ID = bhuUserDept.PARENT_ID
left join vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR
LEFT JOIN vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
left join `qa-cmt-prevention`.vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR
LEFT JOIN `qa-cmt-prevention`.vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
left join `qa-cmt-prevention`.vi_user_all bhuUser on bhuUser.user_id = bhu.user_id
left join `qa-cmt-prevention`.vi_department_all bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID
LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
left join sys_dictionaries type1 on type1.bianma = f.HIDDENTYPE
left join oa_department zgUserDept on zgUserDept.DEPARTMENT_ID = f.RECTIFICATIONDEPT
left join oa_department zgUserDeptD on zgUserDeptD.DEPARTMENT_ID = zgUserDept.PARENT_ID
left join bus_hiddenregion hreg on hreg.HIDDENREGION_ID = f.HIDDENPART

88
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -1589,4 +1589,92 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where USERNAME = #{phone}
</update>
<!-- 用户列表(全部) 曹煤炭用-->
<select id="listAllUserNew" parameterType="pd" resultType="pd" >
select u.USER_ID,
u.USERNAME,
u.PASSWORD,
u.LAST_LOGIN,
u.NAME,
u.IP,
u.EMAIL,
u.NUMBER,
u.PHONE,
r.ROLE_ID,
u.DEPARTMENT_ID,
o.NAME as PID_NAME,
o.PARENT_ID,
d.NAME as DEPARTMENT_NAME,
r.ROLE_NAME
from <include refid="tableName"></include> u
left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID
left join OA_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID
left join OA_DEPARTMENT o ON o.DEPARTMENT_ID = d.PARENT_ID
where u.ROLE_ID = r.ROLE_ID
and u.USERNAME != 'admin' and u.ISDELETE = '0'
<!-- and r.PARENT_ID = '1' -->
<if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
and
(
u.USERNAME LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
u.EMAIL LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
u.NUMBER LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
u.NAME LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
or
u.PHONE LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
)
</if>
<if test="ROLE_ID != null and ROLE_ID != ''"><!-- 角色检索 -->
and u.ROLE_ID=#{ROLE_ID}
</if>
<if test="STRARTTIME!=null and STRARTTIME!=''"><!-- 登录时间检索 -->
and u.LAST_LOGIN &gt;= #{STRARTTIME}
</if>
<if test="ENDTIME!=null and ENDTIME!=''"><!-- 登录时间检索 -->
and u.LAST_LOGIN &lt;= #{ENDTIME}
</if>
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
AND
u.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''"><!-- 关键词检索 -->
AND
u.DEPARTMENT_ID IN
<foreach item="item" index="index" collection="departmentIds" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="POST_ID != null and POST_ID != ''"><!-- 关键词检索 -->
AND
u.POST_ID = #{POST_ID}
</if>
<if test="NOSELF != null and NOSELF != ''"><!-- 关键词检索 -->
AND
u.USER_ID != #{LOGINUSERID}
</if>
<if test="NOMAIN != null and NOMAIN != ''"><!-- 关键词检索 -->
AND
u.ISMAIN != '1'
</if>
<if test="ISMAIN != null and ISMAIN != ''"><!-- 关键词检索 -->
AND
u.ISMAIN =#{ISMAIN}
</if>
<if test="IS_HAZARDCONFIRMER != null and IS_HAZARDCONFIRMER != ''"><!-- 关键词检索 -->
AND
u.IS_HAZARDCONFIRMER =#{IS_HAZARDCONFIRMER}
</if>
<if test="IS_ONLINELEARNING != null and IS_ONLINELEARNING != ''"><!-- 隐患确认人 -->
AND u.IS_ONLINELEARNING =#{IS_ONLINELEARNING}
</if>
<if test="PERSON_TYPE != null and PERSON_TYPE != ''"><!-- 隐患确认人 -->
AND u.PERSON_TYPE =#{PERSON_TYPE}
</if>
order by u.DEPARTMENT_ID asc, u.SORT asc,u.LAST_LOGIN desc
</select>
</mapper>