Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/OperationManagerMain.java

@@ -13,6 +13,5 @@ public class OperationManagerMain {
     public static void main(String[] args) {
         ApplicationContext context = SpringApplication.run(OperationManagerMain.class, args);
 
-
     }
 }

operation_manager/src/main/java/com/huaxu/client/UserCenterClient.java

@@ -4,7 +4,6 @@ import com.huaxu.config.FeignConfig;
 
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.task.entity.UserEntity;
-import lombok.NoArgsConstructor;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +27,4 @@ public interface UserCenterClient {
 
     @GetMapping("/user/findUserIdsForOrg")
     List<Long> findUserIdsForOrg();
-
-
 }

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

@@ -379,6 +379,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "工单类型编号", required = true) @RequestParam(required = false) Integer orderTypeId,
             @ApiParam(value = "工单类型名称", required = true) @RequestParam(required = true) String orderType,
             @ApiParam(value = "紧急程度", required = true) @RequestParam(required = true) String urgency,
+            @ApiParam(value = "时限", required = true) @RequestParam(required = true) String dateLimit,
             @ApiParam(value = "接单人编号", required = true) @RequestParam(required = true) String orderUserId){
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManage workOrderManage = workOrderManageService.selectByPrimaryKey(id);
@@ -408,12 +409,13 @@ public class WorkOrderManageController {
         for (String str : taskParticipator) {
             currentUsers += String.format("%s,",str);
         }
-        currentUsers+="235,";
+        currentUsers+="235,209,";
         //更新计划表的流程相关字段值。
         workOrderManage.setOrderStatus(1);//已执行
         workOrderManage.setOrderTypeId(orderTypeId);//工单类型ID
         workOrderManage.setUrgency(urgency);//紧急程度
         workOrderManage.setOrderUserId(orderUserId);//接单人ID
+        workOrderManage.setDateLimit(dateLimit);
         if(loginUser.getId() != null) {
             workOrderManage.setUpdateBy(String.valueOf(loginUser.getId()));
             workOrderManage.setSendBy(String.valueOf(loginUser.getId()));//派单人
@@ -437,7 +439,7 @@ public class WorkOrderManageController {
     public AjaxMessage<Object> selectOrderUserByOrgId(
             @ApiParam(value = "机构ID", required = true) @RequestParam(required = true) String ids){
         List<Map<String,Object>> result = new ArrayList<>();
-        AjaxMessage<List<UserEntity>> listAjaxMessage = userCenterClient.findUserIdsByOrgId(String.format("[%]",ids));
+        AjaxMessage<List<UserEntity>> listAjaxMessage = userCenterClient.findUserIdsByOrgId(String.format("[%s]",ids));
         for(UserEntity userEntity : listAjaxMessage.getData()){
             try {
                 Map<String, Object> orderStatusMap = workOrderManageService.selectOrderUserStatus(userEntity.getId().toString());
@@ -450,6 +452,10 @@ public class WorkOrderManageController {
                     map.put("status", orderStatusMap.get("S").toString());
                     map.put("address", orderStatusMap.get("X") + "," + orderStatusMap.get("Y"));
                 }
+                else {
+                    map.put("status", "");
+                    map.put("address", "");
+                }
                 map.put("distance", "");
                 result.add(map);
             }catch (Exception e){

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

@@ -227,7 +227,7 @@ public class PlanManageController {
         for (String str : taskParticipator) {
             currentUsers += String.format("%s,",str);
         }
-        currentUsers+="235,";
+        currentUsers+="235,209,";
         //更新计划表的流程相关字段值。
         planManage.setPlanStatus(1);//已执行
         if(loginUser.getId() != null) {

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

@@ -474,23 +474,23 @@
   </update>
 
   <select id="selectAppTodo" resultMap="BaseResultMap">
-    select id,task_no,send_time,address,order_type_id,create_by,update_by
+    select id,task_no,send_time,address,order_type_id,create_by,update_by,task_desc
     from sc_work_order_manage
     where find_in_set(#{userId},current_users) and tenant_id = #{tenantId}
     union
-    select id,plan_id,plan_start_date,task_area_name,task_type,create_by,update_by
+    select id,plan_id,plan_start_date,task_area_name,task_type,create_by,update_by,task_content
     from sc_plan_manage
     where find_in_set(#{userId},current_users) and tenant_id = #{tenantId}
     order by send_time
   </select>
   <select id="selectAppAll" resultMap="BaseResultMap">
-    select id,task_no,send_time,address,order_type_id,current_task_name,create_by,update_by
+    select id,task_no,send_time,address,order_type_id,current_task_name,create_by,update_by,task_desc
     from sc_work_order_manage
     where (find_in_set(#{userId},current_users)
      or 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}
     union
-    select id,plan_id,plan_start_date,task_area_name,task_type,current_task_name,create_by,update_by
+    select id,plan_id,plan_start_date,task_area_name,task_type,current_task_name,create_by,update_by,task_content
     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)))