APP查看任务和工单详情

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

@@ -185,4 +185,14 @@ public class WorkOrderManageController {
         workFlowLogService.insert(workFlowLog);
         return new AjaxMessage<>(ResultStatus.OK );
     }
+    /**
+     * APP查询工单详情
+     * @return Response对象
+     */
+    @RequestMapping(value = "selectOrderDetail", method = RequestMethod.GET)
+    @ApiOperation(value = "APP查询工单详情")
+    public AjaxMessage<WorkOrderManageDto> selectOrderDetail(
+            @ApiParam(value = "工单id", required = true) @RequestParam Integer flowId) {
+        return new AjaxMessage<>(ResultStatus.OK,  workOrderManageService.selectOrderDetail(flowId));
+    }
 }

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

@@ -24,4 +24,6 @@ public interface WorkOrderManageMapper {
     List<WorkOrderManageDto> selectAppTodo( @Param("userId")Integer userId,@Param("tenantId")String tenantId);
 
     List<WorkOrderManageDto> selectAppAll( @Param("userId")Integer userId,@Param("tenantId")String tenantId);
+
+    WorkOrderManageDto selectOrderDetail(Integer id);
 }

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

@@ -32,5 +32,9 @@ public interface WorkOrderManageService {
      * 更新工单
      */
     int updateByPrimaryKey(WorkOrderManage workOrderManage);
+    /**
+     * 按id查询工单和详情
+     */
+    WorkOrderManageDto selectOrderDetail(Integer id);
 
 }

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

@@ -67,4 +67,11 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     public int updateByPrimaryKey(WorkOrderManage record) {
         return workOrderManageMapper.updateByPrimaryKey(record);
     }
+    /**
+     * 按id查询工单和详情
+     */
+    @Override
+    public WorkOrderManageDto selectOrderDetail(Integer id) {
+        return workOrderManageMapper.selectOrderDetail(id);
+    }
 }

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

@@ -6,6 +6,7 @@ import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.process.entity.ProcessDefinition;
 import com.huaxu.process.service.WorkFlowService;
 import com.huaxu.task.dto.PlanManageDto;
@@ -120,6 +121,16 @@ public class PlanManageController {
         }
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
+    /**
+     * APP查询任务详情
+     * @return Response对象
+     */
+    @RequestMapping(value = "selectPlanDetail", method = RequestMethod.GET)
+    @ApiOperation(value = "APP查询任务详情")
+    public AjaxMessage<PlanManageDto> selectPlanDetail(
+            @ApiParam(value = "任务id", required = true) @RequestParam Integer flowId) {
+        return new AjaxMessage<>(ResultStatus.OK,  planManageService.selectPlanDetail(flowId));
+    }
 
     @GetMapping("/plan/submit")
     @ApiOperation(value = "提交巡检计划")

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

@@ -27,4 +27,6 @@ public interface PlanManageMapper {
     Integer batchDelete(@Param("ids") List<Integer> ids);
 
     Page<PlanManageDto> findPage(IPage<PlanManageDto> page, @Param("plan") PlanManageDto planManageDto);
+
+    PlanManageDto selectPlanDetail(Integer id);
 }

operation_manager/src/main/java/com/huaxu/task/dto/PlanManageDto.java

@@ -55,5 +55,6 @@ public class PlanManageDto extends PlanManage {
     @JsonIgnore
     private String userType;
 
-
+    @ApiModelProperty(value = "json格式存储对应任务详情")
+    private String flowDetail;
 }

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

@@ -1,6 +1,7 @@
 package com.huaxu.task.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
 import org.apache.ibatis.annotations.Param;
@@ -45,4 +46,9 @@ public interface PlanManageService {
      * 批量删除
      */
     Integer batchDelete(@Param("ids") List<Integer> ids);
+
+    /**
+     * 按id查询任务和详情
+     */
+    PlanManageDto selectPlanDetail(Integer id);
 }

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

@@ -1,6 +1,7 @@
 package com.huaxu.task.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.task.dao.PlanManageMapper;
 import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
@@ -50,4 +51,9 @@ public class PlanManageServiceImpl implements PlanManageService {
     public Integer batchDelete(List<Integer> ids) {
         return planManageMapper.batchDelete(ids);
     }
+
+    @Override
+    public PlanManageDto selectPlanDetail(Integer id) {
+        return planManageMapper.selectPlanDetail(id);
+    }
 }

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.huaxu.order.dao.WorkOrderManageMapper" >
-  <resultMap id="BaseResultMap" type="com.huaxu.order.entity.WorkOrderManage" >
+  <resultMap id="BaseResultMap" type="com.huaxu.order.dto.WorkOrderManageDto" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="task_no" property="taskNo" jdbcType="VARCHAR" />
     <result column="task_desc" property="taskDesc" jdbcType="VARCHAR" />
@@ -33,6 +33,7 @@
     <result column="update_by" property="updateBy" jdbcType="VARCHAR" />
     <result column="date_update" property="dateUpdate" jdbcType="TIMESTAMP" />
     <result column="geo" property="geo" jdbcType="VARCHAR" />
+    <result column="flow_detail" property="flowDetail" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, task_no, task_desc, order_user_id, send_time, send_by, plan_finish_date, finish_date, 
@@ -424,4 +425,10 @@
      and tenant_id = #{tenantId}
     order by send_time
   </select>
+  <select id="selectOrderDetail" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select t1.*,t2.flow_detail
+    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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.huaxu.task.dao.PlanManageMapper" >
-  <resultMap id="BaseResultMap" type="com.huaxu.task.entity.PlanManage" >
+  <resultMap id="BaseResultMap" type="com.huaxu.task.dto.PlanManageDto" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="plan_id" property="planId" jdbcType="VARCHAR" />
     <result column="plan_name" property="planName" jdbcType="VARCHAR" />
@@ -28,6 +28,7 @@
     <result column="company_org_id" property="companyOrgId" jdbcType="VARCHAR" />
     <result column="department_org_id" property="departmentOrgId" jdbcType="VARCHAR" />
     <result column="task_checked" property="taskChecked" jdbcType="VARCHAR" />
+    <result column="flow_detail" property="flowDetail" jdbcType="VARCHAR" />
   </resultMap>
 
   <sql id="Base_Column_List" >
@@ -392,4 +393,11 @@
     </foreach>
   </delete>
 
+  <select id="selectPlanDetail" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select t1.*,t2.flow_detail
+    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>