合并代码

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

@@ -318,7 +318,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "状态(0:事件隐患;null:所有工单;1:执行中;2:完成)", required = false) @RequestParam(required = false) Integer orderStatus,
             @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水)", required = false) @RequestParam(required = false) Integer orderTypeId,
             @ApiParam(value = "事件类型(1:运维上报,2:用户上报,3:设备告警)", required = false) @RequestParam(required = false) Integer eventType,
-            @ApiParam(value = "事件隐患ID", required = false) @RequestParam(required = false) String taskNo,
+            @ApiParam(value = "单号", required = false) @RequestParam(required = false) String taskNo,
             @ApiParam(value = "计划起始日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String startDate,
             @ApiParam(value = "计划截至日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String endDate){
         WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
@@ -350,7 +350,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水)", required = false) @RequestParam(required = false) Integer orderTypeId,
-            @ApiParam(value = "工单ID", required = false) @RequestParam(required = false) String taskNo,
+            @ApiParam(value = "单号", required = false) @RequestParam(required = false) String taskNo,
             @ApiParam(value = "计划起始日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String startDate,
             @ApiParam(value = "计划截至日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String endDate){
         WorkOrderManageDto workOrderManageDto = new WorkOrderManageDto();
@@ -360,6 +360,7 @@ public class WorkOrderManageController {
             workOrderManageDto.setStartDate(startDate);
             workOrderManageDto.setEndDate(endDate);
         }
+        workOrderManageDto.setTaskNo(taskNo);
         workOrderManageDto.setOrderTypeId(orderTypeId);
         if(loginUser.getId() != null) {
             workOrderManageDto.setCurrentUsers(String.format("%s,", loginUser.getId()));

operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderManage.java

@@ -71,6 +71,9 @@ public class WorkOrderManage implements Serializable {
     @ApiModelProperty(value = "1运维上报、2用户上报、3设备告警")
     private Integer eventType;
 
+    @ApiModelProperty(value = "1运维上报、2用户上报、3设备告警")
+    private String eventTypeName;
+
     @ApiModelProperty(value = "工单类型编号")
     private Integer orderTypeId;
 

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

@@ -20,6 +20,7 @@
     <result column="department_org_id" property="departmentOrgId" jdbcType="VARCHAR" />
     <result column="order_status" property="orderStatus" jdbcType="INTEGER" />
     <result column="event_type" property="eventType" jdbcType="INTEGER" />
+    <result column="event_type_name" property="eventTypeName" jdbcType="VARCHAR" />
     <result column="order_type_id" property="orderTypeId" jdbcType="INTEGER" />
     <result column="order_pid" property="orderPid" jdbcType="VARCHAR" />
     <result column="tenant_id" property="tenantId" jdbcType="VARCHAR" />
@@ -512,14 +513,13 @@
   </foreach>
   </insert>
 
-
-
   <!--分页查询-->
   <select id="findPage" 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, t1.order_type_id, t1.order_pid, t1.tenant_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,
     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
@@ -551,9 +551,9 @@
             #{item.orgId}
           </foreach>
         </if>
-        <if test="plan.permissonType == 1">
+        <if test="order.permissonType == 1">
           and t1.COMPANY_ORG_ID in
-          <foreach collection="plan.programItems" item="item" open="(" close=")" separator=",">
+          <foreach collection="order.programItems" item="item" open="(" close=")" separator=",">
             #{item.orgId}
           </foreach>
           and (t1.DEPT_ORG_ID is null or t1.DEPT_ORG_ID =0)
@@ -566,13 +566,13 @@
         and t1.order_status != 0
       </if>
       <if test="order.orderTypeId != null">
-        and t1.order_type_id = #{plan.orderTypeId,jdbcType=INTEGER}
+        and t1.order_type_id = #{order.orderTypeId,jdbcType=INTEGER}
       </if>
       <if test="order.eventType != null">
         and t1.event_type = #{order.eventType,jdbcType=INTEGER}
       </if>
       <if test="order.currentUsers != null">
-        and  INSTR(t1.current_users,#{plan.currentUsers})
+        and  INSTR(t1.current_users,#{order.currentUsers})
       </if>
       <if test="order.startDate != null and order.endDate != null">
         and t1.date_create &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%c-%d')