Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -284,7 +284,7 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
         List<StudentPayStatusVo> studentPayStatus = roomBedMapper.getStudentPayStatus(dto);
         Map<Long, Integer> payStatusMap = new HashMap<>();
         for (StudentPayStatusVo payStatus : studentPayStatus) {
-            payStatusMap.put(payStatus.getId(), payStatus.getPayStatus());
+            payStatusMap.put(payStatus.getId(), (payStatus.getPayStatus() == null?0:payStatus.getPayStatus()));
         }
         for (String genderNumber : genderSet) {
             //根据性别查询出所有空床位信息
@@ -411,12 +411,26 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
         );
         List<AdjustBedClassPageVo> result = new ArrayList<>();
         List<AdjustBedClassStudentPageVo> allStudent = roomBedMapper.getClassStudetBed(dto);
+
+        //查询缴费状态
+        DistributeRoomBedDto distributeRoomBedDto = new DistributeRoomBedDto();
+        List<Long> classIds = new ArrayList<>();
+        for (BaseClass baseClass : classList) {
+            classIds.add(baseClass.getId());
+        }
+        distributeRoomBedDto.setClassIds(classIds);
+        List<StudentPayStatusVo> studentPayStatusVoList = roomBedMapper.getStudentPayStatus(distributeRoomBedDto);
+        Map<Long, Integer> payStatusMap = new HashMap<>();
+        for (StudentPayStatusVo statusVo : studentPayStatusVoList) {
+            payStatusMap.put(statusVo.getId(), statusVo.getPayStatus());
+        }
         for (BaseClass classOne : classList) {
             List<AdjustBedClassStudentPageVo> studentList = new ArrayList<>();
             for (AdjustBedClassStudentPageVo adjustBedClassStudentPageVo : allStudent) {
                 if(!classOne.getId().toString().equals(adjustBedClassStudentPageVo.getClassId())){
                     continue;
                 }
+                adjustBedClassStudentPageVo.setPayStatus(payStatusMap.get(Long.valueOf(adjustBedClassStudentPageVo.getUserId())));
                 studentList.add(adjustBedClassStudentPageVo);
             }
             if(studentList.isEmpty()){

src/main/java/com/xjrsoft/module/room/vo/AdjustBedClassStudentPageVo.java

@@ -48,4 +48,8 @@ public class AdjustBedClassStudentPageVo {
     @ContentStyle(dataFormat = 49)
     @ApiModelProperty("床位")
     private String bedNumber;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("缴费状态（1:已缴费 0:未缴费）")
+    private Integer payStatus;
 }

src/main/java/com/xjrsoft/module/workflow/utils/WorkFlowUtil.java

@@ -231,6 +231,22 @@ public class WorkFlowUtil {
                 if(title_last != null){
                     continue;
                 }
+                //物品申购特殊处理
+                if(value.containsKey("wf_subscription_listList")){
+                    ArrayList<Map<String, Object>> list = (ArrayList<Map<String, Object>>) value.get("wf_subscription_listList");
+                    if(list.size() > 0){
+                        Map<String, Object> objectMap = list.get(0);
+                        Set<String> keys = objectMap.keySet();
+                        String firstKey = null;
+                        for (String key : keys) {
+                            if(firstKey != null){
+                                continue;
+                            }
+                            firstKey = key;
+                        }
+                        title_last = objectMap.get(firstKey).toString();
+                    }
+                }
                 for (Object o : value.values()) {
                     if(title_last != null){
                         continue;

src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -19,6 +19,7 @@
         LEFT JOIN base_student_family_member t6 ON t6.user_id = t2.id AND t6.delete_mark = 0 AND t6.is_guardian = 1
         WHERE t2.delete_mark = 0
         AND t1.delete_mark = 0
+        AND t3.archives_status = 'FB2901'
         <if test="dto.gradeId != null">
             and t4.grade_id = #{dto.gradeId}
         </if>
@@ -75,6 +76,7 @@
         LEFT JOIN base_student_family_member t6 ON t6.user_id = t2.id AND t6.delete_mark = 0 AND t6.is_guardian = 1
         WHERE t2.delete_mark = 0
         AND t1.delete_mark = 0
+        and t3.archives_status = 'FB2901'
         <if test="dto.gradeId != null">
             and t4.grade_id = #{dto.gradeId}
         </if>