src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
@@ -1,5 +1,6 @@ package com.ruoyi.project.tr.specialCheck.controller; import com.ruoyi.common.utils.BeanCopyUtils; import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo; import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService; import com.ruoyi.doublePrevention.vo.ResultVO; @@ -70,14 +71,6 @@ ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO); List<TbSpecialCheckItemDangerLogDTO> data = (List<TbSpecialCheckItemDangerLogDTO>) resultVO.getData(); List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask(); for (TbSpecialCheckItemDangerLogDTO log : data) { for (PreventCJReportDangerInfo danger : dangerList) { if (danger.getId().equals(log.getDangerId())){ log.setDangerName(danger.getDangerName()); } } } TableDataInfo dataTable = getDataTable(data); dataTable.setTotal(resultVO.getCount()); src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java
@@ -22,6 +22,7 @@ private String dangerId; private String dangerName; private String taskId;
@@ -25,6 +25,8 @@ private String dangerId; private String dangerName; private String taskId; private String checkType; src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -148,6 +148,7 @@ // itemDangerLog.setCheckDate(itemDangerLog.getCheckDate()); // itemDangerLog.setCheckPay(itemDangerLog.getCheckPay()); // itemDangerLog.setHarmType(itemDangerLog.getHarmType()); itemDangerLog.setDangerName(dangerById.getDangerName()); itemDangerLog.setCheckName(baseCheckItemByItemId.getCheckName()); itemDangerLog.setCheckContent(baseCheckItemByItemId.getCheckContent()); itemDangerLog.setCheckWay(null); @@ -234,6 +235,7 @@ updateBO.setUpdateBy(sysUser.getUserName()); updateBO.setReportStatus((byte) 1); updateBO.setDangerName(dangerById.getDangerName()); updateBO.setCheckName(baseCheckItemByItemId.getCheckName()); updateBO.setCheckContent(baseCheckItemByItemId.getCheckContent()); updateBO.setCheckWay(null); src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
@@ -10,6 +10,7 @@ <result property="companyCode" column="company_code"/> <result property="dangerId" column="danger_id"/> <result property="dangerName" column="danger_name"/> <result property="taskId" column="task_id"/> <result property="checkType" column="check_type"/> <result property="checkItemId" column="check_item_id"/> @@ -69,6 +70,7 @@ <if test="companyCode != null ">company_code,</if> <if test="dangerId != null ">danger_id,</if> <if test="dangerName != null ">danger_name,</if> <if test="taskId != null ">task_id,</if> <if test="checkType != null ">check_type,</if> <if test="checkItemId != null ">check_item_id,</if> @@ -100,6 +102,7 @@ <if test="companyCode != null ">#{companyCode},</if> <if test="dangerId != null ">#{dangerId},</if> <if test="dangerName != null ">#{dangerName},</if> <if test="taskId != null ">#{taskId},</if> <if test="checkType != null ">#{checkType},</if> <if test="checkItemId != null ">#{checkItemId},</if> @@ -135,6 +138,9 @@ <if test="dangerId != null "> danger_id = #{dangerId}, </if> <if test="dangerName != null "> danger_name= #{dangerName}, </if> <if test="taskId != null"> task_id = #{taskId}, </if>
