添加任务和工单的工作流查询

operation_manager/src/main/java/com/huaxu/evaluation/job/EvaluationResultJob.java

@@ -72,7 +72,7 @@ public class EvaluationResultJob {
 
 
 
-    @Scheduled(cron = "0/5 * * * * ?")
+    // @Scheduled(cron = "0/5 * * * * ?")
     @Async
     public void run(){
         if (lock){

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -1064,6 +1064,21 @@ public class WorkOrderManageController {
         setName(pages.getList());
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+
+    @RequestMapping(value = "findWorkFlowById", method = RequestMethod.GET)
+    @ApiOperation(value = "查询工单工作流")
+    public AjaxMessage<WorkOrderManageDto> findWorkFlowById(
+            @ApiParam(value = "工单id", required = true) @RequestParam Integer flowId) {
+        WorkOrderManageDto result= workOrderManageService.findWorkFlowById(flowId);
+        List<WorkOrderManageDto> list = new ArrayList<>();
+        if (result != null) {
+            list.add(result);
+            setName(list);
+        }
+        return new AjaxMessage<>(ResultStatus.OK,  result);
+    }
 }
 
 
+
+

operation_manager/src/main/java/com/huaxu/order/dao/WorkOrderManageMapper.java

@@ -115,6 +115,7 @@ public interface WorkOrderManageMapper {
                                            @Param("startTime")String startTime, @Param("endTime")String endTime);
 
 
+    WorkOrderManageDto findWorkFlowById(Integer id);
 
 
 

operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -149,4 +149,13 @@ public interface WorkOrderManageService {
     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.huaxu.order.dto.WorkOrderManageDto>
     **/
     Page<WorkOrderManageDto> selectByTime(IPage<WorkOrderManageDto> page, Integer userId, String startTime, String endTime);
+
+    /**
+    * @Author lihui
+    * @Description 查询工单工作流
+    * @Date 16:40 2021/5/14
+    * @Param [id]
+    * @return com.huaxu.order.dto.WorkOrderManageDto
+    **/
+    WorkOrderManageDto findWorkFlowById(Integer id);
 }

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -299,6 +299,11 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
         return workOrderManageMapper.selectByTime(page, userId, currentUser.getTenantId(), startTime, endTime);
     }
 
+    @Override
+    public WorkOrderManageDto findWorkFlowById(Integer id){
+        return workOrderManageMapper.findWorkFlowById(id);
+    }
+
     /**
      *获取某月有多少天
      */

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -414,4 +414,15 @@ public class PlanManageController {
         setName(result);
         return new AjaxMessage<>(ResultStatus.OK, result );
     }
+
+    @RequestMapping(value = "selectWorkFlowById", method = RequestMethod.GET)
+    @ApiOperation(value = "查询任务工作流")
+    public AjaxMessage<PlanManageDto> selectWorkFlowById(
+            @ApiParam(value = "任务id", required = true) @RequestParam Integer flowId) {
+        PlanManageDto result = planManageService.selectWorkFlowById(flowId);
+        setName(new ArrayList<PlanManageDto>(){{
+            this.add(result);
+        }});
+        return new AjaxMessage<>(ResultStatus.OK, result );
+    }
 }

operation_manager/src/main/java/com/huaxu/task/dao/PlanManageMapper.java

@@ -45,4 +45,6 @@ public interface PlanManageMapper {
     List<TaskChangeTendDto> selectTaskChangeTrend(PlanManageDto planManageDto);
 
     List<PlanManageDto> selectTaskDuration(PlanManageDto planManageDto);
+
+    PlanManageDto selectWorkFlowById(Integer id);
 }

operation_manager/src/main/java/com/huaxu/task/service/PlanManageService.java

@@ -76,4 +76,13 @@ public interface PlanManageService {
     List<TaskChangeTendDto> selectTaskChangeTrend(PlanManageDto planManageDto);
 
     int[] selectTaskDuration(PlanManageDto planManageDto);
+
+    /**
+    * @Author lihui
+    * @Description 根据ID查询任务计划工作流
+    * @Date 16:34 2021/5/14
+    * @Param [id]
+    * @return com.huaxu.task.dto.PlanManageDto
+    **/
+    PlanManageDto selectWorkFlowById(Integer id);
 }

operation_manager/src/main/java/com/huaxu/task/service/impl/PlanManageServiceImpl.java

@@ -179,4 +179,9 @@ public class PlanManageServiceImpl implements PlanManageService {
         }
         return result;
     }
