diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtRiskInventoryTypeController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtRiskInventoryTypeController.java index c1b07102e..c74bdd604 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtRiskInventoryTypeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtRiskInventoryTypeController.java @@ -7,8 +7,15 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URLEncoder; import java.util.HashMap; +import org.apache.poi.util.IOUtils; +import org.springframework.core.io.ClassPathResource; +import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -23,6 +30,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; + /** * @Title: Controller @@ -39,6 +48,16 @@ public class RtRiskInventoryTypeController { @Autowired private IRtRiskInventoryTypeService rtRiskInventoryTypeService; + @ApiOperation(value = "tree分页列表查询榕图-风险清册类型信息", notes = "tree分页列表查询榕图-风险清册类型信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/tree/page") + public Result> queryTreePageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtRiskInventoryTypeService.queryTreePageList(paramMap)); + } + /** * 分页列表查询 * @@ -136,4 +155,32 @@ public class RtRiskInventoryTypeController { return result; } + @ApiOperation(value = "模板导入下载", notes = "模板导入下载") + @GetMapping("/downloadExcelTemplate") + public void downloadRtRiskSecurityLibraryTypeExcelTemplate(HttpServletResponse response) { + try { + OutputStream out = response.getOutputStream(); + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/vnd.ms-excel;charset=gb2312"); + response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("风险清册导入模板.xlsx", "UTF-8")); + InputStream fis = new ClassPathResource("excel/风险清册导入模板.xlsx").getInputStream(); + IOUtils.copy(fis, out); + out.flush(); + out.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + @ApiOperation(value = "模板导入", notes = "模板导入") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "excelFile", value = "导入文件", paramType = "query", required = true, dataType = "String"), + }) + @PostMapping(value = "/importExcelTemplate") + public Result importExcelTemplate(MultipartFile excelFile, String projectSn) throws Exception { + rtRiskInventoryTypeService.importExcelTemplate(excelFile, projectSn); + return Result.ok(); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java index 859025f6a..851249c95 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtRiskInventoryType.java @@ -1,17 +1,18 @@ package com.zhgd.xmgl.modules.rt.entity; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.List; /** * @Description: 榕图-风险清册类型 @@ -23,92 +24,103 @@ import io.swagger.annotations.ApiModelProperty; @TableName("rt_risk_inventory_type") @ApiModel(value = "RtRiskInventoryType实体类", description = "RtRiskInventoryType") public class RtRiskInventoryType implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * id - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "id") - private java.lang.Long id; - /** - * 名称 - */ - @Excel(name = "名称", width = 15) - @ApiModelProperty(value = "名称") - private java.lang.String name; - /** - * 编码 - */ - @Excel(name = "编码", width = 15) - @ApiModelProperty(value = "编码") - private java.lang.String code; - /** - * 项目sn - */ - @Excel(name = "项目sn", width = 15) - @ApiModelProperty(value = "项目sn") - private java.lang.String projectSn; - /** - * 层级名称 - */ - @Excel(name = "层级名称", width = 15) - @ApiModelProperty(value = "层级名称") - private java.lang.String fullName; - /** - * 创建时间 - */ - @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /** - * 等级 - */ - @Excel(name = "等级", width = 15) - @ApiModelProperty(value = "等级") - private java.lang.Integer level; - /** - * 父级id - */ - @Excel(name = "父级id", width = 15) - @ApiModelProperty(value = "父级id") - private java.lang.Long parentId; - /** - * 排序 - */ - @Excel(name = "排序", width = 15) - @ApiModelProperty(value = "排序") - private java.lang.Integer orderSort; - /** - * 风险可能导致的后果 - */ - @Excel(name = "风险可能导致的后果", width = 15) - @ApiModelProperty(value = "风险可能导致的后果") - private java.lang.String riskPossibleConsequence; - /** - * 风险评定值D - */ - @Excel(name = "风险评定值D", width = 15) - @ApiModelProperty(value = "风险评定值D") - private java.lang.String riskAssessmentValueD; - /** - * 风险级别 - */ - @Excel(name = "风险级别", width = 15) - @ApiModelProperty(value = "风险级别") - private java.lang.String riskLevel; - /** - * 风险控制关键因素 - */ - @Excel(name = "风险控制关键因素", width = 15) - @ApiModelProperty(value = "风险控制关键因素") - private java.lang.String keyFactorsInRiskControl; - /** - * 预防措施 - */ - @Excel(name = "预防措施", width = 15) - @ApiModelProperty(value = "预防措施") - private java.lang.Object precaution; + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 名称 + */ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private java.lang.String name; + /** + * 工序名称 + */ + @Excel(name = "工序名称", width = 15) + @ApiModelProperty(value = "工序名称") + private java.lang.String processName; + + /** + * 编码 + */ + @Excel(name = "编码", width = 15) + @ApiModelProperty(value = "编码") + private java.lang.String code; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; + /** + * 层级名称 + */ + @Excel(name = "层级名称", width = 15) + @ApiModelProperty(value = "层级名称") + private java.lang.String fullName; + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /** + * 等级 + */ + @Excel(name = "等级", width = 15) + @ApiModelProperty(value = "等级") + private java.lang.Integer level; + /** + * 父级id + */ + @Excel(name = "父级id", width = 15) + @ApiModelProperty(value = "父级id") + private java.lang.Long parentId; + /** + * 排序 + */ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer orderSort; + /** + * 风险可能导致的后果 + */ + @Excel(name = "风险可能导致的后果", width = 15) + @ApiModelProperty(value = "风险可能导致的后果") + private java.lang.String riskPossibleConsequence; + /** + * 风险评定值D + */ + @Excel(name = "风险评定值D", width = 15) + @ApiModelProperty(value = "风险评定值D") + private java.lang.String riskAssessmentValueD; + /** + * 风险级别 + */ + @Excel(name = "风险级别", width = 15) + @ApiModelProperty(value = "风险级别") + private java.lang.String riskLevel; + /** + * 风险控制关键因素 + */ + @Excel(name = "风险控制关键因素", width = 15) + @ApiModelProperty(value = "风险控制关键因素") + private java.lang.String keyFactorsInRiskControl; + /** + * 预防措施 + */ + @Excel(name = "预防措施", width = 15) + @ApiModelProperty(value = "预防措施") + private java.lang.Object precaution; + + @TableField(exist = false) + @ApiModelProperty(value = "榕图-风险清册类型子集") + private List children; } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtWorkTicket.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtWorkTicket.java index 7e266a0a0..9a211992e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtWorkTicket.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtWorkTicket.java @@ -190,6 +190,9 @@ public class RtWorkTicket implements Serializable { @ApiModelProperty(value = "榕图-风险安全库-作业类型、工序及部位Json") private String rtRiskSecurityLibraryTypeJson; + @ApiModelProperty(value = "榕图-风险安全库-作业类型、工序及部位字符串") + private String rtRiskSecurityLibraryTypeStr; + @TableField(exist = false) @ApiModelProperty(value = "榕图-风险安全库-作业类型、工序及部位idList") private List rtRiskSecurityLibraryTypeIdList; diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskInventoryTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskInventoryTypeMapper.java index d31db1540..7e12c185b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskInventoryTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskInventoryTypeMapper.java @@ -1,8 +1,15 @@ package com.zhgd.xmgl.modules.rt.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.rt.entity.RtRiskInventoryType; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 榕图-风险清册类型 @@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface RtRiskInventoryTypeMapper extends BaseMapper { + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.java index 3db9acb4c..2dab4ad8e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.java @@ -1,8 +1,15 @@ package com.zhgd.xmgl.modules.rt.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 榕图-工作票 @@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface RtWorkTicketMapper extends BaseMapper { + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskInventoryTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskInventoryTypeMapper.xml index b4e845be2..496139f46 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskInventoryTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskInventoryTypeMapper.xml @@ -1,5 +1,9 @@ - + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml index 63d397d2d..03f97f0bb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml @@ -1,4 +1,20 @@ + + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtRiskInventoryTypeService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtRiskInventoryTypeService.java index f0e2fa775..e531cb05f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtRiskInventoryTypeService.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtRiskInventoryTypeService.java @@ -3,7 +3,9 @@ package com.zhgd.xmgl.modules.rt.service; import com.zhgd.xmgl.modules.rt.entity.RtRiskInventoryType; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -22,4 +24,8 @@ public interface IRtRiskInventoryTypeService extends IService queryTreePageList(HashMap paramMap); + + void importExcelTemplate(MultipartFile excelFile, String projectSn) throws Exception; } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java index ede042490..3b0d61364 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java @@ -1,22 +1,31 @@ package com.zhgd.xmgl.modules.rt.service.impl; -import com.zhgd.xmgl.modules.rt.entity.RtRiskInventoryType; -import com.zhgd.xmgl.modules.rt.mapper.RtRiskInventoryTypeMapper; -import com.zhgd.xmgl.modules.rt.service.IRtRiskInventoryTypeService; -import org.springframework.stereotype.Service; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; 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.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.rt.entity.RtRiskInventoryType; +import com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType; +import com.zhgd.xmgl.modules.rt.mapper.RtRiskInventoryTypeMapper; +import com.zhgd.xmgl.modules.rt.service.IRtRiskInventoryTypeService; +import com.zhgd.xmgl.util.*; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; import java.util.HashMap; import java.util.List; - -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; +import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 榕图-风险清册类型 @@ -34,7 +43,7 @@ public class RtRiskInventoryTypeServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = this.page(page, queryWrapper); + IPage pageList = baseMapper.queryList(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @@ -42,7 +51,7 @@ public class RtRiskInventoryTypeServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper)); } private QueryWrapper getQueryWrapper(HashMap paramMap) { @@ -66,4 +75,71 @@ public class RtRiskInventoryTypeServiceImpl extends ServiceImpl queryTreePageList(HashMap paramMap) { + String taskName = MapUtils.getString(paramMap, "taskName"); + Integer status = MapUtils.getInteger(paramMap, "status"); + String actualFinishDate_begin = MapUtils.getString(paramMap, "actualFinishDate_begin"); + String actualFinishDate_end = MapUtils.getString(paramMap, "actualFinishDate_end"); + if (StrUtil.isBlank(taskName) && StrUtil.isBlank(actualFinishDate_begin) && StrUtil.isBlank(actualFinishDate_end) && status == null) { + int pageNo = Integer.parseInt(paramMap.getOrDefault("pageNo", 1).toString()); + int pageSize = Integer.parseInt(paramMap.getOrDefault("pageSize", 10).toString()); + List list = getParentChildList(paramMap); + IPage p = new Page<>(); + int i = cn.hutool.core.util.PageUtil.getStart(pageNo - 1, pageSize); + p.setTotal(list.size()); + p.setRecords(CollUtil.sub(list, i, i + pageSize)); + p.setCurrent(pageNo); + p.setSize(pageSize); + return p; + } else { + return this.queryPageList(paramMap); + } + } + + @Override + public void importExcelTemplate(MultipartFile excelFile, String projectSn) throws Exception { + InputStream is = excelFile.getInputStream(); + List> list = ExcelUtils.jxlExlToList(is, 0); + if (list == null || list.size() == 0) { + throw new OpenAlertException(MessageUtil.get("excelNotDataErr")); + } + Map libraryObj = new HashMap<>(); + for (Map importInfo : list) { + //风险编号 工序 风险可能导致的后果 风险评定值D 风险级别 风险控制关键因素 预控措施 备注 + if (importInfo == null || importInfo.get("风险编号") == null || importInfo.get("风险编号").equals("")) { + continue; + } + String code = importInfo.get("编码").trim(); + String typeName = importInfo.get("作业类型、工序及部位"); + String newCode = CodeUtils.subCode(code); + } + + + } + + public List getParentChildList(HashMap paramMap) { + // 查询项目下的节点集合，通过父节点分组 + List progressTaskList = this.queryList(paramMap); + Map> parentIdTaskListMap = progressTaskList.stream().collect(Collectors.groupingBy(RtRiskInventoryType::getParentId)); + return getChild(parentIdTaskListMap, 0L); + } + + /** + * 递归设置子节点列表 + * + * @param parentIdTaskListMap 父节点对应的子节点列表 + * @param parentId 父节点id + * @return + */ + public List getChild(Map> parentIdTaskListMap, Long parentId) { + List parentList = parentIdTaskListMap.getOrDefault(parentId, Collections.emptyList()); + if (CollUtil.isNotEmpty(parentList)) { + for (RtRiskInventoryType progressTask : parentList) { + progressTask.setChildren(getChild(parentIdTaskListMap, progressTask.getId())); + } + } + return parentList; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java index 854f6f172..f6f3f3b43 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java @@ -1,26 +1,31 @@ package com.zhgd.xmgl.modules.rt.service.impl; import cn.hutool.core.collection.CollUtil; -import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket; -import com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToRiskSecurityLibraryType; -import com.zhgd.xmgl.modules.rt.mapper.RtWorkTicketMapper; -import com.zhgd.xmgl.modules.rt.mapper.RtWorkTicketToRiskSecurityLibraryTypeMapper; -import com.zhgd.xmgl.modules.rt.service.IRtWorkTicketService; -import org.springframework.stereotype.Service; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType; +import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket; +import com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToRiskSecurityLibraryType; +import com.zhgd.xmgl.modules.rt.mapper.RtRiskSecurityLibraryTypeMapper; +import com.zhgd.xmgl.modules.rt.mapper.RtWorkTicketMapper; +import com.zhgd.xmgl.modules.rt.mapper.RtWorkTicketToRiskSecurityLibraryTypeMapper; +import com.zhgd.xmgl.modules.rt.service.IRtWorkTicketService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; - /** * @Description: 榕图-工作票 * @author： pds @@ -34,12 +39,14 @@ public class RtWorkTicketServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = this.page(page, queryWrapper); + IPage pageList = baseMapper.queryList(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @@ -47,11 +54,11 @@ public class RtWorkTicketServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper)); } private QueryWrapper getQueryWrapper(HashMap paramMap) { - String alias = ""; + String alias = "rwt."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(RtWorkTicket.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtWorkTicket::getId)); return queryWrapper; @@ -64,7 +71,12 @@ public class RtWorkTicketServiceImpl extends ServiceImpl rtRiskSecurityLibraryTypeIdList = rtWorkTicket.getRtRiskSecurityLibraryTypeIdList(); if (CollUtil.isNotEmpty(rtRiskSecurityLibraryTypeIdList)) { for (String id : rtRiskSecurityLibraryTypeIdList) { @@ -76,8 +88,39 @@ public class RtWorkTicketServiceImpl extends ServiceImpl 1) { + for (int i = 0; i < o1.size(); i++) { + String o3 = (String) o1.get(i); + RtRiskSecurityLibraryType type = rtRiskSecurityLibraryTypeMapper.selectById(o3); + if (type != null) { + s.append(type.getName()); + if (i == (o1.size() - 1)) { + s.append(";"); + } else { + s.append(":"); + } + } + } + } + } + rtWorkTicket.setRtRiskSecurityLibraryTypeStr(s.toString()); + } + } + @Override public void edit(RtWorkTicket rtWorkTicket) { + setRtRiskSecurityLibraryTypeStrIf(rtWorkTicket); + //中间表 + rtWorkTicketToRiskSecurityLibraryTypeMapper.delete(new LambdaQueryWrapper() + .eq(RtWorkTicketToRiskSecurityLibraryType::getRtWorkTicketId, rtWorkTicket.getId())); + insertRelIf(rtWorkTicket); baseMapper.updateById(rtWorkTicket); } } diff --git a/src/main/resources/excel/风险清册导入模板 .xlsx b/src/main/resources/excel/风险清册导入模板 .xlsx deleted file mode 100644 index f8fae4263..000000000 Binary files a/src/main/resources/excel/风险清册导入模板 .xlsx and /dev/null differ diff --git a/src/main/resources/excel/风险清册导入模板.xlsx b/src/main/resources/excel/风险清册导入模板.xlsx new file mode 100644 index 000000000..2395f1bf1 Binary files /dev/null and b/src/main/resources/excel/风险清册导入模板.xlsx differ