校历修改

src/main/java/org/rcisoft/business/bagency/controller/BAgencyController.java

@@ -56,14 +56,14 @@ public class BAgencyController extends PaginationController<BAgency> {
                 businessId);
     }
 
-    @ApiOperation(value="查询教学单位下是否有用户", notes="查询教学单位下是否有用户")
-    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
-    @GetMapping(value = "/selectBAgencyHaveUser")
-    public String HaveUserOrNot(@ApiIgnore BAgency bAgency) {
-        bAgency.setCreateBy(UserUtil.getUserInfoProp(getToken(), UserUtil.USER_ID));
-        String result = bAgencyServiceImpl.findBAgencyHaveUserOrNot(getPaginationUtility(), bAgency);
-        return result;
-    }
+//    @ApiOperation(value="查询教学单位下是否有用户", notes="查询教学单位下是否有用户")
+//    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
+//    @GetMapping(value = "/selectBAgencyHaveUser")
+//    public String HaveUserOrNot(@ApiIgnore BAgency bAgency) {
+//        bAgency.setCreateBy(UserUtil.getUserInfoProp(getToken(), UserUtil.USER_ID));
+//        String result = bAgencyServiceImpl.findBAgencyHaveUserOrNot(getPaginationUtility(), bAgency);
+//        return result;
+//    }
 
     @ApiOperation(value="修改教学单位", notes="修改教学单位")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar"),

src/main/java/org/rcisoft/business/bagency/service/BAgencyService.java

