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/dao/BArrangeRepository.java

@@ -11,6 +11,7 @@ import org.rcisoft.business.barrange.entity.BArrange;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
+import springfox.documentation.service.ApiListing;
 
 
 import java.util.ArrayList;
@@ -149,5 +150,9 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
 
     @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

@@ -8,6 +8,7 @@ import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.aop.PageUtil;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by  on 2018-4-19 10:28:59.
@@ -56,7 +57,7 @@ public interface BArrangeService {
 
     PersistModel release(String businessId);
 
-    BSubAgency selectSubAgencyAndOption(String subAgencyId);
+    Map<String,Object> selectSubAgencyAndOption(String subAgencyId);
 
     PersistModel submit(String businessId);
 

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

@@ -28,6 +28,8 @@ import org.rcisoft.business.brooms.entity.BRooms;
 import org.rcisoft.business.bsl.dao.BSlRepository;
 import org.rcisoft.business.bsl.entity.BSl;
 import org.rcisoft.business.bslschedule.dao.BSlScheduleRepository;
+import org.rcisoft.business.bteacher.dao.BTeacherRepository;
+import org.rcisoft.business.bteacher.entity.BTeacher;
 import org.rcisoft.business.bterm.dao.BTermRepository;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
@@ -46,7 +48,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by  on 2018-4-19 10:28:59.
@@ -95,6 +99,9 @@ public class BArrangeServiceImpl implements BArrangeService {
     @Autowired
     private BClassRepository bClassRepository;
 
+    @Autowired
+    private BTeacherRepository bTeacherRepository;
+
     /**
     * 保存 bArrange
     * @param json
@@ -416,8 +423,15 @@ public class BArrangeServiceImpl implements BArrangeService {
         int line = bArrangeRepository.updateByPrimaryKeySelective(bArrange);
         return new PersistModel(line);
     }
-    public BSubAgency selectSubAgencyAndOption(String subAgencyId) {
-        return bArrangeRepository.selectSubAgencyAndOption(subAgencyId);
+    public Map<String,Object> selectSubAgencyAndOption(String subAgencyId) {
+        Map<String,Object> map = new HashMap<>();
+        BSubAgency bSubAgency = bArrangeRepository.selectSubAgencyAndOption(subAgencyId);
+        List<BTeacher> bTeachers = bTeacherRepository.selectTeacherBySubAgencyId(subAgencyId);
+        List<BEduClass> bEduClasses = bEduClassRepository.selectClassBySubAgencyId(subAgencyId);
+        map.put("bSubAgency",bSubAgency);
+        map.put("teacherList",bTeachers);
+        map.put("classList",bEduClasses);
+        return map;
     }
 
     /**

src/main/java/org/rcisoft/business/bcoursecode/dao/BCourseCodeRepository.java

@@ -22,6 +22,7 @@ public interface BCourseCodeRepository extends BaseMapper<BCourseCode> {
     *
     */
     @Select("<script>select * from b_course_code where 1=1 "
+            + "<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
             + "<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if> "
             + "order by seq asc</script>")
     @ResultMap(value = "BaseResultMap" )

src/main/java/org/rcisoft/business/beduclass/dao/BEduClassRepository.java

@@ -39,5 +39,10 @@ public interface BEduClassRepository extends BaseMapper<BEduClass> {
             + "</script>")
     @ResultMap(value = "BaseResultMap" )
     BEduClass selectDetalInfo(String id);
+
+    @Select("SELECT class_name,class_code from b_schedule_dto " +
+            "left JOIN b_edu_class on b_schedule_dto.class_code = b_edu_class.code where sub_agency_id = #{subAgencyId} GROUP BY `code` ")
+    @ResultMap(value = "SmallBaseResultMap" )
+    List<BEduClass> selectClassBySubAgencyId(String subAgencyId);
 }
 

src/main/java/org/rcisoft/business/bslschedule/controller/BSlScheduleController.java

@@ -95,13 +95,13 @@ public class BSlScheduleController extends PaginationController<BSlSchedule> {
 
     @ApiOperation(value="查周视图", notes="查周视图")
     @ApiImplicitParams({@ApiImplicitParam(name = "week", value = "周次", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "subAgencyId", value = "subAgencyId", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "termCode", value = "学期编号", required = true, dataType = "varchar")})
+            @ApiImplicitParam(name = "termCode", value = "学期编号", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "subAgencyId", value = "subAgencyId", required = true, dataType = "varchar")})
     @GetMapping(value = "/queryBSlScheduleMore")
