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

# Conflicts:
#	src/main/java/org/rcisoft/business/bopinion/service/impl/BOpinionServiceImpl.java

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

@@ -141,5 +141,16 @@ public class BArrangeController extends PaginationController<BArrange> {
                 businessId);
     }
 
+    @ApiOperation(value="按照subAgencyId查具体信息与审核内容", notes="按照subAgencyId查具体信息与审核内容")
+    @ApiImplicitParams({@ApiImplicitParam(name = "subAgencyId", value = "subAgencyId", required = true, dataType = "varchar")})
+    @GetMapping(value = "/selectSubAgencyAndOption")
+    public Result selectSubAgencyAndOption(String subAgencyId) {
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                bArrangeServiceImpl.selectSubAgencyAndOption(subAgencyId));
+    }
+
+
 
 }

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

@@ -119,5 +119,16 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
             + "</script>")
     @ResultMap(value = "BaseResultMap")
     String selectTermCodeByBSubtaskId(String bSubAgencyId);
+
+    @Select("<script>select *,b_term.`name` as term_name,b_subtask.`name` as subtask_name,b_sub_agency.`status` as sub_agency_status from b_sub_agency "
+            + "LEFT JOIN b_subtask on b_sub_agency.subtask_id = b_subtask.business_id "
+            + "LEFT JOIN b_arrange on b_subtask.arrange_id = b_arrange.business_id "
+            + "LEFT JOIN b_term on b_arrange.term_code = b_term.`code` "
+            + "WHERE b_sub_agency.business_id =  #{bSubAgencyId} "
+            + "</script>")
+    @ResultMap(value = "selectSubAgencyAndOptionResultMap")
+    BSubAgency selectSubAgencyAndOption(String bSubAgencyId);
+
+
 }
 

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

@@ -4,11 +4,13 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.rcisoft.business.bagency.entity.BAgency;
+import org.rcisoft.business.bopinion.entity.BOpinion;
 import org.rcisoft.core.entity.IdEntity;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 @Entity
 @Data
@@ -28,6 +30,18 @@ public class BSubAgency extends IdEntity<BSubAgency> {
     @Transient
     private String agencyName;
 
+    @Transient
+    private String termName;
+
+    @Transient
+    private String termCode;
+
+    @Transient
+    private String subtaskName;
+
+    @Transient
+    private List<BOpinion> childList;
+
     public BSubAgency(String businessId, String status) {
         this.businessId = businessId;
         this.status = status;

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

@@ -2,6 +2,7 @@ package org.rcisoft.business.barrange.service;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.rcisoft.business.barrange.entity.BArrange;
+import org.rcisoft.business.barrange.entity.BSubAgency;
 import org.rcisoft.business.barrange.entity.ScheduleDto;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.aop.PageUtil;
@@ -52,4 +53,6 @@ public interface BArrangeService {
     List<ScheduleDto> queryDtoByMany(String agencyCode,String name,String termCode,String teacherCode);
 
     int changeArrangeToSl(String businessId, String subTaskId ,String termCode);
+
+    BSubAgency selectSubAgencyAndOption(String subAgencyId);
 }

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

@@ -409,4 +409,9 @@ public class BArrangeServiceImpl implements BArrangeService {
         return result;
     }
 
+    @Override
+    public BSubAgency selectSubAgencyAndOption(String subAgencyId) {
+        return bArrangeRepository.selectSubAgencyAndOption(subAgencyId);
+    }
+
 }

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -26,9 +26,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> queryUserByName(String username);
 
     @Insert("<script>INSERT INTO s_user" +
-            "(create_date,update_date,create_by,update_by,remarks,del_flag,flag,business_id,login_name,password,name,sex,git_lab_id,git_lab_username,git_lab_impression_token,head_pic,email,agency_code)VALUES" +
+            "(create_date,update_date,create_by,update_by,remarks,del_flag,flag,business_id,login_name,password,name,sex,git_lab_id,git_lab_username,git_lab_impression_token,head_pic,email)VALUES" +
             "<foreach collection=\"list\" item=\"item\" separator=\",\">" +
-            "( #{item.createDate},#{item.updateDate},#{item.createBy},#{item.updateBy},#{item.remarks},#{item.delFlag},#{item.flag},#{item.businessId},#{item.loginName},#{item.password},#{item.name},#{item.sex},#{item.gitLabId},#{item.gitLabUsername},#{item.gitLabImpressionToken},#{item.headPic},#{item.email},#{item.agencyCode})" +
+            "( #{item.createDate},#{item.updateDate},#{item.createBy},#{item.updateBy},#{item.remarks},#{item.delFlag},#{item.flag},#{item.businessId},#{item.loginName},#{item.password},#{item.name},#{item.sex},#{item.gitLabId},#{item.gitLabUsername},#{item.gitLabImpressionToken},#{item.headPic},#{item.email})" +
             "</foreach></script>")
     int insertList(List<SysUser> users);
 

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

@@ -143,4 +143,16 @@
                 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>
+
+    <resultMap id="selectSubAgencyAndOptionResultMap" type="org.rcisoft.business.barrange.entity.BSubAgency">
+        <id column="business_id" jdbcType="VARCHAR" property="businessId"/>
+        <result column="term_code" jdbcType="VARCHAR" property="termCode"/>
+        <result column="term_name" jdbcType="VARCHAR" property="termName"/>
+        <result column="sub_agency_status" jdbcType="VARCHAR" property="status"/>
+        <result column="subtask_id" jdbcType="VARCHAR" property="subtaskId" />
+        <result column="subtask_name" jdbcType="VARCHAR" property="subtaskName" />
+        <collection property="childList" javaType="ArrayList" column="business_id" ofType="org.rcisoft.business.bopinion.entity.BOpinion"
+                    select="org.rcisoft.business.bopinion.dao.BOpinionRepository.queryOpinionBySlId"
+        />
+    </resultMap>
 </mapper>
\ No newline at end of file