skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -155,8 +155,8 @@ variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser)); // 完成任务 flowClient.completeTask(taskId,processInstanceId,comment,variables); saveReport(patrolTask); patrolRecordService.saveBatch(patrolTask.getPatrolRecordList()); saveReport(patrolTask); return baseMapper.updateById(patrolTask) >0; }else { return false; skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
@@ -1,18 +1,10 @@ package cn.gistack.sm.reportFlood.controller; import cn.gistack.flow.core.feign.IFlowClient; import cn.gistack.flow.core.vo.BladeFlowVO; import cn.gistack.sm.patrol.entity.PatrolConfig; import cn.gistack.sm.patrol.entity.PatrolTask; import cn.gistack.sm.patrol.service.IPatrolConfigService; import cn.gistack.sm.patrol.vo.BladeFlowPage; import cn.gistack.sm.patrol.vo.PatrolTaskVO; import cn.gistack.sm.reportFlood.entity.ReportFloodRecord; import cn.gistack.sm.reportFlood.service.IReportFloodRecordService; import cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -21,6 +13,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -45,8 +38,19 @@ */ @ApiOperation(value = "报汛记录-分页列表查询", notes = "报汛记录-分页列表查询") @GetMapping(value = "/list") public R<IPage<ReportFloodRecord>> queryPageList(ReportFloodRecord reportFloodRecord, Query query) { IPage<ReportFloodRecord> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord); public R<IPage<ReportFloodRecordVO>> queryPageList(ReportFloodRecordVO reportFloodRecord, Query query) { String code = reportFloodRecord.getAdCode(); if (StringUtil.isNoneBlank(code)){ if (code.substring(0,4).indexOf("00") > -1) { reportFloodRecord.setAdCode(code.substring(0,2)); } else if (code.substring(0,6).indexOf("00") > -1) { reportFloodRecord.setAdCode(code.substring(0,4)); } } IPage<ReportFloodRecordVO> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord); return R.data(pageList); }
@@ -14,7 +14,7 @@ */ public interface ReportFloodRecordMapper extends BaseMapper<ReportFloodRecord> { List<ReportFloodRecord> selectReportFloodRecordPages(IPage<ReportFloodRecord> page, ReportFloodRecord reportFloodRecord); List<ReportFloodRecordVO> selectReportFloodRecordPages(IPage<ReportFloodRecordVO> page, @Param("reportFloodRecord") ReportFloodRecordVO reportFloodRecord); ReportFloodRecordVO customizeGetDetail(@Param("reportFloodRecord") ReportFloodRecordVO reportFloodRecordVO); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
@@ -6,7 +6,6 @@ <result property="reservoirName" column="reservoirName"/> <result property="updateTime" column="update_time"/> <result property="content" column="content"/> <result property="solution" column="solution"/> <result property="isDeleted" column="is_deleted"/> <result property="status" column="status"/> <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> @@ -14,34 +13,36 @@ <result property="curDrp" column="cur_drp"/> <result property="gateStatus" column="gate_status"/> <result property="isOver" column="is_over"/> <result property="overZ" column="over_z"/> <result property="personWatch" column="person_watch"/> <result property="processDefinitionId" column="process_definition_id"/> <result property="processInstanceId" column="process_instance_id"/> <result property="lkOverZ" column="lk_over_z"/> <result property="lkRz" column="lk_rz"/> <result property="wlwOverZ" column="wlw_over_z"/> <result property="wlwRz" column="wlw_rz"/> <result property="personOverZ" column="person_over_z"/> <result property="personRz" column="person_rz"/> <result property="adCode" column="ad_code"/> <result property="isAudit" column="is_audit"/> <result property="reservoirId" column="reservoir_id"/> <result property="sysReport" column="sys_report"/> <result property="createDept" column="create_dept"/> <result property="createUser" column="create_user"/> <result property="updateUser" column="update_user"/> <result property="createTime" column="create_time"/> <result property="handleContent" column="handleContent"/> <result property="handleImages" column="handleImages" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> <result property="handleVideos" column="handleVideos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> <result property="handleSolution" column="handleSolution"/> </resultMap> <select id="selectReportFloodRecordPages" resultType="cn.gistack.sm.reportFlood.entity.ReportFloodRecord"> <select id="selectReportFloodRecordPages" resultType="cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO"> SELECT R.*,atb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r LEFT JOIN "SJZT_MD"."att_res_base" atb on atb."guid" = r.reservoir_id WHERE r.is_deleted = 0 <if test="reportFloodRecord.adCode !=null and reportFloodRecord.adCode !=''"> AND r.ad_code LIKE CONCAT('%',#{reportFloodRecord.adCode},'%') </if> <if test="reportFloodRecord.reservoirName != null and reportFloodRecord.reservoirName !=''"> AND atb."name" LIKE CONCAT('%',#{reportFloodRecord.reservoirName},'%') </if> </select> <select id="customizeGetDetail" resultMap="vo"> SELECT R.*,atb."name" reservoirName,handle.content handleContent,handle.solution handleSolution,handle.images handleImages,handle.videos handleVideos FROM SM_REPORT_FLOOD_RECORD r LEFT JOIN "SJZT_MD"."att_res_base" atb ON atb."guid" = r.reservoir_id LEFT JOIN SM_REPORT_FLOOD_HANDLE handle ON handle.record_id = r.id WHERE r.IS_DELETED = 0 AND r.ID = #{reportFloodRecord.id} <if test="reportFloodRecord.currentUserId != null and reportFloodRecord.currentUserId !=''"> AND handle.create_user = #{reportFloodRecord.currentUserId} </if> </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/IReportFloodRecordService.java
@@ -11,7 +11,7 @@ */ public interface IReportFloodRecordService extends BaseService<ReportFloodRecord> { IPage<ReportFloodRecord> selectReportFloodRecordPages(IPage<ReportFloodRecord> page, ReportFloodRecord reportFloodRecord); IPage<ReportFloodRecordVO> selectReportFloodRecordPages(IPage<ReportFloodRecordVO> page, ReportFloodRecordVO reportFloodRecord); ReportFloodRecordVO customizeGetDetail(ReportFloodRecordVO reportFloodRecordVO); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/impl/ReportFloodRecordServiceImpl.java
@@ -43,7 +43,7 @@ private final IUserClient userClient; @Override public IPage<ReportFloodRecord> selectReportFloodRecordPages(IPage<ReportFloodRecord> page, ReportFloodRecord reportFloodRecord) { public IPage<ReportFloodRecordVO> selectReportFloodRecordPages(IPage<ReportFloodRecordVO> page, ReportFloodRecordVO reportFloodRecord) { return page.setRecords(baseMapper.selectReportFloodRecordPages(page,reportFloodRecord)); }
@@ -5,35 +5,8 @@ @Data public class ReportFloodRecordVO extends ReportFloodRecord { private boolean report; private boolean toDept; /** * 当前用户 */ private String currentUserId; /** * 水库名 */ private String reservoirName; /** * 任务人 */ private String taskUser; private Object[] handleImages; private Object[] handleVideos; /** * 上报处理内容 */ private String handleContent; /** * 上报解决方案 */ private String handleSolution; }