@@ -54,8 +54,8 @@ public interface BAgencyService {
      * @param bAgency
      * @return
      */
-    String findBAgencyHaveUserOrNot(PageUtil paginationUtility,
-                                           BAgency bAgency);
+//    String findBAgencyHaveUserOrNot(PageUtil paginationUtility,
+//                                           BAgency bAgency);
 
 
     List<BAgency> queryMoreByPagination(PageUtil paginationUtility,

src/main/java/org/rcisoft/business/bagency/service/impl/BAgencyServiceImpl.java

@@ -64,14 +64,14 @@ public class BAgencyServiceImpl implements BAgencyService {
         return new PersistModel(line);
     }
 
-    public String findBAgencyHaveUserOrNot(PageUtil paginationUtility, BAgency bAgency){
-        List<BAgency> teacherAgency = bAgencyRepository.queryTeacherAgency(bAgency.getBusinessId());
-        List<BAgency> companyAgency = bAgencyRepository.queryCompanyAgency(bAgency.getBusinessId());
-        if(teacherAgency.size()>0||companyAgency.size()>0){
-            return "教学单位下存在用户";
-        }
-        return "教学单位下不存在用户";
-    }
+//    public String findBAgencyHaveUserOrNot(PageUtil paginationUtility, BAgency bAgency){
+//        List<BAgency> teacherAgency = bAgencyRepository.queryTeacherAgency(bAgency.getBusinessId());
+//        List<BAgency> companyAgency = bAgencyRepository.queryCompanyAgency(bAgency.getBusinessId());
+//        if(teacherAgency.size()>0||companyAgency.size()>0){
+//            return "教学单位下存在用户";
+//        }
+//        return "教学单位下不存在用户";
+//    }
 
 
     /**
@@ -82,30 +82,42 @@ public class BAgencyServiceImpl implements BAgencyService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
     public PersistModel remove(BAgency bAgency){
-        //利用教学单位code删除所对应的teacher和company的字段
-        BAgency bagency = bAgencyRepository.selectOneBagency(bAgency.getBusinessId());
-        String code = bagency.getCode();
-        BTeacher bTeacher = new BTeacher();
-        BCompany bCompany = new BCompany();
-        bTeacher.setAgencyCode(code);
-        bCompany.setAgencyCode(code);
-        //根据agency_code查询b_teacher
-        List<BTeacher> teacherList = bTeacherRepository.selectByAgencyCode(bTeacher);
-        //根据agency_code查询b_company
-        List<BCompany> companyList = bCompanyRepository.selectByAgencyCode(bCompany);
-        //删除b_teacher
-        bTeacherRepository.batchDeleteBycode(teacherList);
-        //删除b_company
-        bCompanyRepository.batchDeleteBycode(companyList);
-        //根据code查询s_user
-        List<SysUser> usersByTeacher = sysUserMapper.selectByTeacherCode(teacherList);
-        List<SysUser> usersByCompany = sysUserMapper.selectByCompanyCode(companyList);
-        //删除s_user
-        sysUserMapper.batchDeleteByTeacherCode(teacherList);
-        sysUserMapper.batchDeleteByCompanyCode(companyList);
-        //删除s_r_user_role
-        sysUserMapper.deleteTeacherUserRole(usersByTeacher);
-        sysUserMapper.deleteCompanyUserRole(usersByCompany);
+//        //利用教学单位code删除所对应的teacher和company的字段
+//        BAgency bagency = bAgencyRepository.selectOneBagency(bAgency.getBusinessId());
+//        String code = bagency.getCode();
+//        BTeacher bTeacher = new BTeacher();
+//        BCompany bCompany = new BCompany();
+//        bTeacher.setAgencyCode(code);
+//        bCompany.setAgencyCode(code);
+//        //根据agency_code查询b_teacher
+//        List<BTeacher> teacherList = bTeacherRepository.selectByAgencyCode(bTeacher);
+//        //根据agency_code查询b_company
+//        List<BCompany> companyList = bCompanyRepository.selectByAgencyCode(bCompany);
+//        //删除b_teacher
+//        bTeacherRepository.batchDeleteBycode(teacherList);
+//        //删除b_company
+//        bCompanyRepository.batchDeleteBycode(companyList);
+//        //根据code查询s_user
+//        List<SysUser> usersByTeacher = sysUserMapper.selectByTeacherCode(teacherList);
+//        List<SysUser> usersByCompany = sysUserMapper.selectByCompanyCode(companyList);
+//        //删除s_user
+//        sysUserMapper.batchDeleteByTeacherCode(teacherList);
+//        sysUserMapper.batchDeleteByCompanyCode(companyList);
+//        //删除s_r_user_role
+//        sysUserMapper.deleteTeacherUserRole(usersByTeacher);
+//        sysUserMapper.deleteCompanyUserRole(usersByCompany);
+//        UserUtil.setCurrentMergeOperation(bAgency);
+//        bAgency.setDeleted();
+//        int line = bAgencyRepository.logicalDelete(bAgency);
+//        log.info(UserUtil.getUserInfoProp(bAgency.getToken(), UserUtil.USER_USERNAME)+"逻辑删除了ID为"+
+//        bAgency.getBusinessId()+"的信息");
+//        return new PersistModel(line);
+        //先查询该教学单位是否被使用
+        List<BAgency> teacherAgency = bAgencyRepository.queryTeacherAgency(bAgency.getBusinessId());
+        List<BAgency> companyAgency = bAgencyRepository.queryCompanyAgency(bAgency.getBusinessId());
+        if(teacherAgency.size()>0||companyAgency.size()>0){
+            throw new ServiceException(ResultServiceEnums.AGENCY_IS_USED);
+        }
         UserUtil.setCurrentMergeOperation(bAgency);
         bAgency.setDeleted();
         int line = bAgencyRepository.logicalDelete(bAgency);

src/main/java/org/rcisoft/business/bterm/utils/SchoolCalendarWeek.java

@@ -63,37 +63,37 @@ public class SchoolCalendarWeek {
                     switch (calendar2.get(Calendar.DAY_OF_WEEK)){
                         //周日
                         case 1:
-                            schoolCalendarWeek.sun.put("tag",7);
+                            schoolCalendarWeek.sun.put("tag",calendar2.get(Calendar.DAY_OF_MONTH));
                             schoolCalendarWeek.sun.put("index",sdf.format(calendar2.getTime()));
                             schoolCalendarWeek.setMaxMonth(calendar2.get(Calendar.MONTH) + 1);
                             break;
                         case 2:
-                            schoolCalendarWeek.mon.put("tag",1);
+                            schoolCalendarWeek.mon.put("tag",calendar2.get(Calendar.DAY_OF_MONTH));
                             schoolCalendarWeek.mon.put("index",sdf.format(calendar2.getTime()));
                             schoolCalendarWeek.setMaxMonth(calendar2.get(Calendar.MONTH) + 1);
                             break;
                         case 3:
-                            schoolCalendarWeek.tue.put("tag",2);
+                            schoolCalendarWeek.tue.put("tag",calendar2.get(Calendar.DAY_OF_MONTH));
                             schoolCalendarWeek.tue.put("index",sdf.format(calendar2.getTime()));
                             schoolCalendarWeek.setMaxMonth(calendar2.get(Calendar.MONTH) + 1);
                             break;
                         case 4:
-                            schoolCalendarWeek.wed.put("tag",3);
+                            schoolCalendarWeek.wed.put("tag",calendar2.get(Calendar.DAY_OF_MONTH));
                             schoolCalendarWeek.wed.put("index",sdf.format(calendar2.getTime()));
                             schoolCalendarWeek.setMaxMonth(calendar2.get(Calendar.MONTH) + 1);
                             break;
                         case 5:
-                            schoolCalendarWeek.thu.put("tag",4);
+                            schoolCalendarWeek.thu.put("tag",calendar2.get(Calendar.DAY_OF_MONTH));
                             schoolCalendarWeek.thu.put("index",sdf.format(calendar2.getTime()));
                             schoolCalendarWeek.setMaxMonth(calendar2.get(Calendar.MONTH) + 1);
                             break;
                         case 6:
-                            schoolCalendarWeek.fri.put("tag",5);
+                            schoolCalendarWeek.fri.put("tag",calendar2.get(Calendar.DAY_OF_MONTH));
                             schoolCalendarWeek.fri.put("index",sdf.format(calendar2.getTime()));
                             schoolCalendarWeek.setMaxMonth(calendar2.get(Calendar.MONTH) + 1);
                             break;
                         case 7:
-                            schoolCalendarWeek.sat.put("tag",6);
+                            schoolCalendarWeek.sat.put("tag",calendar2.get(Calendar.DAY_OF_MONTH));
                             schoolCalendarWeek.sat.put("index",sdf.format(calendar2.getTime()));
                             schoolCalendarWeek.setMaxMonth(calendar2.get(Calendar.MONTH) + 1);
                             break;
@@ -101,7 +101,7 @@ public class SchoolCalendarWeek {
                     //s += "0,";
                     calendar2.add(Calendar.DATE,-1);
                 }
-                schoolCalendarWeek.mon.put("tag",1);
+                schoolCalendarWeek.mon.put("tag",calendar2.get(Calendar.DAY_OF_MONTH));
                 schoolCalendarWeek.mon.put("index",sdf.format(calendar2.getTime()));
                 schoolCalendarWeek.setMaxMonth(calendar2.get(Calendar.MONTH) + 1);
                 flag = 0;
@@ -114,32 +114,32 @@ public class SchoolCalendarWeek {
 //                calendar.add(Calendar.DATE,1);
                 switch (weekOfDay){
                     case 2:
-                        schoolCalendarWeek.mon.put("tag",1);
+                        schoolCalendarWeek.mon.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.mon.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 3:
-                        schoolCalendarWeek.tue.put("tag",2);
+                        schoolCalendarWeek.tue.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.tue.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 4:
-                        schoolCalendarWeek.wed.put("tag",3);
+                        schoolCalendarWeek.wed.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.wed.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 5:
-                        schoolCalendarWeek.thu.put("tag",4);
+                        schoolCalendarWeek.thu.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.thu.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 6:
-                        schoolCalendarWeek.fri.put("tag",5);
+                        schoolCalendarWeek.fri.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.fri.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 7:
-                        schoolCalendarWeek.sat.put("tag",6);
+                        schoolCalendarWeek.sat.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.sat.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
@@ -149,14 +149,14 @@ public class SchoolCalendarWeek {
 //                String formatTime = sdf.format(calendar.getTime());
 //                s += formatTime+",";
 //                s = s.substring(0,s.length() - 1);
-                schoolCalendarWeek.sun.put("tag",7);
+                schoolCalendarWeek.sun.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                 schoolCalendarWeek.sun.put("index",sdf.format(calendar.getTime()));
                 schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                 //第几周
                 schoolCalendarWeek.week.put("tag",list.size() + 1);
                 //属于哪个月
-                schoolCalendarWeek.month.put("tag",schoolCalendarWeek.MAX_MONTH);
-                schoolCalendarWeek.month.put("index",months[schoolCalendarWeek.MAX_MONTH - 1]);
+                schoolCalendarWeek.month.put("index",schoolCalendarWeek.MAX_MONTH);
+                schoolCalendarWeek.month.put("tag",months[schoolCalendarWeek.MAX_MONTH - 1]);
                 //因为是周日，所以List添加一条数据，开始下一周的遍历
                 list.add(schoolCalendarWeek);
                 schoolCalendarWeek = new SchoolCalendarWeek();
@@ -168,47 +168,47 @@ public class SchoolCalendarWeek {
         while(calendar.get(Calendar.DAY_OF_WEEK)  != 1 || flag2 == 1){
             if(calendar.get(Calendar.DAY_OF_WEEK) == 1){
                 //s += "0,";
-                schoolCalendarWeek.sun.put("tag",7);
+                schoolCalendarWeek.sun.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                 schoolCalendarWeek.sun.put("index",sdf.format(calendar.getTime()));
                 schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                 //s = s.substring(0,s.length() - 1);
                 //第几周
                 schoolCalendarWeek.week.put("tag",list.size() + 1);
                 //属于哪个月
-                schoolCalendarWeek.month.put("tag",schoolCalendarWeek.MAX_MONTH);
-                schoolCalendarWeek.month.put("index",months[schoolCalendarWeek.MAX_MONTH - 1]);
+                schoolCalendarWeek.month.put("index",schoolCalendarWeek.MAX_MONTH);
+                schoolCalendarWeek.month.put("tag",months[schoolCalendarWeek.MAX_MONTH - 1]);
                 list.add(schoolCalendarWeek);
                 break;
             }else {
                 //s += "0,";
                 switch (calendar.get(Calendar.DAY_OF_WEEK)){
                     case 2:
-                        schoolCalendarWeek.mon.put("tag",1);
+                        schoolCalendarWeek.mon.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.mon.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 3:
-                        schoolCalendarWeek.tue.put("tag",2);
+                        schoolCalendarWeek.tue.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.tue.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 4:
-                        schoolCalendarWeek.wed.put("tag",3);
+                        schoolCalendarWeek.wed.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.wed.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 5:
-                        schoolCalendarWeek.thu.put("tag",4);
+                        schoolCalendarWeek.thu.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.thu.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 6:
-                        schoolCalendarWeek.fri.put("tag",5);
+                        schoolCalendarWeek.fri.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.fri.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;
                     case 7:
-                        schoolCalendarWeek.sat.put("tag",6);
+                        schoolCalendarWeek.sat.put("tag",calendar.get(Calendar.DAY_OF_MONTH));
                         schoolCalendarWeek.sat.put("index",sdf.format(calendar.getTime()));
                         schoolCalendarWeek.setMaxMonth(calendar.get(Calendar.MONTH) + 1);
                         break;