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

# Conflicts:
#	src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

sql/new_table/2.0.3/b_term.sql

+  /*
+Navicat MySQL Data Transfer
+
+Source Server         : 127.0.0.1_3306
+Source Server Version : 50717
+Source Host           : localhost:3306
+Source Database       : edu_db
+
+Target Server Type    : MYSQL
+Target Server Version : 50717
+File Encoding         : 65001
+
+Date: 2018-05-03 16:25:33
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for b_term
+-- ----------------------------
+DROP TABLE IF EXISTS `b_term`;
+CREATE TABLE `b_term` (
+  `business_id` varchar(64) COLLATE utf8_bin NOT NULL COMMENT '主键',
+  `start_date` date DEFAULT NULL COMMENT '学期开始时间',
+  `end_date` date DEFAULT NULL COMMENT '学期结束时间',
+  `is_start` varchar(1) COLLATE utf8_bin DEFAULT '1' COMMENT '是否启动(0：未启动，1：启动)',
+  `create_by` varchar(64) COLLATE utf8_bin DEFAULT NULL COMMENT '创建者',
+  `update_by` varchar(64) COLLATE utf8_bin DEFAULT NULL COMMENT '更新者',
+  `del_flag` varchar(1) COLLATE utf8_bin DEFAULT NULL COMMENT '删除标记（0：正常；1：删除；2：审核）',
+  `flag` varchar(1) COLLATE utf8_bin DEFAULT NULL COMMENT '启用标记（0：停用；1：启用）',
+  `remarks` varchar(64) COLLATE utf8_bin DEFAULT NULL COMMENT '备注',
+  `code` varchar(30) COLLATE utf8_bin DEFAULT NULL,
+  `update_date` datetime DEFAULT NULL,
+  `create_date` datetime DEFAULT NULL,
+  `name` varchar(64) COLLATE utf8_bin DEFAULT NULL,
+  `week` varchar(5) COLLATE utf8_bin DEFAULT NULL,
+  PRIMARY KEY (`business_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+-- ----------------------------
+-- Records of b_term
+-- ----------------------------
+INSERT INTO `b_term` VALUES ('0050f6db450f49c9acb0661718dddaaf', '2018-03-01', '2018-03-16', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '0962', '2018-03-26 05:44:29', '2018-03-26 02:02:04', '09621', null);
+INSERT INTO `b_term` VALUES ('03dc80913874416f821e572bc95807d4', '2018-03-26', '2018-04-02', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '123', '2018-04-02 07:38:35', '2018-04-02 01:36:45', '123', null);
+INSERT INTO `b_term` VALUES ('1df01eb5e86c41078df79bbe73792316', '2018-03-05', '2018-03-08', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '00998877', '2018-03-27 02:54:59', '2018-03-26 07:22:09', '00998877', null);
+INSERT INTO `b_term` VALUES ('239fffb95400435e8956a6141792dde8', '2018-03-28', '2018-03-31', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '1', '2018-04-02 02:13:07', '2018-03-20 01:18:15', '1', null);
+INSERT INTO `b_term` VALUES ('378eeff2f09342fb9adf184d3a096bd0', '2018-03-20', '2018-03-27', '0', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '1232', '2018-04-02 01:24:08', '2018-03-27 07:57:16', '21321', null);
+INSERT INTO `b_term` VALUES ('3d1e4d0dc3dd44a5834280a811aae53d', '2018-03-01', '2018-03-31', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '00002018', '2018-03-27 02:44:31', '2018-03-22 06:10:07', '新版测试', null);
+INSERT INTO `b_term` VALUES ('671cf867a71244bba9b5f886da5959af', '2018-03-28', '2018-04-04', '0', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '323', '2018-04-04 03:30:04', '2018-04-04 03:30:04', '323', null);
+INSERT INTO `b_term` VALUES ('86e9e50b95ad4fc191d005a38d07c91c', '2018-03-02', '2018-07-16', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '201801', '2018-02-28 07:07:11', '2018-02-26 09:13:33', '2017-2018学年第二学期', null);
+INSERT INTO `b_term` VALUES ('997885abb5824438914c67b460777418', '2018-03-09', '2019-04-01', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '20180309TEST', '2018-03-09 01:52:18', '2018-03-09 01:52:16', '前端测试', null);
+INSERT INTO `b_term` VALUES ('acf001431ad644908bb7589320610f1b', '2018-02-05', '2018-04-27', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '20182018', '2018-03-21 06:29:19', '2018-03-19 09:03:20', '测试学期', '12');
+INSERT INTO `b_term` VALUES ('b60e37ecdede4de388b8bc99716320a6', '2018-03-03', '2018-04-10', '1', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '963', '2018-04-03 05:41:00', '2018-04-03 03:08:28', '963', null);
+INSERT INTO `b_term` VALUES ('bf5852e55bb3494c96db4ba03b5a1fea', '2018-04-02', '2018-04-08', '0', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '111111', '2018-04-08 08:51:54', '2018-04-08 08:51:54', '111111', null);
+INSERT INTO `b_term` VALUES ('f0e7e41f024f4580b8ff968405e12046', '2018-04-09', '2018-04-09', '0', '333e421d32d9425ea99afce95b603902', '333e421d32d9425ea99afce95b603902', '0', '1', null, '865', '2018-04-02 07:46:40', '2018-04-02 02:09:28', '59633想', null);

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

@@ -57,21 +57,20 @@ public class BArrangeController extends PaginationController<BArrange> {
     @ApiOperation(value="查看  集合", notes="查看单  集合")
     @ApiImplicitParam(name = "termCode", value = "学期编号", required = false, dataType = "varchar")
     @GetMapping(value = "/findAllByPagination")
-    public Result findAllByTermCodeByPagination(BArrange bArrange) {
-        return Result.builder(new PersistModel(1),
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                bArrangeServiceImpl.findAllByPagination(getPaginationUtility(),bArrange));
+    public GridModel findAllByTermCodeByPagination(BArrange bArrange) {
+        bArrangeServiceImpl.findAllByPagination(getPaginationUtility(),bArrange);
+        GridModel gridModel = getGridModelResponse();
+        return gridModel;
     }
 
     @ApiOperation(value="企业查看个人排课信息", notes="企业查看个人排课信息")
-    @ApiImplicitParam(name = "agencyCode", value = "企业编号", required = true, dataType = "varchar")
+    @ApiImplicitParams({@ApiImplicitParam(name = "agencyCode", value = "企业编号", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "status", value = "状态", required = false, dataType = "varchar")})
     @GetMapping(value = "/findAllByAgencyCodeByPagination")
-    public Result findAllByAgencyCodeByPagination(@ApiIgnore BArrange bArrange) {
-        return Result.builder(new PersistModel(1),
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                bArrangeServiceImpl.findAllByAgencyCodeByPagination(getPaginationUtility(),bArrange));
+    public GridModel findAllByAgencyCodeByPagination(@ApiIgnore BArrange bArrange) {
+        bArrangeServiceImpl.findAllByAgencyCodeByPagination(getPaginationUtility(),bArrange);
+        GridModel gridModel = getGridModelResponse();
+        return gridModel;
     }
 
     @ApiOperation(value="excel导入", notes="excel导入排课信息")

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

@@ -28,6 +28,7 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
             + "where 1=1 and agency_code = #{agencyCode} "
             + "<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if> "
             + "<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 "
             + "</script>")
     @ResultMap(value = "BaseResultMapByAgencyCode")

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

@@ -15,6 +15,8 @@ import javax.persistence.Table;
 @Table(name = "b_sub_agency")
 public class BSubAgency extends IdEntity<BSubAgency> {
 
+    private static final long serialVersionUID = -976454981149942491L;
+
     private String agencyCode;
 
     private String subtaskId;

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

@@ -20,6 +20,8 @@ import java.util.List;
 @Table(name = "b_subtask")
 public class BSubtask  extends IdEntity<BSubtask> {
 
+     private static final long serialVersionUID = 2820764374091464639L;
+
      private String arrangeId;
 
      private String name;

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

@@ -24,6 +24,9 @@ public interface BEduClassRepository extends BaseMapper<BEduClass> {
             " where 1=1  "
             + "<if test=\"delFlag !=null and delFlag != '' \">and ec.del_flag = #{delFlag} </if> "
             + "<if test=\"flag !=null and flag != '' \">and ec.flag = #{flag} </if> "
+            + "<if test=\"className !=null and className != '' \">and ec.class_name LIKE CONCAT('%',#{className},'%') </if>"
+            + "<if test=\"code !=null and code != '' \">and ec.code LIKE CONCAT('%',#{code},'%') </if>"
+            +  "order by create_date desc"
             + "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BEduClass> queryBEduClasss(BEduClass bEduClass);

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

@@ -93,11 +93,15 @@ public class BSlScheduleController extends PaginationController<BSlSchedule> {
         return getGridModelResponse();
     }
 
+    @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")})
     @GetMapping(value = "/queryBSlScheduleMore")
-    public Result listMore(String minTime,String maxTime,String termCode) throws ParseException {
+    public Result listMore(String week,String subAgencyId,String termCode) throws ParseException {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                bSlScheduleServiceImpl.queryMoreBSlSchedules(minTime,maxTime,termCode));
+                bSlScheduleServiceImpl.queryMoreBSlSchedules(week,subAgencyId,termCode));
     }
 }

src/main/java/org/rcisoft/business/bslschedule/dao/BSlScheduleRepository.java

@@ -31,11 +31,11 @@ public interface BSlScheduleRepository extends BaseMapper<BSlSchedule> {
             + "left join b_lesson on b_lesson.code = b_sl_schedule.lesson_code \n"
             + "left join b_rooms on b_rooms.code = b_sl_schedule.room_code \n"
             + "left join s_user on s_user.login_name = b_sl_schedule.tea_code \n"
-            + "where start_day between #{0} and #{1} and term_code = #{2} order by edu_class_code,start_day,seq"
+            + "where start_day between #{0} and #{1} and sub_agency_id = #{2} order by edu_class_code,start_day,seq"
             + "</script>"
     )
-    @ResultMap(value = "BaseResultMap" )
-    List<BSlSchedule> queryMoreBSlSchedules(String minTime,String maxTime,String termId);
+    @ResultMap(value = "BaseResultMap2" )
+    List<BSlSchedule> queryMoreBSlSchedules(String minTime,String maxTime,String subAgencyId);
 
     int insertList(List<BSlSchedule> bSlSchedules);
 }

src/main/java/org/rcisoft/business/bslschedule/entity/ScheduleResult.java

@@ -14,6 +14,8 @@ import java.util.List;
 @AllArgsConstructor
 public class ScheduleResult {
 
+    private String weekNum;
+
     private List<BSlSchedule> bSlSchedules;
 
     private List<BCourseCode> bCourseCodes;

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 , String termCode);
 
-    ScheduleResult queryMoreBSlSchedules(String minTime, String maxTime, String termCode);
+    ScheduleResult queryMoreBSlSchedules(String week, String subAgencyId, String termCode);
 }

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

@@ -32,10 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -267,9 +264,39 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
     }
 
     @Override
-    public ScheduleResult queryMoreBSlSchedules(String minTime, String maxTime, String termCode) {
+    public ScheduleResult queryMoreBSlSchedules(String week,String subAgencyId, String termCode) {
         ScheduleResult scheduleResult = new ScheduleResult();
-        scheduleResult.setBSlSchedules(bSlScheduleRepository.queryMoreBSlSchedules(minTime,maxTime,termCode));
+        BTerm bTerm = bTermRepository.queryBtermByCode(termCode).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("")){
+            min = map.get(week+",2");
+        }else if (map.get(week+",3") != null && !map.get(week+",3").toString().equals("")){
+            min = map.get(week+",3");
+        }else if (map.get(week+",4") != null && !map.get(week+",4").toString().equals("")){
+            min = map.get(week+",4");
+        }else if (map.get(week+",5") != null && !map.get(week+",5").toString().equals("")){
+            min = map.get(week+",5");
+        }else if (map.get(week+",6") != null && !map.get(week+",6").toString().equals("")){
+            min = map.get(week+",6");
+        }else if (map.get(week+",7") != null && !map.get(week+",7").toString().equals("")){
+            min = map.get(week+",7");
+        }
+        Calendar minCal = Calendar.getInstance();
+        minCal.setTime(min);
+        Calendar maxCal = Calendar.getInstance();
+        maxCal.setTime(min);
+        while(maxCal.get(Calendar.DAY_OF_WEEK) != Calendar.SUNDAY){
+            maxCal.add(Calendar.DATE,1);
+        }
+        SimpleDateFormat format0 = new SimpleDateFormat("yyyy-MM-dd");
+        scheduleResult.setBSlSchedules(bSlScheduleRepository.queryMoreBSlSchedules(
+                format0.format(minCal.getTime()),
+                format0.format(maxCal.getTime()),
+                subAgencyId));
         BCourseCode bCourseCode = new BCourseCode();
         bCourseCode.setFlag("1");
         bCourseCode.setDelFlag("0");

src/main/java/org/rcisoft/business/bslschedule/util/FindTime.java

@@ -15,7 +15,7 @@ public class FindTime {
         Calendar calendarEndTime = Calendar.getInstance();
         calendarEndTime.setTime(endTime);
         Calendar nowTime = calendarStartTime;
-        int i = 0;
+        int i = 1;
         while(nowTime.before(calendarEndTime)){
             if(nowTime.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY){
                 map1.put(i+",1",nowTime.getTime());

src/main/java/org/rcisoft/business/bterm/entity/BTerm.java

@@ -51,6 +51,6 @@ public class BTerm extends IdEntity<BTerm> {
     /*是否是当前学期*/
     private String current;
 
