Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/PersonSendOrderVO.java

@@ -27,4 +27,7 @@ public class PersonSendOrderVO implements Serializable {
 
     @ApiModelProperty(value = "派单飞手用户id")
     private Integer pilotCertificationUserId;
+
+    @ApiModelProperty(value = "是否是管理员派单")
+    private int isAdminSend;
 }

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -391,6 +391,15 @@ public class RequirementsController extends BaseController {
     public ResultBody personSendOrder(HttpServletRequest request,@RequestBody PersonSendOrderVO personSendOrderVO) {
         return requirementsService.personSendOrder(personSendOrderVO,this.getUserLoginInfoFromRedis(request).getToken());
     }
+
+    @ApiOperation(value = "管理员派单派单")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/adminSendOrder")
+    public ResultBody adminSendOrder(HttpServletRequest request,@RequestBody PersonSendOrderVO personSendOrderVO) {
+        personSendOrderVO.setIsAdminSend(1);
+        return requirementsService.personSendOrder(personSendOrderVO,this.getUserLoginInfoFromRedis(request).getToken());
+    }
+
     @ApiOperation(value = "团队派单")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("/teamSendOrder")

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -3331,7 +3331,7 @@ public class RequirementsServiceImpl implements RequirementsService {
 //        if(requirementsDao.isReSendOrder(personSendOrderVO.getRequirementsInfoId() )!= 0){
 //            return ResultBody.error("重复派单");
 //        }
-        if(requirementsDao.isLootedByPilot(personSendOrderVO.getRequirementsInfoId()) == 0){
+        if(requirementsDao.isLootedByPilot(personSendOrderVO.getRequirementsInfoId()) == 0 && personSendOrderVO.getIsAdminSend()==0){
             return ResultBody.error("该订单已经被抢，无法继续派单");
         }
         if(requirementsDao.reSendOrder(personSendOrderVO.getRequirementsInfoId(),personSendOrderVO.getPilotCertificationUserId()) == 1){