Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

# Conflicts:
#	src/main/java/org/rcisoft/business/barrange/dao/BArrangeRepository.java

src/main/java/org/rcisoft/business/barrange/controller/BArrangeController.java

@@ -150,7 +150,17 @@ public class BArrangeController extends PaginationController<BArrange> {
                 bArrangeServiceImpl.selectSubAgencyAndOption(subAgencyId));
     }
 
-
+    @ApiOperation(value="子任务提交", notes="子任务提交")
+    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar"),})
+    @PutMapping("/submit")
+    @PreAuthorize("hasRole('ROLE_1001')")
+    public Result updateSubAgency(String businessId) {
+        PersistModel data = bArrangeServiceImpl.submit(businessId);
+        return Result.builder(data,
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                businessId);
+    }
 
     @ApiOperation(value="发布", notes="发布")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar"),})

src/main/java/org/rcisoft/business/barrange/dao/BArrangeRepository.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.barrange.dao;
 
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 import org.rcisoft.business.barrange.entity.BSubAgency;
 import org.rcisoft.business.barrange.entity.BSubtask;
 import org.rcisoft.business.barrange.entity.ScheduleDto;
@@ -31,6 +32,7 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
             + "<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
             + "<if test=\"status !=null and status != '' \">and b_sub_agency.status = #{status} </if> "
             + "GROUP BY b_arrange.business_id "
+            + "order by b_arrange.status"
             + "</script>")
     @ResultMap(value = "BaseResultMapByAgencyCode")
     List<BArrange> queryByAgencyCode(BArrange bArrange);
@@ -47,6 +49,7 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
             + "<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
             + "<if test=\"termCode !=null and termCode != '' \">and term_code = #{termCode} </if> "
             + "<if test=\"status !=null and status != '' \">and status = #{status} </if> "
+            + "order by b_arrange.status"
             + "</script>")
     @ResultMap(value = "BaseResultMap2")
     List<BArrange> queryAll(BArrange bArrange);
@@ -136,6 +139,14 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
     @ResultMap(value = "selectSubAgencyAndOptionResultMap")
     BSubAgency selectSubAgencyAndOption(String bSubAgencyId);
 
+    /**
+     * 子任务提交 修改status 0 -> 2
+     * @param businessId
+     * @return
+     */
+    @Update("update b_sub_agency set status = 2 where business_id = #{0}")
+    int submitSubAgency(String businessId);
+
     @Delete("delete from b_schedule_dto where sub_agency_id = #{bSubAgencyId}")
     int avoidRepeatDto(String bSubAgencyId);
 }

src/main/java/org/rcisoft/business/barrange/service/BArrangeService.java

@@ -57,4 +57,7 @@ public interface BArrangeService {
     PersistModel release(String businessId);
 
     BSubAgency selectSubAgencyAndOption(String subAgencyId);
+
+    PersistModel submit(String businessId);
+
 }

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -420,4 +420,14 @@ public class BArrangeServiceImpl implements BArrangeService {
         return bArrangeRepository.selectSubAgencyAndOption(subAgencyId);
     }
 
+    /**
+     * 子任务提交 修改subAgency的status 0 -> 2
+     * @param businessId
+     * @return
+     */
+    @Override
+    public PersistModel submit(String businessId) {
+        return new PersistModel(1, bArrangeRepository.submitSubAgency(businessId));
+    }
+
 }