-
+    private String week;
 }
 

src/main/java/org/rcisoft/core/controller/AuthenticationController.java

@@ -71,8 +71,8 @@ public class AuthenticationController {
      * @return
      */
     @PostMapping(value = "${jwt.route.authentication.register}")
-    public Result register(SysUser addedUser){
-        authenticationServiceImpl.register(addedUser);
+    public Result register(SysUser addedUser ,String roleId){
+        authenticationServiceImpl.register(addedUser,roleId);
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,

src/main/java/org/rcisoft/core/service/AuthenticationService.java

@@ -12,7 +12,7 @@ public interface AuthenticationService {
      * 注册
      * @param userToAdd
      */
-    void register(SysUser userToAdd);
+    void register(SysUser userToAdd,String roleId);
 
     /**
      * 登录

src/main/java/org/rcisoft/core/service/impl/AuthenticationServiceImpl.java

@@ -14,6 +14,7 @@ import org.rcisoft.sys.role.dao.SysRoleRepository;
 import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.user.dao.SysUserMapper;
 import org.rcisoft.sys.user.entity.SysUser;
+import org.rcisoft.sys.user.entity.UserRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -61,7 +62,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
     @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     @Override
-    public void register(SysUser userToAdd) {
+    public void register(SysUser userToAdd , String roleId) {
         Example example = new Example(SysUser.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("loginName", userToAdd.getLoginName());
@@ -71,6 +72,9 @@ public class AuthenticationServiceImpl implements AuthenticationService {
         userToAdd.setPassword(passwordEncoder.encode(userToAdd.getPassword()));
         userToAdd.setCommonBusinessId();
         int result = sysUserMapper.insertSelective(userToAdd);
+        UserRole userRole = new UserRole(userToAdd.getBusinessId(),roleId);
+        userRole.setCommonBusinessId();
+        sysUserMapper.insertUserRole(userRole);
         if(result==0)
             throw new ServiceException(ResultExceptionEnum.SAVE_ERROR);
     }

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -30,6 +30,7 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
     @Select("<script>select * from s_role where flag = '1' and del_flag = '0' "
     		+ " <if test=\"code !=null and code != ''\">and code = #{code} </if> "
             + " <if test=\"roleName !=null and roleName != ''\">and role_name = #{roleName} </if> "
+            + " order by create_date desc"
     		+ "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<SysRole> queryRoles(SysRole sysRole);

src/main/resources/mapper/business/bterm/mapper/BTermMapper.xml

@@ -14,5 +14,6 @@
         <result column="flag" jdbcType="VARCHAR" property="flag"/>
         <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
         <result column="code" jdbcType="VARCHAR" property="code"/>
+        <result column="week" jdbcType="VARCHAR" property="week" />
     </resultMap>
 </mapper>
\ No newline at end of file