+
+    @Override
+    public PlanManageDto selectWorkFlowById(Integer id) {
+        return planManageMapper.selectWorkFlowById(id);
+    }
 }

operation_manager/src/main/java/com/huaxu/utils/EvaluationUtil.java

@@ -38,6 +38,9 @@ public class EvaluationUtil {
     public static BigDecimal divide(Integer completeCount, Integer total){
         BigDecimal bigDecimalComplete =  new BigDecimal(completeCount.toString());
         BigDecimal bigDecimalTotal =  new BigDecimal(total.toString());
+        if (bigDecimalTotal.compareTo(new BigDecimal("0")) == 0){
+            return new BigDecimal("0");
+        }
         return bigDecimalComplete.divide(bigDecimalTotal,2, RoundingMode.HALF_UP);
     }
 

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -1223,4 +1223,19 @@
     </foreach>
     group by DATE_FORMAT(send_time,'%Y-%m')
   </select>
+
+  <select id="findWorkFlowById" resultMap="OrderResultMap">
+    select
+    t1.id, t1.task_no, t1.task_desc, t1.order_user_id, t1.send_time, t1.send_by, t1.plan_finish_date, t1.finish_date,
+    t1.date_limit, t1.urgency, t1.address, t1.contact_user, t1.contact_phone, t1.order_time, t1.company_org_id,
+    t1.department_org_id, t1.order_status, t1.event_type,case when t1.event_type=1 then '运维上报' when t1.event_type=2 then '用户上报' when t1.event_type=3 then '设备告警' end  event_type_name,
+    t1.order_type_id, t1.order_pid, t1.tenant_id,
+    t1.process_instance_id, t1.process_def_id, t1.current_task_id, t1.current_users, t1.current_task_name,
+    t1.create_by, t1.date_create, t1.update_by, t1.date_update, t1.geo,t1.videos,t1.pictures,
+    t1.device_id, t1.scenes_id, t1.device_name, t1.scenes_name,
+    t2.flow_detail,t2.create_by detail_create_by,t2.date_create detail_date_create,t2.update_by detail_update_by,t2.date_update detail_date_update
+    from sc_work_order_manage t1 left  join sc_work_flow_detail t2
+    on t1.id = t2.flow_id and t2.flow_type=2
+    where t1.id = #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -770,4 +770,15 @@
     </if>
     group by timestampdiff(day,date_create,finish_date)
   </select>
+
+  <select id="selectWorkFlowById" resultMap="TaskResultMap">
+    select
+    t1.id, t1.plan_id, plan_name, plan_user_id, user_id, plan_date, plan_start_date, plan_end_date,
+    task_content, task_area_shape, task_area_name, task_type, plan_status, tenant_id,
+    t1.process_instance_id, process_def_id, current_task_id, current_users, current_task_name,
+    t1.create_by, t1.date_create, t1.update_by, t1.date_update, company_org_id, department_org_id,task_checked,
+    t2.flow_detail,t2.create_by detail_create_by,t2.date_create detail_date_create,t2.update_by detail_update_by,t2.date_update detail_date_update
+    from sc_plan_manage t1 left  join sc_work_flow_detail t2
+    on t1.id = t2.flow_id and t2.flow_type=1  where t1.id = #{id,jdbcType=INTEGER}
+  </select>
 </mapper>