绩效考核

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

@@ -129,4 +129,13 @@ public interface WorkOrderManageService {
      * 工单时长月统计
      */
     List<StatisticsDto> orderDurationStatistics(@Param("order") WorkOrderManageDto workOrderManageDto);
+
+    /**
+    * @Author lihui
+    * @Description 查询个人工单信息
+    * @Date 9:13 2021/5/13
+    * @Param [page, userId, startTime, endTime]
+    * @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);
 }

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

@@ -250,6 +250,12 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
         return result;
     }
 
+    @Override
+    public Page<WorkOrderManageDto> selectByTime(IPage<WorkOrderManageDto> page, Integer userId, String startTime, String endTime) {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        return workOrderManageMapper.selectByTime(page, userId, currentUser.getTenantId(), startTime, endTime);
+    }
+
     /**
      *获取某月有多少天
      */

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

@@ -1179,4 +1179,23 @@
         )a ) b
       group by duration
   </select>
+
+  <select id="selectByTime" resultMap="BaseResultMap">
+    select distinct t1.id,task_no,send_time,address,order_type_id,current_task_name,t1.create_by,t1.update_by,task_desc,order_status,in_process_status,t1.plan_finish_date,t1.finish_date,t1.date_create,t1.date_limit
+    from sc_work_order_manage t1
+           left join sc_work_flow_log t2 ON t1.id=t2.flow_id and flow_type=2 and find_in_set(#{userId},handle_user_id) and left(flow_result,2)='拒单'
+    where (find_in_set(#{userId},current_users)
+       or t1.id in(select flow_id from sc_work_flow_log where flow_type=2 and find_in_set(#{userId},handle_user_id)))
+      and tenant_id = #{tenantId}
+      and (t2.id is null or t1.order_user_id=t2.handle_user_id)
+      and t1.date_create between #{startTime} and #{endTime}
+    union
+    select id,plan_id,plan_date,task_area_name,task_type,current_task_name,create_by,update_by,task_content,plan_status,in_process_status,plan_end_date,finish_date,date_create,"0"
+    from sc_plan_manage
+    where (find_in_set(#{userId},current_users)
+      or id in(select flow_id from sc_work_flow_log where flow_type=1 and find_in_set(#{userId},handle_user_id)))
+      and tenant_id = #{tenantId}
+      and date_create between #{startTime} and #{endTime}
+    order by send_time desc
+  </select>
 </mapper>

user_center/src/main/java/com/huaxu/config/ResourceServerConfig.java

@@ -17,7 +17,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .and()
                 .authorizeRequests()
                 .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**",
-                       "/user/findUserIdsByPermissonOrg",
+                       "/user/findUserIdsByPermissonOrg","/user/findUserIdsByUserIds",
                        "/v2/**")
                 .permitAll() //配置不需要身份认证的请求路径
                 .anyRequest().authenticated() //其他所有访问路径都需要身份认证