Merge remote-tracking branch 'origin/master'

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

@@ -21,5 +21,5 @@ public interface UserCenterClient {
 
 
     @PostMapping("/user/findUserIdsByUserIds")
-    List<UserEntity> findUserIdsByUserIds(Long[] ids);
+    List<UserEntity> findUserIdsByUserIds(@RequestParam("ids") Long[] ids);
 }

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

@@ -357,7 +357,10 @@ public class WorkOrderManageController {
     @ApiOperation(value = "工单派单")
     public AjaxMessage submitPlan(
             @ApiParam(value = "工单ID", required = true) @RequestParam(required = false) Integer id,
-            @ApiParam(value = "工单类型", required = true) @RequestParam(required = true) String orderType){
+            @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 orderUserId){
         LoginUser loginUser = UserUtil.getCurrentUser();
         WorkOrderManage workOrderManage = workOrderManageService.selectByPrimaryKey(id);
 //        ProcessDefinition processDefinition = workFlowService.findProcessDefinition(
@@ -388,6 +391,9 @@ public class WorkOrderManageController {
         }
         //更新计划表的流程相关字段值。
         workOrderManage.setOrderStatus(1);//已执行
+        workOrderManage.setOrderTypeId(orderTypeId);//工单类型ID
+        workOrderManage.setUrgency(urgency);//紧急程度
+        workOrderManage.setOrderUserId(orderUserId);//接单人ID
         if(loginUser.getId() != null) {
             workOrderManage.setUpdateBy(String.valueOf(loginUser.getId()));
             workOrderManage.setSendBy(String.valueOf(loginUser.getId()));//派单人
@@ -405,4 +411,10 @@ public class WorkOrderManageController {
         }
         return new AjaxMessage<>(ResultStatus.ERROR);
     }
+
+    @RequestMapping(value="batchDelete" , method = RequestMethod.DELETE)
+    @ApiOperation(value = "批量删除")
+    public AjaxMessage<Integer> batchDelete( @ApiParam(value = "工单Ids") @RequestParam List<Integer> ids){
+        return new AjaxMessage<>(ResultStatus.OK, workOrderManageService.batchDelete(ids));
+    }
 }

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

@@ -26,6 +26,8 @@ public interface WorkOrderManageMapper {
 
     int updateByPrimaryKey(WorkOrderManage record);
 
+    Integer batchDelete(@Param("ids") List<Integer> ids);
+
     List<WorkOrderManageDto> selectAppTodo( @Param("userId")Integer userId,@Param("tenantId")String tenantId);
 
     List<WorkOrderManageDto> selectAppAll( @Param("userId")Integer userId,@Param("tenantId")String tenantId);

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

@@ -50,6 +50,12 @@ public interface WorkOrderManageService {
 
     int updateByPrimaryKeySelective(WorkOrderManage record);
 
+
+    /**
+     * 批量删除
+     */
+    Integer batchDelete(@Param("ids") List<Integer> ids);
+
     /**
      * 分页查询
      */

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

@@ -9,7 +9,6 @@ import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderInfo;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.order.service.WorkOrderManageService;
-import com.huaxu.task.entity.PlanManage;
 import com.huaxu.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -95,4 +94,9 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     public int updateByPrimaryKeySelective(WorkOrderManage record) {
         return workOrderManageMapper.updateByPrimaryKeySelective(record);
     }
+
+    @Override
+    public Integer batchDelete(List<Integer> ids) {
+        return workOrderManageMapper.batchDelete(ids);
+    }
 }

operation_manager/src/main/java/com/huaxu/task/entity/UserEntity.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -17,6 +18,7 @@ import java.util.List;
  * @date 2020-10-22 17:35
  */
 @Data
+@NoArgsConstructor
 public class UserEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -582,4 +582,13 @@
     </where>
     order by t1.date_create
   </select>
+  <!--删除-->
+  <delete id="batchDelete">
+    delete from  sc_work_order_manage
+    where order_status = 0
+    and id in
+    <foreach collection="ids" item="item" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+  </delete>
 </mapper>

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -280,15 +280,10 @@ public class UserController {
     }
     @RequestMapping(value = "/findUserIdsByUserIds", method = RequestMethod.POST)
     @ResponseBody
-    public Map<Long,String> findUserIdsByUserIds(Long[] ids) {
+    public List<UserEntity> findUserIdsByUserIds(Long[] ids) {
         List list = Arrays.asList(ids.clone());
         List<UserEntity> result = userService.findUserIdsByUserIds(list);
-        Map<Long,String> userInfos = new HashMap<>();
-        for(UserEntity item : result)
-        {
-            userInfos.put(item.getId(),item.getUsername());
-        }
-        return  userInfos;
+        return  result;
     }
     @ApiOperation(value = "获取登录用户所属机构及其上级机构用户信息")
     @RequestMapping(value = "/findUserIdsForOrg", method = RequestMethod.GET)

user_center/src/main/java/com/huaxu/entity/UserEntity.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.huaxu.model.ProgramItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.beans.Transient;
 import java.io.Serializable;
@@ -21,6 +22,7 @@ import java.util.List;
  */
 @Data
 @TableName("uims_user")
+@NoArgsConstructor
 public class UserEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;