新生报到宿舍分配代码调整

dms-dormitory/src/main/java/com/srs/dormitory/mapper/DmsDormitoryMapper.java

@@ -30,6 +30,10 @@ public interface DmsDormitoryMapper extends MPJBaseMapper<DmsDormitory> {
     @Select("select * from view_dorm_info")
     public List<Map<String, Object>> listDormInfo();
 
+    public List<DmsDormitory> listViewDormInfoByIds(@Param("ids") List<Long> ids);
+
+    public DmsDormitory getDormitoryById(@Param("id") Long id);
+
     public DomInfo getDormHas(Long id);
 
     public List<DomInfo> countRecordConfirmStatus();

dms-dormitory/src/main/java/com/srs/dormitory/service/impl/IDmsDormitoryDeptServiceImpl.java

@@ -278,7 +278,9 @@ public class IDmsDormitoryDeptServiceImpl extends ServiceImpl<DmsDormitoryDeptMa
         TransactionStatus status = transactionManager.getTransaction(def);
         try{
             Long dmId = param.get(0).getDormitoryId();
-            DmsDormitory dm = _dmMapper.selectById(dmId);
+//            DmsDormitory dm = _dmMapper.selectById(dmId);
+            DmsDormitory dm = _dmMapper.getDormitoryById(dmId);
+
             if(dm == null){
                 throw new Exception("该宿舍不存在，请重新输入");
             }
@@ -328,9 +330,9 @@ public class IDmsDormitoryDeptServiceImpl extends ServiceImpl<DmsDormitoryDeptMa
         TransactionStatus status = transactionManager.getTransaction(def);
         try{
 
-            QueryWrapper<DmsDormitory> dmQuery = new QueryWrapper<>();
+//            QueryWrapper<DmsDormitory> dmQuery = new QueryWrapper<>();
-            dmQuery.in("id",dto.getDormIds());
+//            dmQuery.in("id",dto.getDormIds());
-            List<DmsDormitory> dmList = _dmMapper.selectList(dmQuery);
+            List<DmsDormitory> dmList = _dmMapper.listViewDormInfoByIds(dto.getDormIds());
 
             List<String> isExistXydm = new ArrayList<>();
 
@@ -415,7 +417,6 @@ public class IDmsDormitoryDeptServiceImpl extends ServiceImpl<DmsDormitoryDeptMa
     @Override
     public TableDataInfo getDormitory(SelectDormDto dto) {
 
-
         DmsSearch param = new DmsSearch();
 
         if (dto.getFloorId() != null) {

dms-dormitory/src/main/resources/mapper/dormitory/DmsDormitoryMapper.xml

@@ -615,4 +615,29 @@
         where a.id = #{id}
     </select>
 
+    <select id="listViewDormInfoByIds" parameterType="List" resultType="DmsDormitory">
+        select a.*,
+        case b.occupancy
+        when b.occupancy is not null then b.occupancy
+        else 0
+        end
+        as occupancy from view_dorm_info as a
+        left join view_dorm_stu_count as b on a.id = b.dormitory_id
+        where a.id in
+        <foreach item="item" collection="ids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="getDormitoryById" parameterType="Long" resultType="DmsDormitory">
+        select a.*,
+               case b.occupancy
+                   when b.occupancy is not null then b.occupancy
+                   else 0
+                   end
+                   as occupancy from view_dorm_info as a
+                                         left join view_dorm_stu_count as b on a.id = b.dormitory_id
+        where a.id = #{id}
+    </select>
+
 </mapper>

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodApplyController.java

@@ -94,7 +94,6 @@ public class CphGoodApplyController extends BaseController {
         Object total = ajaxResult.get("data");
         Page page = (Page) total;
         list.add("rwgl-" + page.getTotal());
-        String username = new String();
         return AjaxResult.success(list);
 
     }

srs-admin/src/main/java/com/srs/web/controller/stureg/SrsOrderController.java

@@ -162,15 +162,16 @@ public class SrsOrderController extends BaseController
                     stuReg.setRegStatus("1");
                     _stuRegService.updateSrsStuReg(stuReg);
                     srsStuTodoService.confirmTask(getUsername(),"ZXJF");
-                    String classCode = stuReg.getBJDM();
+                    // 分配宿舍逻辑
-                    QueryWrapper<SrsClass> queryWrapper = new QueryWrapper<>();
+//                    String classCode = stuReg.getBJDM();
-                    queryWrapper.eq("class_code",classCode);
+//                    QueryWrapper<SrsClass> queryWrapper = new QueryWrapper<>();
-                    SrsClass srsClass = srcClassMapper.selectOne(queryWrapper);
+//                    queryWrapper.eq("class_code",classCode);
-                    Long teacherId = srsClass.getTeacherId();
+//                    SrsClass srsClass = srcClassMapper.selectOne(queryWrapper);
-                    CphTeacher cphTeacher = cphTeacherMapper.selectCphTeacherByTeacherId(teacherId);
+//                    Long teacherId = srsClass.getTeacherId();
-                    String employeeId = cphTeacher.getEmployeeId();
+//                    CphTeacher cphTeacher = cphTeacherMapper.selectCphTeacherByTeacherId(teacherId);
-                    // 自动分配宿舍
+//                    String employeeId = cphTeacher.getEmployeeId();
-                    srsDormitoryStudentService.assignDormitoryByTeacher(employeeId);
+//                    // 自动分配宿舍
+//                    srsDormitoryStudentService.assignDormitoryByTeacher(employeeId);
 
                     return AjaxResult.success("已缴费");
                 }else {

srs-admin/src/main/resources/application.yml

@@ -21,7 +21,7 @@ srs:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080  正式：8085 测试：8088
-  port: 8088
+  port: 8085
   servlet:
     # 应用的访问路径
     context-path: /
@@ -62,8 +62,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-#   active: druid   #正式环境
+   active: druid   #正式环境
-    active: dev   #测试环境
+#    active: dev   #测试环境
   # 文件上传
   servlet:
     multipart:
@@ -79,15 +79,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-#    host: localhost     #正式环境redis
+    host: localhost     #正式环境redis
-    host: 47.112.118.149 #测试开发地址
+#    host: 47.112.118.149 #测试开发地址
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码SSSS
-    password: Houpuyfb   #测试开发密码
+#    password: Houpuyfb   #测试开发密码
-#    password:       #正式环境密码
+    password:       #正式环境密码
     # 连接超时时间
     timeout: 10s
     lettuce:

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphClasstwoMapper.java

@@ -1,6 +1,5 @@
 package com.srs.comprehensive.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.srs.comprehensive.domain.CphClasstwo;
 import com.srs.comprehensive.domain.Vo.CphScoreVo;
 import com.srs.comprehensive.domain.Vo.StuIdNo;

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphStuScoreMiddlesMapper.java

@@ -1,8 +1,6 @@
 package com.srs.comprehensive.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.srs.comprehensive.domain.CphStuScoreMiddle;
-import com.srs.comprehensive.domain.Dto.CphStuScoreMiddleDto;
 import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphTeacherMapper.java

@@ -1,13 +1,10 @@
 package com.srs.comprehensive.mapper;
 
-import com.srs.common.core.domain.entity.SysDept;
-
 import java.util.List;
 import java.util.Map;
 
 import com.srs.comprehensive.domain.CphTeacher;
 import com.srs.comprehensive.domain.Dto.CphExport;
-import com.srs.comprehensive.domain.SrsClass;
 import com.srs.comprehensive.domain.SrsGrade;
 import com.srs.comprehensive.domain.SrsMajors;
 import com.srs.comprehensive.domain.Vo.*;

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsClassMapper.java

@@ -7,7 +7,6 @@ import com.srs.comprehensive.domain.Vo.CphSearch;
 import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsGradeMapper.java

@@ -2,7 +2,6 @@ package com.srs.comprehensive.mapper;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.srs.comprehensive.domain.SrsGrade;
 import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsMajorsMapper.java

@@ -2,7 +2,6 @@ package com.srs.comprehensive.mapper;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.srs.comprehensive.domain.SrsMajors;
 import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;

srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SrsSportTestMapper.java

@@ -1,13 +1,10 @@
 package com.srs.comprehensive.mapper;
 
 import java.util.List;
-import java.util.Set;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.srs.comprehensive.domain.SrsSportTest;
 import com.srs.comprehensive.domain.SumSportTest;
 import com.srs.comprehensive.domain.Vo.CphScoreVo;
-import com.srs.comprehensive.domain.Vo.SrsSportTestStudent;
 import com.srs.comprehensive.domain.Vo.StuIdNo;
 import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;

srs-flowable/src/main/java/com/srs/flowable/listener/LeaveApproveListener.java

@@ -66,6 +66,6 @@ public class LeaveApproveListener implements ExecutionListener {
 
         log.info("审核成功");
 
-        //推送消息
+        //todo 推送消息,推送给辅导员，目的要拿到辅导员工号
     }
 }

srs-framework/src/main/java/com/srs/framework/mybatisplusMapper/EasyBaseMapper.java

@@ -1,6 +1,7 @@
 package com.srs.framework.mybatisplusMapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import java.util.List;
 
 public interface EasyBaseMapper<T> extends BaseMapper<T> {

srs-stureg/src/main/java/com/srs/stureg/mapper/SrsMsgQueueMapper.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import com.srs.framework.mybatisplusMapper.EasyBaseMapper;
 import com.srs.stureg.domain.SrsMsgQueue;
-import com.srs.stureg.domain.SrsStuReg;
 import org.apache.ibatis.annotations.Mapper;
 
 /**