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

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

@@ -37,7 +37,6 @@ public class BArrangeController extends PaginationController<BArrange> {
     //@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
     @PostMapping(value = "/add")
     public Result add(String json) {
-        System.out.println(json);
         return Result.builder(bArrangeServiceImpl.save(json),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,

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

@@ -32,6 +32,7 @@ import org.rcisoft.business.bteacher.dao.BTeacherRepository;
 import org.rcisoft.business.bteacher.entity.BTeacher;
 import org.rcisoft.business.bterm.dao.BTermRepository;
 import org.rcisoft.business.bterm.entity.BTerm;
+import org.rcisoft.business.bterm.utils.Week;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
@@ -674,11 +675,18 @@ public class BArrangeServiceImpl implements BArrangeService {
     public Map<String,Object> selectSubAgencyAndOption(String subAgencyId) {
         Map<String,Object> map = new HashMap<>();
         BSubAgency bSubAgency = bArrangeRepository.selectSubAgencyAndOption(subAgencyId);
+        BTerm bTerm = bTermRepository.queryBtermByCode(bSubAgency.getTermCode()).get(0);
+        Map<String,Object> weeks = Week.buildWeek(bTerm.getStartDate(),bTerm.getEndDate());
         List<BTeacher> bTeachers = bTeacherRepository.selectTeacherBySubAgencyId(subAgencyId);
         List<BEduClass> bEduClasses = bEduClassRepository.selectClassBySubAgencyId(subAgencyId);
         map.put("bSubAgency",bSubAgency);
         map.put("teacherList",bTeachers);
         map.put("classList",bEduClasses);
+        int currentlyWeek = (int) weeks.get("currentlyWeek");
+        if(currentlyWeek == 0){
+            currentlyWeek = -1;
+        }
+        map.put("currentlyWeek",currentlyWeek);
         return map;
     }
 

src/main/resources/application-dev.yml

@@ -11,7 +11,9 @@ server:
 #    org.springframework.web: DEBUG
 
 druid:
-  url: jdbc:mysql://192.168.1.125:13318/new_edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+#  url: jdbc:mysql://192.168.1.125:13318/new_edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+  url: jdbc:mysql://127.0.0.1:3306/new_edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+
   username: root
   password: 123456
   initial-size: 1