skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
@@ -151,5 +151,4 @@ List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(groupId,taskId); return R.data(list); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
@@ -17,10 +17,10 @@ import java.util.Arrays; /** * @Description: 巡查设置 * @Description: 巡查上报 */ @Slf4j @Api(tags="巡查设置") @Api(tags="巡查上报") @RestController @RequestMapping("/patrol/patrolReport") @AllArgsConstructor @@ -31,7 +31,7 @@ /** * 分页列表查询 */ @ApiOperation(value="巡查设置-分页列表查询", notes="巡查设置-分页列表查询") @ApiOperation(value="巡查上报-分页列表查询", notes="巡查上报-分页列表查询") @GetMapping(value = "/list") public R<IPage<PatrolConfig>> queryPageList(PatrolConfig patrolConfig,Query query) { IPage<PatrolConfig> pageList = patrolReportService.selectPatrolReport(Condition.getPage(query),patrolConfig); @@ -41,7 +41,7 @@ /** * 添加 */ @ApiOperation(value="巡查设置-添加", notes="巡查设置-添加") @ApiOperation(value="巡查上报-添加", notes="巡查上报-添加") @PostMapping(value = "/add") public R add(@RequestBody PatrolReport patrolReport) { return R.data(patrolReportService.save(patrolReport)); @@ -50,7 +50,7 @@ /** * 编辑 */ @ApiOperation(value="巡查设置-编辑", notes="巡查设置-编辑") @ApiOperation(value="巡查上报-编辑", notes="巡查上报-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public R edit(@RequestBody PatrolReport patrolReport) { return R.data(patrolReportService.updateById(patrolReport)); @@ -62,7 +62,7 @@ * @param id * @return */ @ApiOperation(value="巡查设置-通过id删除", notes="巡查设置-通过id删除") @ApiOperation(value="巡查上报-通过id删除", notes="巡查上报-通过id删除") @DeleteMapping(value = "/delete") public R delete(@RequestParam(name="id",required=true) String id) { patrolReportService.removeById(id); @@ -75,7 +75,7 @@ * @param ids * @return */ @ApiOperation(value="巡查设置-批量删除", notes="巡查设置-批量删除") @ApiOperation(value="巡查上报-批量删除", notes="巡查上报-批量删除") @DeleteMapping(value = "/deleteBatch") public R deleteBatch(@RequestParam(name="ids",required=true) String ids) { return R.data(this.patrolReportService.removeByIds(Arrays.asList(ids.split(",")))); @@ -87,11 +87,24 @@ * @param id * @return */ @ApiOperation(value="巡查设置-通过id查询", notes="巡查设置-通过id查询") @ApiOperation(value="巡查上报-通过id查询", notes="巡查上报-通过id查询") @GetMapping(value = "/queryById") public R queryById(@RequestParam(name="id",required=true) String id) { PatrolReport byId = patrolReportService.getById(id); return R.data(byId); } /** * 自定义查询 * * @param patrolReport * @return */ @ApiOperation(value="巡查上报-自定义查询", notes="巡查上报-自定义查询") @PostMapping(value = "/customizeGetDetail") public R customizeGetDetail(PatrolReport patrolReport) { PatrolReport detail = patrolReportService.getOne(Condition.getQueryWrapper(patrolReport)); return R.data(detail); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -218,8 +218,10 @@ List<BladeFlow> data = res.getData(); data.forEach(bladeFlow -> { PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId()); byId.setFlow(bladeFlow); patrolTaskList.add(byId); if (byId != null){ byId.setFlow(bladeFlow); patrolTaskList.add(byId); } }); } //设置数据集 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
@@ -85,6 +85,7 @@ INNER JOIN SM_PATROL_GROUP_ITEM I ON R.ITEM_ID = I.ID WHERE R.IS_DELETED = 0 AND R.TASK_ID = #{taskId} AND R.STATUS = 2 AND R.SOLUTION = 2 GROUP BY I.GROUP_ID )D ON D.GROUP_ID = I.GROUP_ID WHERE R.IS_DELETED = 0 AND R.TASK_ID = #{taskId} skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -26,7 +26,7 @@ AND spt.project_id = #{patrolTask.projectId} </if> <if test="patrolTask.reservoirName !=null and patrolTask.reservoirName !='' "> AND spt.reservoir_name LIKE ('%',#{patrolTask.reservoirName},'%') AND spt.reservoir_name LIKE CONCAT('%',#{patrolTask.reservoirName},'%') </if> <if test="patrolTask.toUserId != null and patrolTask.toUserId !=''"> AND spt.to_user_id = #{patrolTask.toUserId} @@ -144,6 +144,7 @@ SELECT COUNT(*) PROBLEM_COUNT,R.TASK_ID FROM SM_PATROL_REPORT R WHERE R.TASK_ID = #{id} AND R.STATUS = 2 GROUP BY R.TASK_ID )A ON A.TASK_ID = T.ID WHERE T.ID = #{id} AND T.STATE = 3 AND T.IS_DELETED = 0 </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolReportServiceImpl.java
@@ -1,15 +1,19 @@ package cn.gistack.sm.patrol.service.impl; import cn.gistack.sm.patrol.entity.PatrolConfig; import cn.gistack.sm.patrol.entity.PatrolRecord; import cn.gistack.sm.patrol.entity.PatrolReport; import cn.gistack.sm.patrol.entity.PatrolTask; import cn.gistack.sm.patrol.mapper.PatrolReportMapper; import cn.gistack.sm.patrol.service.IPatrolRecordService; import cn.gistack.sm.patrol.service.IPatrolReportService; import cn.gistack.sm.patrol.service.IPatrolTaskService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service @AllArgsConstructor @@ -22,13 +26,17 @@ } @Override public boolean save(PatrolReport entity) { if (Func.equals(entity.getStatus(),1)){ @Transactional public boolean updateById(PatrolReport patrolReport) { PatrolRecord patrolRecord = new PatrolRecord(); patrolRecord.setId(Long.parseLong(patrolReport.getRecordId())); //修改记录表中的异常状态为正常 patrolRecord.setStatus(1); //修改记录表中的是否解决为已解决 patrolRecord.setSolution("1"); } return super.save(entity); boolean editRecord = patrolRecordService.updateById(patrolRecord); boolean editReport = super.updateById(patrolReport); return editRecord&&editReport; } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -165,13 +165,18 @@ @Override public boolean chargeCompletePerson(BladeFlowTask bladeFlowTask) { //判断是否上报 // boolean isReport = false; // List<PatrolReport> collect = bladeFlowTask.getPatrolReportList().stream().filter(report -> Func.equals(report.getStatus(), 2)).collect(Collectors.toList()); // if (collect.size()>0){ // isReport = true; // } // //更新report表 // boolean update = patrolReportService.updateBatchById(bladeFlowTask.getPatrolReportList()); boolean isReport = false; List<PatrolReport> collect = bladeFlowTask.getPatrolReportList().stream().filter(report -> Func.equals(report.getStatus(), 2)).collect(Collectors.toList()); if (collect.size()>0){ if (StringUtil.isNoneBlank(bladeFlowTask.getTaskUser())){ isReport = true; } //更新report表 boolean update = patrolReportService.updateBatchById(bladeFlowTask.getPatrolReportList()); String taskId = bladeFlowTask.getTaskId(); String processInstanceId = bladeFlowTask.getProcessInstanceId(); @@ -191,7 +196,7 @@ variables.put(ProcessConstant.TOTECH_KEY,bladeFlowTask.getToTech()); //完成任务 flowClient.completeTask(taskId, processInstanceId, comment, variables); return update; return true; } @Override skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -11,7 +11,7 @@ </if> </select> <select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase"> SELECT "code","name","ad_guid" FROM "att_res_base" SELECT "guid","code","name","ad_guid","eng_scal" FROM "att_res_base" WHERE "is_deleted"=0 AND "ad_guid" LIKE CONCAT('%',#{obj.code},'%') <if test="obj.name !=null and obj.name !=''"> @@ -19,7 +19,7 @@ </if> </select> <select id="getDetailByCode" resultType="cn.gistack.sm.sjztmd.entity.AttResBase"> SELECT "code","name","ad_guid" FROM "att_res_base" SELECT "code","name","ad_guid","guid" FROM "att_res_base" WHERE "is_deleted"=0 and "code" = #{code} </select> </mapper>
