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

sql/edu_update.sql

@@ -98,4 +98,10 @@ ADD COLUMN `sunday`  varchar(64) NULL AFTER `sub_agency_id`;
 ALTER TABLE `b_opinion`
   ADD COLUMN `sub_agency_id`  varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '子任务下教学单位id' AFTER `flag`;
 
+/*子任务表新增排序*/
+ALTER TABLE `b_subtask`
+ADD COLUMN `subtask_seq`  varchar(10) NULL AFTER `grade_code`;
 
+/*子公司表新增排序*/
+ALTER TABLE `b_sub_agency`
+ADD COLUMN `sub_agency_seq`  varchar(10) NULL AFTER `status`;

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

@@ -53,7 +53,7 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
     @Select("<script>select name,business_id,status from b_subtask where 1=1 "
             + "and del_flag = 0 "
             + "and flag = 1 "
-            + "and arrange_id = #{businessId} GROUP BY name order by create_date desc"
+            + "and arrange_id = #{businessId} GROUP BY name order by subtask_seq "
             + "</script>")
     @ResultMap(value = "bSubtaskResultMap")
     List<BSubtask> queryBSubtask(String businessId);
@@ -62,7 +62,7 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
             + "left join b_agency on b_sub_agency.agency_code = b_agency.code "
             + "where 1=1 "
             + "and b_sub_agency.del_flag = 0 "
-            + "and b_sub_agency.flag = 1 and subtask_id = #{businessId}"
+            + "and b_sub_agency.flag = 1 and subtask_id = #{businessId} order by sub_agency_seq"
             + "</script>")
     @ResultMap(value = "BSubAgencyResultMap")
     List<BSubtask> queryBSubtask1(String businessId);

src/main/java/org/rcisoft/business/barrange/entity/BSubAgency.java

@@ -27,6 +27,8 @@ public class BSubAgency extends IdEntity<BSubAgency> {
 
     private String status;
 
+    private String subAgencySeq;
+
     @Transient
     private String agencyName;
 

src/main/java/org/rcisoft/business/barrange/entity/BSubtask.java

@@ -37,12 +37,16 @@ public class BSubtask  extends IdEntity<BSubtask> {
 
      private String gradeCode;
 
+     private String subtaskSeq;
+
      @Transient
      private List<BSubAgency> childList;
 
      @Transient
      private String agencyCode;
 
+
+
     public BSubtask(String businessId, String status) {
          this.businessId = businessId;
          this.status = status;

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

@@ -144,6 +144,7 @@ public class BArrangeServiceImpl implements BArrangeService {
             bSubtask.setName(subtask.getString("name"));
             bSubtask.setArrangeId(bArrange.getBusinessId());
             bSubtask.setStatus("0");
+            bSubtask.setSubtaskSeq(String.valueOf(i));
             UserUtil.setCurrentPersistOperation(bSubtask);
             subtaskList.add(bSubtask);
             JSONArray childList2 = subtask.getJSONArray("childList");
@@ -151,6 +152,7 @@ public class BArrangeServiceImpl implements BArrangeService {
             for(int j = 0; j < childList2.size() ; j++){
                 JSONObject agency = childList2.getJSONObject(j);
                 BSubAgency bSubAgency = new BSubAgency();
+                bSubAgency.setSubAgencySeq(String.valueOf(j));
                 if (agency.get("agencyCode") != null && !agency.get("agencyCode").equals("")){
                     bSubAgency.setAgencyCode(agency.getString("agencyCode"));
                     bSubAgency.setStatus("0");

src/main/resources/mapper/business/barrange/mapper/BArrangeMapper.xml

@@ -13,6 +13,7 @@
             <result column="term_code" jdbcType="VARCHAR" property="termCode"/>
             <result column="description" jdbcType="VARCHAR" property="description"/>
             <result column="status" jdbcType="VARCHAR" property="status"/>
+
     </resultMap>
     <resultMap id="BSubAgencyResultMap" type="org.rcisoft.business.barrange.entity.BSubAgency">
         <id column="business_id" jdbcType="VARCHAR" property="businessId"/>
@@ -116,24 +117,24 @@
 
         <insert id="insertBSubtask">
                 insert into b_subtask(business_id,flag,del_flag,update_by,create_by,create_date,update_date,remarks,
-                arrange_id,name,status,grade_code)
+                arrange_id,name,status,grade_code,subtask_seq)
                 values
                 <foreach collection="list" item="item" separator=",">
                         (#{item.businessId},#{item.flag},#{item.delFlag},#{item.updateBy},#{item.createBy},
                         #{item.createDate},#{item.updateDate},#{item.remarks},
                         #{item.arrangeId},#{item.name},
-                        #{item.status},#{item.gradeCode})
+                        #{item.status},#{item.gradeCode},#{item.subtaskSeq})
                 </foreach>
         </insert>
 
         <insert id="insertBSubAgency">
             insert into b_sub_agency(business_id,flag,del_flag,update_by,create_by,create_date,update_date,remarks,
-            subtask_id,agency_code,status)
+            subtask_id,agency_code,status,sub_agency_seq)
             values
             <foreach collection="list" item="item" separator=",">
                 (#{item.businessId},#{item.flag},#{item.delFlag},#{item.updateBy},#{item.createBy},
                 #{item.createDate},#{item.updateDate},#{item.remarks},
-                #{item.subtaskId},#{item.agencyCode},#{item.status})
+                #{item.subtaskId},#{item.agencyCode},#{item.status},#{item.subAgencySeq})
             </foreach>
         </insert>
 
@@ -142,12 +143,12 @@
                 select b_subtask.business_id,name,agency_code,arrange_id,b_subtask.status as subtask_status from b_subtask
                 left join b_sub_agency on b_subtask.business_id = b_sub_agency.subtask_id
                 where 1=1 and arrange_id = #{arrangeId} and agency_code = #{agencyCode}
-                and b_subtask.flag = 1 and b_subtask.del_flag = 0
+                and b_subtask.flag = 1 and b_subtask.del_flag = 0 order by subtask_seq
         </select>
 
         <select id="queryByAgencyCode3" parameterType="java.util.Map"
                 resultMap="BSubAgencyResultMap">
-          select * from b_sub_agency where 1=1 and del_flag = 0 and flag = 1 and  agency_code = #{agencyCode} and subtask_id = #{subtaskId}
+          select * from b_sub_agency where 1=1 and del_flag = 0 and flag = 1 and  agency_code = #{agencyCode} and subtask_id = #{subtaskId} order by sub_agency_seq
         </select>
 
     <resultMap id="selectSubAgencyAndOptionResultMap" type="org.rcisoft.business.barrange.entity.BSubAgency">