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

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -189,19 +189,19 @@ public class DataboardController {
     @ApiOperation(value="访客统计")
     @SaCheckPermission("databoard:detail")
     public RT<VisitorStatisticsVo> visitorStatistics(@Valid StatisticsDto dto){
-        List<VisitorOutInRecord> list = visitorService.list(
-                new QueryWrapper<VisitorOutInRecord>().lambda()
-                        .eq(VisitorOutInRecord::getDeleteMark, DeleteMark.NODELETE.getCode())
-        );
         VisitorStatisticsVo result = new VisitorStatisticsVo();
-        result.setAllCount(list.size());
-        LocalDate today = LocalDate.now();
-        int todayCount = 0;
-        for (VisitorOutInRecord record : list) {
-            if(today.equals(record.getRecordTime().toLocalDate())){
-                todayCount ++;
-            }
-        }
+
+        String sql = "SELECT * FROM reservation_school_people t1" +
+                " INNER JOIN reservation_school t2 ON t1.reservation_schoo_id = t2.id" +
+                " INNER JOIN xjr_workflow_form_relation t3 ON CAST(t2.id AS CHAR) = t3.form_key_value" +
+                " WHERE t3.current_state = 'COMPLETED' AND t1.delete_mark = 0 AND t1.enabled_mark = 1" +
+                " AND t2.delete_mark = 0 AND t2.enabled_mark = 1";
+        int size = SqlRunnerAdapter.db().selectList(sql).size();
+        result.setAllCount(size);
+
+        sql += " AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN DATE_FORMAT(t2.start_time,'%Y-%m-%d') AND DATE_FORMAT(t2.end_time,'%Y-%m-%d')";
+
+        int todayCount = SqlRunnerAdapter.db().selectList(sql).size();
         result.setTodayCount(todayCount);
         return RT.ok(result);
     }

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -357,6 +357,7 @@ public class NewsController {
                                 .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                                 .eq(News::getTypeId, typeId)
                                 .eq(NewsRelation::getReadMark, 0)
+                                .gt(News::getSendEndDate, LocalDateTime.now())
                 );
                 newsCountTypeVo.setTypeId(typeId);
                 newsCountTypeVo.setTotal(notReadCount);
@@ -380,6 +381,7 @@ public class NewsController {
                                 .eq(News::getStatus, 2)
                                 .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                                 .eq(News::getTypeId, typeId)
+                                .gt(News::getSendEndDate, LocalDateTime.now())
                                 .eq(NewsRelation::getReadMark, 0)
                 );
 

src/main/java/com/xjrsoft/module/room/controller/RoomBedAdjustController.java

@@ -5,6 +5,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -85,7 +86,9 @@ public class RoomBedAdjustController {
 
         long teacherId = StpUtil.getLoginIdAsLong();
         List<BaseClass> classList = baseClassService.list(
-                new QueryWrapper<BaseClass>().lambda().eq(BaseClass::getTeacherId, teacherId)
+                new QueryWrapper<BaseClass>().lambda()
+                        .eq(BaseClass::getTeacherId, teacherId)
+                        .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
         );
         if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER") && dto.getRoomId() == null){
             if(classList != null && !classList.isEmpty()){
@@ -160,13 +163,14 @@ public class RoomBedAdjustController {
 
         long teacherId = StpUtil.getLoginIdAsLong();
         List<BaseClass> classList = baseClassService.list(
-                new QueryWrapper<BaseClass>().lambda().eq(BaseClass::getTeacherId, teacherId)
+                new QueryWrapper<BaseClass>().lambda()
+                        .eq(BaseClass::getTeacherId, teacherId)
+                        .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
         );
-        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER") && dto.getRoomId() != null){
+        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")){
             if(classList != null && !classList.isEmpty()){
                 dto.setClassId(classList.get(0).getId());
             }
-            //dto.setIsTeacher(1);
         }
         List<TeacherRoomListVo> teacherRoomList = roomBedService.getTeacherRoomList(dto);
         return RT.ok(teacherRoomList);

src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -43,7 +43,6 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
-import static com.alibaba.fastjson.JSONPatch.OperationType.remove;
 
 /**
  * @title: 学生班级巡查考核

src/main/java/com/xjrsoft/module/student/dto/QuantitativeAssessmentSingleScoreDto.java

@@ -37,4 +37,10 @@ public class QuantitativeAssessmentSingleScoreDto implements Serializable {
 
     @ApiModelProperty(value = "考核类别code")
     private String categoryCode;
+
+    @ApiModelProperty("年份")
+    private Integer year;
+
+    @ApiModelProperty("月份")
+    private Integer month;
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -604,7 +604,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
                         ScriptEngine engine = manager.getEngineByName("JavaScript");
                         try {
                             double result = ((Number) engine.eval(replacedExpression)).doubleValue();
-                            c.setMilitaryManageComprehensiveIndex(BigDecimal.valueOf(result).setScale(2, RoundingMode.HALF_UP).doubleValue() + "");
+                            c.setMilitaryManageScore(BigDecimal.valueOf(result).setScale(2, RoundingMode.HALF_UP).doubleValue() + "");
                         } catch (ScriptException e) {
                             Log.error(e.getMessage(), e);
                         }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoDetailVo.java

@@ -123,4 +123,7 @@ public class BaseStudentInfoDetailVo {
 
     @ApiModelProperty("学籍号")
     private String rollNumber;
+
+    @ApiModelProperty("学生档案编号")
+    private String archivesNumber;
 }

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

@@ -45,6 +45,7 @@
         <if test="dto.teacherId != null">
             and t7.teacher_id = #{dto.teacherId}
         </if>
+        order by t.id desc
     </select>
 
     <select id="getInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo">
@@ -64,7 +65,7 @@
 
     <select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo">
         SELECT t.id,t1.assessment_date,t2.name AS assessment_category_name,t3.name AS assessment_project_name,t5.name AS
-        assessment_class_name,t1.reason,t1.score,t1.score_type,t4.name AS score_type_cn,
+        assessment_class_name,t1.reason,t1.total_score as score,t1.score_type,t4.name AS score_type_cn,
         (
         SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE
         base_student_assessment_inspection_id = t1.id AND class_id = t.class_id AND delete_mark = 0 and enabled_mark = 1
@@ -78,7 +79,7 @@
         LEFT JOIN base_student_assessment_category t2 ON (t2.id = t1.base_student_assessment_category_id)
         LEFT JOIN base_student_assessment_project t3 ON (t3.id = t1.base_student_assessment_project_id)
         LEFT JOIN base_student_assessment_item t6 ON (t6.id = t1.base_student_assessment_item_id)
-        LEFT JOIN xjr_dictionary_detail t4 ON t4.code=t1.score_type
+        LEFT JOIN xjr_dictionary_detail t4 ON t4.code = t1.score_type
         LEFT JOIN base_class t5 ON t5.id=t.class_id
         WHERE t1.delete_mark = 0 and t1.enabled_mark = 1 and t.class_id in
         <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
@@ -96,6 +97,7 @@
         <if test="dto.endDate != null and dto.endDate != ''">
             and t1.assessment_date &lt;= #{dto.endDate}
         </if>
+        order by t1.id desc
     </select>
 
     <select id="getMobileInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo">
@@ -231,7 +233,7 @@
     <select id="getAssessmentInspectionByClassIdList" parameterType="com.xjrsoft.module.student.dto.QuantitativeAssessmentSingleScoreDto" resultType="com.xjrsoft.module.student.vo.QuantitativeAssessmentSingleScoreVo">
         select
         t.class_ids as class_id,
-        SUM(t.score * (LENGTH(personal_student_user_ids) - LENGTH(REPLACE(personal_student_user_ids, ',', '')) + 1)) AS sumScore
+        SUM(t.score * IF(personal_student_user_ids IS NULL, 1, (SELECT COUNT(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id = t.id AND delete_mark = 0 AND enabled_mark = 1))) AS sumScore
         from base_student_assessment_inspection t
         inner join base_student_assessment_category t1 on t1.id = t.base_student_assessment_category_id
         where t.delete_mark = 0 and t.enabled_mark = 1
@@ -256,6 +258,9 @@
         <if test="dto.endTime != null">
             and t.create_date &lt; #{dto.endTime}
         </if>
+        <if test="dto.year != null and dto.month != null">
+            and DATE_FORMAT(t.assessment_date, '%Y-%m') = concat(#{dto.year}, '-', #{dto.month})
+        </if>
         group by t.class_ids;
     </select>
 

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

@@ -99,7 +99,7 @@
                t3.stduy_status                                                                                               as stduyStatusCode,
                t3.roll_modality                                                                                              as rollModalityCode,
                t3.roll_number AS rollNumber,
-                t12.name AS student_form,
+                t12.name AS student_form,t3.archives_number,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010604%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jxf,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode = 103042766003001 AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS ssf,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010603%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jcf,