Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
f95f24c0 由 康伟
选项

kangwei:修改bug单厂用户共享风险库所属机构不显示；

1 个父辈 86865732
内嵌 并排
正在显示 7 个修改的文件 包含 186 行增加 和 19 行删除
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerLevelManageController.java
...@@ -14,17 +14,14 @@ import com.skua.core.api.vo.Result; ...@@ -14,17 +14,14 @@ import com.skua.core.api.vo.Result;
14 import com.skua.core.aspect.annotation.AutoLog; 14 import com.skua.core.aspect.annotation.AutoLog;
15 import com.skua.core.query.QueryGenerator; 15 import com.skua.core.query.QueryGenerator;
16 import com.skua.core.util.ConvertUtils; 16 import com.skua.core.util.ConvertUtils;
17 import com.skua.core.util.zxing.QRCodeUtil;
18 import com.skua.modules.safe.entity.DangerLevelManage; 17 import com.skua.modules.safe.entity.DangerLevelManage;
19 import com.skua.modules.safe.entity.DangerLevelManageShare; 18 import com.skua.modules.safe.entity.DangerLevelManageShare;
20 import com.skua.modules.safe.service.IDangerLevelManageService; 19 import com.skua.modules.safe.service.IDangerLevelManageService;
21 import java.util.Date;
22 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 20 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
23 import com.baomidou.mybatisplus.core.metadata.IPage; 21 import com.baomidou.mybatisplus.core.metadata.IPage;
24 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
25 import com.skua.modules.safe.service.IDangerLevelManageShareService; 23 import com.skua.modules.safe.service.IDangerLevelManageShareService;
26 import com.skua.modules.system.entity.SysDepart; 24 import com.skua.modules.system.entity.SysDepart;
27 import com.skua.modules.system.mapper.SysConfigMapper;
28 import com.skua.modules.system.service.ISysConfigService; 25 import com.skua.modules.system.service.ISysConfigService;
29 import com.skua.modules.system.service.ISysDepartService; 26 import com.skua.modules.system.service.ISysDepartService;
30 import lombok.extern.slf4j.Slf4j; 27 import lombok.extern.slf4j.Slf4j;
...@@ -100,22 +97,10 @@ public class DangerLevelManageController { ...@@ -100,22 +97,10 @@ public class DangerLevelManageController {
100 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 97 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
101 HttpServletRequest req) { 98 HttpServletRequest req) {
102 Result<IPage<DangerLevelManageShare>> result = new Result<IPage<DangerLevelManageShare>>(); 99 Result<IPage<DangerLevelManageShare>> result = new Result<IPage<DangerLevelManageShare>>();
103 QueryWrapper<DangerLevelManageShare> queryWrapper = QueryGenerator.initQueryWrapper(dangerLevelManage, req.getParameterMap());
104 Page<DangerLevelManageShare> page = new Page<>(pageNo, pageSize); 100 Page<DangerLevelManageShare> page = new Page<>(pageNo, pageSize);
105 IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.page(page, queryWrapper); 101 IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.queryPageList(page, dangerLevelManage);
106 102 // QueryWrapper<DangerLevelManageShare> queryWrapper = QueryGenerator.initQueryWrapper(dangerLevelManage, req.getParameterMap());
107 /* List<SysDepart> sysDepartList = departService.queryList(); 103 //IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.page(page, queryWrapper);
108 if(pageList.getRecords() != null && !pageList.getRecords().isEmpty()){
109 for( DangerLevelManageShare shareVO: pageList.getRecords()){
110 if(shareVO.getDepartId() != null ){
111 for( sysDepartList){
112
113 }
114 }
115 }
116
117 }*/
118
119 result.setSuccess(true); 104 result.setSuccess(true);
120 result.setResult(pageList); 105 result.setResult(pageList);
121 return result; 106 return result;
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerLevelManageShare.java
...@@ -24,7 +24,115 @@ import java.util.Date; ...@@ -24,7 +24,115 @@ import java.util.Date;
24 @EqualsAndHashCode(callSuper = false) 24 @EqualsAndHashCode(callSuper = false)
25 @Accessors(chain = true) 25 @Accessors(chain = true)
26 @ApiModel(value="danger_level_manage共享风险库对象", description="共享风险分级管控清单") 26 @ApiModel(value="danger_level_manage共享风险库对象", description="共享风险分级管控清单")
27 public class DangerLevelManageShare extends DangerLevelManage{ 27 public class DangerLevelManageShare {
28
29 /**id*/
30 @TableId(type = IdType.UUID)
31 @ApiModelProperty(value = "id")
32 private String id;
33 /**厂区*/
34 @Excel(name = "厂区", width = 15,dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
35 @ApiModelProperty(value = "厂区")
36 @Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
37 private String departId;
38 /**风险点类型*/
39 @Excel(name = "风险点类型", width = 15 ,dicCode = "dangerType")
40 @ApiModelProperty(value = "风险点类型")
41 @Dict(dicCode = "dangerType")
42 private String dangerType;
43 /**风险点名称*/
44 @Excel(name = "风险点名称", width = 15)
45 @ApiModelProperty(value = "风险点名称")
46 private String dangerName;
47 /**危险源内容*/
48 @Excel(name = "危险源内容", width = 15)
49 @ApiModelProperty(value = "危险源内容")
50 private String dangerContent;
51 /**安全态（标准情况）*/
52 @Excel(name = "安全态（标准情况）", width = 15)
53 @ApiModelProperty(value = "安全态（标准情况）")
54 private String dangerStandard;
55 /**风险等级*/
56 @Excel(name = "风险等级", width = 15 ,dicCode = "dangerLevel")
57 @ApiModelProperty(value = "风险等级")
58 @Dict(dicCode = "dangerLevel")
59 private String dangerLevel;
60 /**主要后果*/
61 @Excel(name = "主要后果", width = 15)
62 @ApiModelProperty(value = "主要后果")
63 private String dangerResult;
64 /**管控措施*/
65 @Excel(name = "管控措施", width = 15)
66 @ApiModelProperty(value = "管控措施")
67 private String dangerWay;
68 /**管控层级*/
69 @Excel(name = "管控层级", width = 15,dicCode = "dangerRank")
70 @ApiModelProperty(value = "管控层级")
71 @Dict(dicCode = "dangerRank")
72 private String dangerRank;
73 /**责任部门*/
74 @Excel(name = "责任部门", width = 15)
75 @ApiModelProperty(value = "责任部门")
76 private String dangerDept;
77 /**责任人*/
78 @Excel(name = "责任人", width = 15)
79 @ApiModelProperty(value = "责任人")
80 private String dangerUser;
81 /**安全四色图*/
82 //@Excel(name = "安全四色图", width = 15)
83 @ApiModelProperty(value = "安全四色图")
84 private String dangerFour;
85
86 @Excel(name = "风险点位置", width = 15,dicCode = "id",dicText = "struct_name",dictTable = "sys_struct_dict")
87 @ApiModelProperty(value = "风险点位置")
88 @Dict(dicCode = "id",dicText = "struct_name",dictTable = "sys_struct_dict")
89 private String dangerPlace;
90
91 @Excel(name = "关联设备", width = 15,dicCode = "id",dicText = "equipment_name",dictTable = "equipment_info")
92 @ApiModelProperty(value = "关联设备")
93 @Dict(dicCode = "id",dicText = "equipment_name",dictTable = "equipment_info")
94 private String equipInfoId;
95
96 @Excel(name = "是否共享", width = 15)
97 @ApiModelProperty(value = "是否共享")
98 private String share;
99
100 //@Excel(name = "二维码", width = 15)
101 @ApiModelProperty(value = "二维码")
102 private String qrCode;
103
104 /**创建人Id*/
105 @ApiModelProperty(value = "创建人Id")
106 private String createBy;
107 /**创建时间*/
108 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
109 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
110 @ApiModelProperty(value = "创建时间")
111 private Date createTime;
112 /**修改人Id*/
113 @ApiModelProperty(value = "修改人Id")
114 private String updateBy;
115 /**修改时间*/
116 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
117 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
118 @ApiModelProperty(value = "修改时间")
119 private Date updateTime;
120 /**所属部门*/
121 @ApiModelProperty(value = "所属部门")
122 private String createDept;
123 /**所属公司*/
124 @ApiModelProperty(value = "所属公司")
125 private String createCmpy;
126 /**删除标识，1有效，0删除*/
127 @ApiModelProperty(value = "删除标识，1有效，0删除")
128 private Integer delFlag;
129
130 @TableField(exist=false)
131 @ApiModelProperty(value = "厂区名称")
132 private String departName;
133
134
135
28 136
29 137
30 } 138 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/DangerLevelManageShareMapper.java
...@@ -5,10 +5,14 @@ import com.skua.modules.safe.entity.DangerLevelManage; ...@@ -5,10 +5,14 @@ import com.skua.modules.safe.entity.DangerLevelManage;
5 import com.skua.modules.safe.entity.DangerLevelManageShare; 5 import com.skua.modules.safe.entity.DangerLevelManageShare;
6 import org.apache.ibatis.annotations.Param; 6 import org.apache.ibatis.annotations.Param;
7 7
8 import java.util.List;
9
8 /** 10 /**
9 * 风险分级管控清单 11 * 风险分级管控清单
10 */ 12 */
11 public interface DangerLevelManageShareMapper extends BaseMapper<DangerLevelManageShare> { 13 public interface DangerLevelManageShareMapper extends BaseMapper<DangerLevelManageShare> {
12 14
13 15
16 List<DangerLevelManageShare> selectDangerLevelManageShareList(DangerLevelManageShare dangerLevelManageShare);
17
14 } 18 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/DangerLevelManageShareMapper.xml
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.safe.mapper.DangerLevelManageShareMapper"> 3 <mapper namespace="com.skua.modules.safe.mapper.DangerLevelManageShareMapper">
4
5 <resultMap type="com.skua.modules.safe.entity.DangerLevelManageShare" id="DangerLevelManageShareResult">
6 <result property="id" column="id" />
7 <result property="departId" column="depart_id" />
8 <result property="dangerType" column="danger_type" />
9 <result property="dangerName" column="danger_name" />
10 <result property="dangerContent" column="danger_content" />
11 <result property="dangerStandard" column="danger_standard" />
12 <result property="dangerLevel" column="danger_level" />
13 <result property="dangerResult" column="danger_result" />
14 <result property="dangerWay" column="danger_way" />
15 <result property="dangerRank" column="danger_rank" />
16 <result property="dangerDept" column="danger_dept" />
17 <result property="dangerUser" column="danger_user" />
18 <result property="dangerFour" column="danger_four" />
19 <result property="dangerPlace" column="danger_place" />
20 <result property="equipInfoId" column="equip_info_id" />
21 <result property="share" column="share" />
22 <result property="qrCode" column="qr_code" />
23 <result property="createBy" column="create_by" />
24 <result property="createTime" column="create_time" />
25 <result property="updateBy" column="update_by" />
26 <result property="updateTime" column="update_time" />
27 <result property="createDept" column="create_dept" />
28 <result property="createCmpy" column="create_cmpy" />
29 <result property="delFlag" column="del_flag" />
30
31 <result property="departName" column="depart_name" />
32 </resultMap>
33
34 <select id="selectDangerLevelManageShareList" parameterType="com.skua.modules.safe.entity.DangerLevelManageShare" resultMap="DangerLevelManageShareResult">
35 select d.depart_name , dms.* from danger_level_manage_share dms
36 left join sys_depart d on dms.depart_id = d.id
37 <where>
38 <if test="departId != null and departId != ''"> and dms.depart_id = #{departId}</if>
39 <if test="dangerType != null and dangerType != ''"> and dms.danger_type = #{dangerType}</if>
40 <if test="dangerName != null and dangerName != ''"> and dms.danger_name like concat('%', #{dangerName}, '%')</if>
41 <if test="dangerContent != null and dangerContent != ''"> and dms.danger_content = #{dangerContent}</if>
42 <if test="dangerStandard != null and dangerStandard != ''"> and dms.danger_standard = #{dangerStandard}</if>
43 <if test="dangerLevel != null and dangerLevel != ''"> and dms.danger_level = #{dangerLevel}</if>
44 <if test="dangerWay != null and dangerWay != ''"> and dms.danger_way = #{dangerWay}</if>
45 <if test="dangerRank != null and dangerRank != ''"> and dms.danger_rank = #{dangerRank}</if>
46 <if test="dangerDept != null and dangerDept != ''"> and dms.danger_dept = #{dangerDept}</if>
47 <if test="dangerUser != null and dangerUser != ''"> and dms.danger_user = #{dangerUser}</if>
48 <if test="dangerFour != null and dangerFour != ''"> and dms.danger_four = #{dangerFour}</if>
49 <if test="dangerPlace != null and dangerPlace != ''"> and dms.danger_place = #{dangerPlace}</if>
50 <if test="equipInfoId != null and equipInfoId != ''"> and dms.equip_info_id = #{equipInfoId}</if>
51 <if test="createDept != null and createDept != ''"> and dms.create_dept = #{createDept}</if>
52 <if test="createCmpy != null and createCmpy != ''"> and dms.create_cmpy = #{createCmpy}</if>
53 <if test="delFlag != null "> and dms.del_flag = #{delFlag}</if>
54 </where>
55 </select>
4 </mapper> 56 </mapper>
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerLevelManageShareService.java
1 package com.skua.modules.safe.service; 1 package com.skua.modules.safe.service;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import com.baomidou.mybatisplus.extension.service.IService; 5 import com.baomidou.mybatisplus.extension.service.IService;
4 import com.skua.modules.safe.entity.DangerLevelManage; 6 import com.skua.modules.safe.entity.DangerLevelManage;
5 import com.skua.modules.safe.entity.DangerLevelManageShare; 7 import com.skua.modules.safe.entity.DangerLevelManageShare;
...@@ -9,4 +11,7 @@ import com.skua.modules.safe.entity.DangerLevelManageShare; ...@@ -9,4 +11,7 @@ import com.skua.modules.safe.entity.DangerLevelManageShare;
9 */ 11 */
10 public interface IDangerLevelManageShareService extends IService<DangerLevelManageShare> { 12 public interface IDangerLevelManageShareService extends IService<DangerLevelManageShare> {
11 13
14 IPage<DangerLevelManageShare> queryPageList(Page<DangerLevelManageShare> page, DangerLevelManageShare dangerLevelManageShare) ;
15
16
12 } 17 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerLevelManageShareServiceImpl.java
1 package com.skua.modules.safe.service.impl; 1 package com.skua.modules.safe.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 import com.skua.modules.ajh.entity.AjhMeeting;
4 import com.skua.modules.safe.entity.DangerLevelManageShare; 7 import com.skua.modules.safe.entity.DangerLevelManageShare;
5 import com.skua.modules.safe.mapper.DangerLevelManageShareMapper; 8 import com.skua.modules.safe.mapper.DangerLevelManageShareMapper;
6 import com.skua.modules.safe.service.IDangerLevelManageShareService; 9 import com.skua.modules.safe.service.IDangerLevelManageShareService;
7 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11
12 import java.util.List;
13
8 /** 14 /**
9 * 风险分级管控清单 15 * 风险分级管控清单
10 */ 16 */
...@@ -12,4 +18,9 @@ import org.springframework.stereotype.Service; ...@@ -12,4 +18,9 @@ import org.springframework.stereotype.Service;
12 public class DangerLevelManageShareServiceImpl extends ServiceImpl<DangerLevelManageShareMapper, DangerLevelManageShare> implements IDangerLevelManageShareService { 18 public class DangerLevelManageShareServiceImpl extends ServiceImpl<DangerLevelManageShareMapper, DangerLevelManageShare> implements IDangerLevelManageShareService {
13 19
14 20
21 public IPage<DangerLevelManageShare> queryPageList(Page<DangerLevelManageShare> page, DangerLevelManageShare dangerLevelManageShare) {
22 List<DangerLevelManageShare> list = this.baseMapper.selectDangerLevelManageShareList(dangerLevelManageShare);
23 page.setRecords(list);
24 return page;
25 }
15 } 26 }
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
...@@ -164,6 +164,8 @@ public class MybatisInterceptor implements Interceptor { ...@@ -164,6 +164,8 @@ public class MybatisInterceptor implements Interceptor {
164 || "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.selectOne".equals(sqlId) 164 || "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.selectOne".equals(sqlId)
165 || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectById".equals(sqlId) 165 || "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectById".equals(sqlId)
166 || "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.queryByPage".equals(sqlId)//库存查询 166 || "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.queryByPage".equals(sqlId)//库存查询
167 || "com.skua.modules.safe.mapper.DangerLevelManageShareMapper.selectDangerLevelManageShareList".equals(sqlId)//共享风险库
168 || "com.skua.modules.safe.mapper.DangerLevelManageShareMapper.selectPage".equals(sqlId)
167 ) { 169 ) {
168 log.debug("************************------sqlId------**************************" + sqlId); 170 log.debug("************************------sqlId------**************************" + sqlId);
169 return invocation.proceed(); 171 return invocation.proceed();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!