-    public Result listMore(String week,String subAgencyId,String termCode) throws ParseException {
+    public Result listMore(String week,String termCode,String subAgencyId) throws ParseException {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                bSlScheduleServiceImpl.queryMoreBSlSchedules(week,subAgencyId,termCode));
+                bSlScheduleServiceImpl.queryMoreBSlSchedules(week,termCode,subAgencyId));
     }
 }

src/main/java/org/rcisoft/business/bslschedule/service/BSlScheduleService.java

@@ -53,5 +53,5 @@ public interface BSlScheduleService {
 
     PersistModel importFile(HSSFWorkbook hwb, String token , String subAgencyId);
 
-    ScheduleResult queryMoreBSlSchedules(String week, String subAgencyId, String termCode);
+    ScheduleResult queryMoreBSlSchedules(String week,String termCode1, String subAgencyId);
 }

src/main/java/org/rcisoft/business/bslschedule/service/impl/BSlScheduleServiceImpl.java

@@ -320,12 +320,13 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
     }
 
     @Override
-    public ScheduleResult queryMoreBSlSchedules(String week,String subAgencyId, String termCode) {
+    public ScheduleResult queryMoreBSlSchedules(String week,String termCode1 , String subAgencyId) {
         ScheduleResult scheduleResult = new ScheduleResult();
-        BTerm bTerm = bTermRepository.queryBtermByCode(termCode).get(0);
+        BTerm bTerm = bTermRepository.queryBtermByCode(termCode1).get(0);
         scheduleResult.setWeekNum(bTerm.getWeek());
         Map<String,Date> map = FindTime.findTime(bTerm.getStartDate(),bTerm.getEndDate());
         Date min = new Date();
+        //按周获取时间段
         if(map.get(week+",1") != null && !map.get(week+",1").toString().equals("")){
             min = map.get(week+",1");
         }else if (map.get(week+",2") != null && !map.get(week+",2").toString().equals("")){

src/main/java/org/rcisoft/business/bteacher/dao/BTeacherRepository.java

@@ -70,5 +70,10 @@ public interface BTeacherRepository extends BaseMapper<BTeacher> {
             "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BTeacher> queryTeacherWithReCommend();
+
+    @Select("SELECT name,teacher_code from b_schedule_dto " +
+            "left JOIN s_user on b_schedule_dto.teacher_code = s_user.login_name where sub_agency_id = #{subAgencyId} GROUP BY `name` ")
+    @ResultMap(value = "SmallBaseResultMap" )
+    List<BTeacher> selectTeacherBySubAgencyId(String subAgencyId);
 }
 

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ server:
 druid:
   url: jdbc:mysql://192.168.1.125:13318/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   username: root
-  password: root
+  password: 123456
   initial-size: 1
   min-idle: 1
   max-active: 20

src/main/resources/mapper/business/beduclass/mapper/BEduClassMapper.xml

@@ -17,6 +17,9 @@
             <result column="classes_id" jdbcType="VARCHAR" property="classesId"/>
             <result column="grade_id" jdbcType="VARCHAR" property="gradeId"/>
     </resultMap>
-
+        <resultMap id="SmallBaseResultMap" type="org.rcisoft.business.beduclass.entity.BEduClass">
+                <result column="class_code" jdbcType="VARCHAR" property="code"/>
+                <result column="class_name" jdbcType="VARCHAR" property="className"/>
+        </resultMap>
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
 </mapper>
\ No newline at end of file

src/main/resources/mapper/business/bteacher/mapper/BTeacherMapper.xml

@@ -18,4 +18,8 @@
         <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
         <result column="agency_code" jdbcType="VARCHAR" property="agencyCode"/>
     </resultMap>
+    <resultMap id="SmallBaseResultMap" type="org.rcisoft.business.bteacher.entity.BTeacher">
+        <result column="teacher_code" jdbcType="VARCHAR" property="code"/>
+        <result column="name" jdbcType="VARCHAR" property="name" />
+    </resultMap>
 </mapper>
\ No newline at end of file