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;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.query.QueryGenerator;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.zxing.QRCodeUtil;
import com.skua.modules.safe.entity.DangerLevelManage;
import com.skua.modules.safe.entity.DangerLevelManageShare;
import com.skua.modules.safe.service.IDangerLevelManageService;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.safe.service.IDangerLevelManageShareService;
import com.skua.modules.system.entity.SysDepart;
import com.skua.modules.system.mapper.SysConfigMapper;
import com.skua.modules.system.service.ISysConfigService;
import com.skua.modules.system.service.ISysDepartService;
import lombok.extern.slf4j.Slf4j;
......@@ -100,22 +97,10 @@ public class DangerLevelManageController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<DangerLevelManageShare>> result = new Result<IPage<DangerLevelManageShare>>();
QueryWrapper<DangerLevelManageShare> queryWrapper = QueryGenerator.initQueryWrapper(dangerLevelManage, req.getParameterMap());
Page<DangerLevelManageShare> page = new Page<>(pageNo, pageSize);
IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.page(page, queryWrapper);
/* List<SysDepart> sysDepartList = departService.queryList();
if(pageList.getRecords() != null && !pageList.getRecords().isEmpty()){
for( DangerLevelManageShare shareVO: pageList.getRecords()){
if(shareVO.getDepartId() != null ){
for( sysDepartList){
}
}
}
}*/
IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.queryPageList(page, dangerLevelManage);
// QueryWrapper<DangerLevelManageShare> queryWrapper = QueryGenerator.initQueryWrapper(dangerLevelManage, req.getParameterMap());
//IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerLevelManageShare.java
......@@ -24,7 +24,115 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="danger_level_manage共享风险库对象", description="共享风险分级管控清单")
public class DangerLevelManageShare extends DangerLevelManage{
public class DangerLevelManageShare {
/**id*/
@TableId(type = IdType.UUID)
@ApiModelProperty(value = "id")
private String id;
/**厂区*/
@Excel(name = "厂区", width = 15,dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
@ApiModelProperty(value = "厂区")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**风险点类型*/
@Excel(name = "风险点类型", width = 15 ,dicCode = "dangerType")
@ApiModelProperty(value = "风险点类型")
@Dict(dicCode = "dangerType")
private String dangerType;
/**风险点名称*/
@Excel(name = "风险点名称", width = 15)
@ApiModelProperty(value = "风险点名称")
private String dangerName;
/**危险源内容*/
@Excel(name = "危险源内容", width = 15)
@ApiModelProperty(value = "危险源内容")
private String dangerContent;
/**安全态（标准情况）*/
@Excel(name = "安全态（标准情况）", width = 15)
@ApiModelProperty(value = "安全态（标准情况）")
private String dangerStandard;
/**风险等级*/
@Excel(name = "风险等级", width = 15 ,dicCode = "dangerLevel")
@ApiModelProperty(value = "风险等级")
@Dict(dicCode = "dangerLevel")
private String dangerLevel;
/**主要后果*/
@Excel(name = "主要后果", width = 15)
@ApiModelProperty(value = "主要后果")
private String dangerResult;
/**管控措施*/
@Excel(name = "管控措施", width = 15)
@ApiModelProperty(value = "管控措施")
private String dangerWay;
/**管控层级*/
@Excel(name = "管控层级", width = 15,dicCode = "dangerRank")
@ApiModelProperty(value = "管控层级")
@Dict(dicCode = "dangerRank")
private String dangerRank;
/**责任部门*/
@Excel(name = "责任部门", width = 15)
@ApiModelProperty(value = "责任部门")
private String dangerDept;
/**责任人*/
@Excel(name = "责任人", width = 15)
@ApiModelProperty(value = "责任人")
private String dangerUser;
/**安全四色图*/
//@Excel(name = "安全四色图", width = 15)
@ApiModelProperty(value = "安全四色图")
private String dangerFour;
@Excel(name = "风险点位置", width = 15,dicCode = "id",dicText = "struct_name",dictTable = "sys_struct_dict")
@ApiModelProperty(value = "风险点位置")
@Dict(dicCode = "id",dicText = "struct_name",dictTable = "sys_struct_dict")
private String dangerPlace;
@Excel(name = "关联设备", width = 15,dicCode = "id",dicText = "equipment_name",dictTable = "equipment_info")
@ApiModelProperty(value = "关联设备")
@Dict(dicCode = "id",dicText = "equipment_name",dictTable = "equipment_info")
private String equipInfoId;
@Excel(name = "是否共享", width = 15)
@ApiModelProperty(value = "是否共享")
private String share;
//@Excel(name = "二维码", width = 15)
@ApiModelProperty(value = "二维码")
private String qrCode;
/**创建人Id*/
@ApiModelProperty(value = "创建人Id")
private String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**修改人Id*/
@ApiModelProperty(value = "修改人Id")
private String updateBy;
/**修改时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String createDept;
/**所属公司*/
@ApiModelProperty(value = "所属公司")
private String createCmpy;
/**删除标识，1有效，0删除*/
@ApiModelProperty(value = "删除标识，1有效，0删除")
private Integer delFlag;
@TableField(exist=false)
@ApiModelProperty(value = "厂区名称")
private String departName;
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/DangerLevelManageShareMapper.java
......@@ -5,10 +5,14 @@ import com.skua.modules.safe.entity.DangerLevelManage;
import com.skua.modules.safe.entity.DangerLevelManageShare;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 风险分级管控清单
*/
public interface DangerLevelManageShareMapper extends BaseMapper<DangerLevelManageShare> {
List<DangerLevelManageShare> selectDangerLevelManageShareList(DangerLevelManageShare dangerLevelManageShare);
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/DangerLevelManageShareMapper.xml
<?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.skua.modules.safe.mapper.DangerLevelManageShareMapper">
<resultMap type="com.skua.modules.safe.entity.DangerLevelManageShare" id="DangerLevelManageShareResult">
<result property="id" column="id" />
<result property="departId" column="depart_id" />
<result property="dangerType" column="danger_type" />
<result property="dangerName" column="danger_name" />
<result property="dangerContent" column="danger_content" />
<result property="dangerStandard" column="danger_standard" />
<result property="dangerLevel" column="danger_level" />
<result property="dangerResult" column="danger_result" />
<result property="dangerWay" column="danger_way" />
<result property="dangerRank" column="danger_rank" />
<result property="dangerDept" column="danger_dept" />
<result property="dangerUser" column="danger_user" />
<result property="dangerFour" column="danger_four" />
<result property="dangerPlace" column="danger_place" />
<result property="equipInfoId" column="equip_info_id" />
<result property="share" column="share" />
<result property="qrCode" column="qr_code" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="createDept" column="create_dept" />
<result property="createCmpy" column="create_cmpy" />
<result property="delFlag" column="del_flag" />
<result property="departName" column="depart_name" />
</resultMap>
<select id="selectDangerLevelManageShareList" parameterType="com.skua.modules.safe.entity.DangerLevelManageShare" resultMap="DangerLevelManageShareResult">
select d.depart_name , dms.* from danger_level_manage_share dms
left join sys_depart d on dms.depart_id = d.id
<where>
<if test="departId != null and departId != ''"> and dms.depart_id = #{departId}</if>
<if test="dangerType != null and dangerType != ''"> and dms.danger_type = #{dangerType}</if>
<if test="dangerName != null and dangerName != ''"> and dms.danger_name like concat('%', #{dangerName}, '%')</if>
<if test="dangerContent != null and dangerContent != ''"> and dms.danger_content = #{dangerContent}</if>
<if test="dangerStandard != null and dangerStandard != ''"> and dms.danger_standard = #{dangerStandard}</if>
<if test="dangerLevel != null and dangerLevel != ''"> and dms.danger_level = #{dangerLevel}</if>
<if test="dangerWay != null and dangerWay != ''"> and dms.danger_way = #{dangerWay}</if>
<if test="dangerRank != null and dangerRank != ''"> and dms.danger_rank = #{dangerRank}</if>
<if test="dangerDept != null and dangerDept != ''"> and dms.danger_dept = #{dangerDept}</if>
<if test="dangerUser != null and dangerUser != ''"> and dms.danger_user = #{dangerUser}</if>
<if test="dangerFour != null and dangerFour != ''"> and dms.danger_four = #{dangerFour}</if>
<if test="dangerPlace != null and dangerPlace != ''"> and dms.danger_place = #{dangerPlace}</if>
<if test="equipInfoId != null and equipInfoId != ''"> and dms.equip_info_id = #{equipInfoId}</if>
<if test="createDept != null and createDept != ''"> and dms.create_dept = #{createDept}</if>
<if test="createCmpy != null and createCmpy != ''"> and dms.create_cmpy = #{createCmpy}</if>
<if test="delFlag != null "> and dms.del_flag = #{delFlag}</if>
</where>
</select>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerLevelManageShareService.java
package com.skua.modules.safe.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.safe.entity.DangerLevelManage;
import com.skua.modules.safe.entity.DangerLevelManageShare;
......@@ -9,4 +11,7 @@ import com.skua.modules.safe.entity.DangerLevelManageShare;
*/
public interface IDangerLevelManageShareService extends IService<DangerLevelManageShare> {
IPage<DangerLevelManageShare> queryPageList(Page<DangerLevelManageShare> page, DangerLevelManageShare dangerLevelManageShare) ;
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerLevelManageShareServiceImpl.java
package com.skua.modules.safe.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.skua.modules.ajh.entity.AjhMeeting;
import com.skua.modules.safe.entity.DangerLevelManageShare;
import com.skua.modules.safe.mapper.DangerLevelManageShareMapper;
import com.skua.modules.safe.service.IDangerLevelManageShareService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 风险分级管控清单
*/
......@@ -12,4 +18,9 @@ import org.springframework.stereotype.Service;
public class DangerLevelManageShareServiceImpl extends ServiceImpl<DangerLevelManageShareMapper, DangerLevelManageShare> implements IDangerLevelManageShareService {
public IPage<DangerLevelManageShare> queryPageList(Page<DangerLevelManageShare> page, DangerLevelManageShare dangerLevelManageShare) {
List<DangerLevelManageShare> list = this.baseMapper.selectDangerLevelManageShareList(dangerLevelManageShare);
page.setRecords(list);
return page;
}
}
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
......@@ -164,6 +164,8 @@ public class MybatisInterceptor implements Interceptor {
|| "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.selectOne".equals(sqlId)
|| "com.skua.modules.supplies.mapper.EquipmentSparepartSuppliesMapper.selectById".equals(sqlId)
|| "com.skua.modules.equipment.mapper.EquipmentSparepartMapper.queryByPage".equals(sqlId)//库存查询
|| "com.skua.modules.safe.mapper.DangerLevelManageShareMapper.selectDangerLevelManageShareList".equals(sqlId)//共享风险库
|| "com.skua.modules.safe.mapper.DangerLevelManageShareMapper.selectPage".equals(sqlId)
) {
log.debug("************************------sqlId------**************************" + sqlId);
return invocation.proceed();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!