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

# Conflicts:
#	release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 2632eee6cf0c4555d550d0e1697c28b8f0c4da5e
+  newTag: 456fc6539a2c95e94da9d51c6e24787637814f88

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

@@ -383,6 +383,12 @@ 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("/teamSendOrder")
+    public ResultBody teamSendOrder(@ApiParam(value = "父订单id")@RequestParam Integer fatherRequireId,@ApiParam(value = "团队管理员的id")@RequestParam Integer messageId) {
+        return requirementsService.teamSendOrder(fatherRequireId,messageId);
+    }
 
     @ApiOperation(value = "我的派单列表——待确认")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -418,6 +418,10 @@ public interface RequirementsDao {
      * 根据飞手进行派单操作
      */
     Integer personSendOrder(PersonSendOrderDO personSendOrderDO);
+    /**
+     * 查询父订单下面的所有子订单id
+     */
+    List<Integer> selectAllSuborder(Integer fatherRequireId);
 
     /**
      * 修改info表中的状态

release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java

@@ -156,6 +156,11 @@ public interface RequirementsService {
     ResultBody personSendOrder(PersonSendOrderVO personSendOrderVO,String token);
 
     /**
+     * 根据团队进行派单操作
+     */
+    ResultBody teamSendOrder(Integer fatherRequireId,Integer messageId);
+
+    /**
      * 飞手确认接单
      */
     ResultBody orderConfirmationByPilot(Integer id,Integer status);

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

@@ -3346,6 +3346,22 @@ public class RequirementsServiceImpl implements RequirementsService {
     }
 
     @Override
+    public ResultBody teamSendOrder(Integer fatherRequireId, Integer messageId) {
+        // 查询所有的子订单id
+        List<Integer> ids = requirementsDao.selectAllSuborder(fatherRequireId);
+        PersonSendOrderDO personSendOrderDO = null;
+        for (Integer id : ids) {
+            personSendOrderDO = new PersonSendOrderDO();
+            personSendOrderDO.setRequirementsInfoId(id);
+            personSendOrderDO.setTeamUserId(messageId);
+            requirementsDao.personSendOrder(personSendOrderDO);
+            // 修改info表中的状态为13派单中
+            requirementsDao.updateInfoStatus(id,13);
+        }
+        return ResultBody.success("等待团队管理员确认");
+    }
+
+    @Override
     public ResultBody orderConfirmationByPilot(Integer id,Integer status) {
         if(requirementsDao.isReConfirm(id) != 0){
             return ResultBody.error("重复确认");

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -2041,6 +2041,11 @@
             and  ri.require_description like CONCAT("%",#{requireDescription},"%")
         </if>
     </select>
+    <select id="selectAllSuborder" resultType="java.lang.Integer">
+        select id
+        from requirements_info
+        where father_require_id = #{fatherRequireId} and is_deleted = 0
+    </select>
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>