src/main/java/com/ruoyi/doublePrevention/controller/RiskAndPeopleInfoController.java
@@ -21,7 +21,7 @@ /** * 查看包保责任制信息 及统计信息 */ @PostMapping("/select/listPage") @PostMapping("/select/selectPage") public ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(@RequestBody RiskAndPeopleInfoReqBO reqBO){ ResultVO resultVO = new ResultVO<>(); resultVO.setCode("200"); src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskAndPeopleInfoReqBO.java
@@ -9,4 +9,7 @@ private Integer pageSize; private String hazardName; private String hazardRank; } src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoRespDTO.java
@@ -9,54 +9,54 @@ @Data public class RiskAndPeopleInfoRespDTO { /** * 责任人所有的任务 * 所有责任人所有的任务 * */ private Integer count; /** * 责任人所有完成的任务 * 所有责任人所有完成的任务 * */ private Integer complete; /** * 任务完成率 * 所有任务完成率 * */ private BigDecimal completeRatio; /** * 责任人所有的任务 * 操作责任人所有的任务 * */ private Integer countOfHandle; /** * 责任人所有完成的任务 * 操作责任人所有完成的任务 * */ private Integer completeOfHandle; /** * 任务完成率 * 操作任务完成率 * */ private BigDecimal completeRatioOfHandle; /** * 责任人所有的任务 * 技术责任人所有的任务 * */ private Integer countOfTechnology; /** * 责任人所有完成的任务 * 技术责任人所有完成的任务 * */ private Integer completeOfTechnology; /** * 任务完成率 * 技术任务完成率 * */ private BigDecimal completeRatioOfTechnology; /** * 责任人所有的任务 * 主要责任人所有的任务 * */ private Integer countOfMain; /** * 责任人所有完成的任务 * 主要责任人所有完成的任务 * */ private Integer completeOfMain; /** * 任务完成率 * 主要任务完成率 * */ private BigDecimal completeRatioOfMain;
@@ -11,5 +11,5 @@ @Repository public interface RiskAndPeopleInfoRepository extends BaseMapper<RiskAndPeopleInfo> { List<RiskAndPeopleInfo> listRiskAndPeoplePage(@Param("queryReqDTO") RiskAndPeopleInfoReqBO reqBO); List<RiskAndPeopleInfo> listRiskAndPeoplePage(@Param("reqBO") RiskAndPeopleInfoReqBO reqBO); } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
@@ -150,7 +150,7 @@ resultVO.setPageSize(pageSize); resultVO.setPageNum(pageIndex); resultVO.setCount(riskAndPeopleList.size()); resultVO.setCount((int) page.getTotal()); resultVO.setData(respDTO); return resultVO; src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -851,6 +851,7 @@ @Transactional @Override public int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob) { // 2、若有变更，需要预先读取jobAndMeasure的uuid，保存下来 PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(hiddenDangerCheckJob.getJobId()); String jobUuid = jobAndMeasureByJobId.getJobUuid(); src/main/resources/mybatis/doublePrevention/RiskAndPeopleMapper.xml
@@ -44,6 +44,12 @@ <select id="listRiskAndPeoplePage" resultMap="Result"> select * from risk_and_people_info where delete_status = 0 <if test="reqBO.hazardName != null and reqBO.hazardName != '' "> and hazard_name like "%" #{reqBO.hazardName} "%" </if> <if test="reqBO.hazardRank != null and reqBO.hazardRank != '' "> and hazard_rank = #{reqBO.hazardRank} </if> </select>
