Merge branch 'pre'

src/main/java/com/xjrsoft/module/attendance/controller/StudentStatisticsController.java

@@ -186,6 +186,14 @@ public class StudentStatisticsController {
         if(dto.getDate() != null && !"".equals(dto.getDate())){
             DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE;
             LocalDate queryDate = LocalDate.parse(dto.getDate(), formatter);
+            HolidayDate holidayDate = holidayDateService.getOne(
+                    new QueryWrapper<HolidayDate>().lambda()
+                            .eq(HolidayDate::getDate, queryDate)
+            );
+            if(holidayDate != null && holidayDate.getWay() != null && holidayDate.getWay() != 0){
+                return RT.ok(new PageOutput<>());
+            }
+
             LocalDateTime startTime, endTime;
 
             if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){

src/main/java/com/xjrsoft/module/concat/controller/ConcatController.java

@@ -62,6 +62,9 @@ public class ConcatController {
         MPJLambdaWrapper<XjrUser> wrapper = new MPJLambdaWrapper<>();
         wrapper.leftJoin("xjr_user_dept_relation t2 on t.id = t2.user_id")
                 .eq("t2.dept_id", parentId)
+                .leftJoin("xjr_user_role_relation t3 ON t.id = t3.user_id")
+                .leftJoin("xjr_role t4 ON t4.id = t3.role_id")
+                .eq("t4.id", 2)
                 .eq(XjrUser::getDeleteMark, DeleteMark.NODELETE.getCode());
         List<XjrUser> userList = xjrUserService.selectJoinList(XjrUser.class, wrapper);
         for (XjrUser user : userList) {

src/main/java/com/xjrsoft/module/hikvision/controller/EventController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.hikvision.controller;
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.db.Db;
 import com.alibaba.fastjson.JSONObject;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -117,7 +118,7 @@ public class EventController {
                         WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
                         weChatSendMessageDto.setUserId(member.getOpenId());
                         weChatSendMessageDto.setTemplateId(weChatUtil.getOutInTemplate());
-                        weChatSendMessageDto.setMsgId(member.getId().toString());
+                        weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
                         JSONObject paramJson = new JSONObject();
 
                         JSONObject thing1 = new JSONObject();

src/main/java/com/xjrsoft/module/hikvision/util/OutInRecordUtil.java

@@ -126,16 +126,16 @@ public class OutInRecordUtil {
             }
             if (personId == null) continue;
 
-            int statusInt = item.get("inAndOutType").getAsInt();
-            int status = -1;
-            switch (statusInt){
-                case 0:
-                    status = 1;
-                    break;
-                case 1:
-                    status = 0;
-                    break;
-            }
+            int status = item.get("inAndOutType").getAsInt();
+//            int status = -1;
+//            switch (statusInt){
+//                case 0:
+//                    status = 1;
+//                    break;
+//                case 1:
+//                    status = 0;
+//                    break;
+//            }
 
             String uri = item.get("picUri").isJsonNull() ? null : item.get("picUri").getAsString();
             String recordTime = item.get("eventTime").isJsonNull() ? null : item.get("eventTime").getAsString();

src/main/java/com/xjrsoft/module/job/AttenDanceWarnNoticeTask.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.job;
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -110,7 +111,7 @@ public class AttenDanceWarnNoticeTask {
             WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
             weChatSendMessageDto.setUserId(xjrUser.getOpenId());
             weChatSendMessageDto.setTemplateId(wechatTemplate);
-            weChatSendMessageDto.setMsgId(xjrUser.getId().toString());
+            weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
             JSONObject paramJson = new JSONObject();
 
             JSONObject thing8 = new JSONObject();

src/main/java/com/xjrsoft/module/job/AttendanceMessageTask.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.job;
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -206,7 +207,7 @@ public class AttendanceMessageTask {
                 weChatSendMessageDto.setUrl(StrUtil.format("{}pages/attendance/teacher/index", commonPropertiesConfig.getDomainApp()));
 
                 for (XjrUser xjrUser : userList) {
-                    weChatSendMessageDto.setMsgId(xjrUser.getId().toString());
+                    weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
                     weChatSendMessageDto.setUserId(xjrUser.getOpenId());
                     weChatService.sendTemplateMessage(weChatSendMessageDto);
                 }
@@ -251,7 +252,7 @@ public class AttendanceMessageTask {
                 weChatSendMessageDto.setUrl(StrUtil.format("{}pages/attendance/class/index", commonPropertiesConfig.getDomainApp()));
 
                 for (XjrUser xjrUser : userList) {
-                    weChatSendMessageDto.setMsgId(xjrUser.getId().toString());
+                    weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
                     weChatSendMessageDto.setUserId(xjrUser.getOpenId());
                     weChatService.sendTemplateMessage(weChatSendMessageDto);
                 }

src/main/java/com/xjrsoft/module/organization/dto/WeChatSendMessageDto.java

@@ -8,6 +8,9 @@ public class WeChatSendMessageDto {
     private String userId;
     private String templateId;
     private String url;
+    /**
+     * 不同消息需要
+     */
     private String msgId;
     private JSONObject content;
 }

src/main/java/com/xjrsoft/module/outint/controller/StudentOutInRecordController.java

@@ -42,6 +42,7 @@ import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
 * @title: 学生出入记录
@@ -76,11 +77,13 @@ public class StudentOutInRecordController {
                 .leftJoin(XjrUser.class,XjrUser::getId,StudentOutInRecord::getUserId,
                         ext->ext.selectAs(XjrUser::getCredentialNumber,StudentOutInRecordPageVo::getIdentityCard)
                                 .selectAs(XjrUser::getMobile,StudentOutInRecordPageVo::getPhone)
-                                .select(XjrUser::getName))
+                                .select(XjrUser::getName)
+                                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, XjrUser::getGender,
+                                        genderExt -> genderExt.selectAs(DictionaryDetail::getName, StudentOutInRecordPageVo::getGender)))
                 .leftJoin(BaseClass.class,BaseClass::getId,StudentOutInRecord::getClassId,ext->ext.selectAs(BaseClass::getName,StudentOutInRecordPageVo::getClassCn))
                 .leftJoin(XjrUser.class,XjrUser::getId,StudentOutInRecord::getTeacherId,ext->ext.selectAs(XjrUser::getName,StudentOutInRecordPageVo::getTeacherCn))
                 .leftJoin(BaseStudentSchoolRoll.class,BaseStudentSchoolRoll::getUserId,StudentOutInRecord::getUserId)
-                .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, XjrUser::getGender, ext->ext.selectAs(DictionaryDetail::getName, StudentOutInRecordPageVo::getGender))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, XjrUser::getGender,ext -> ext.selectAs(DictionaryDetail::getName, StudentOutInRecordPageVo::getGender))
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, BaseStudentSchoolRoll::getStduyStatus, ext->ext.selectAs(DictionaryDetail::getName, StudentOutInRecordPageVo::getStduyStatusCn))
                 ;
 

src/main/java/com/xjrsoft/module/textbook/controller/TextbookController.java

@@ -78,7 +78,7 @@ public class TextbookController {
         textbookMPJLambdaWrapper
                 .select(Textbook::getId)
                 .selectAs(Textbook::getId,TextbookSubscriptionListVo::getTextbookId)
-                .selectAs(BaseCourseSubject::getName, TextbookSubscriptionListVo::getCourseSubjectIdCn)
+                .selectAs(BaseCourseSubject::getName, TextbookSubscriptionListVo::getCourseName)
                 .selectSum(BaseClassMajorSet::getTotalStudent, TextbookSubscriptionListVo::getStudentSubscriptionNumber)
                 .select(Textbook.class, x -> VoToColumnUtil.fieldsToColumns(TextbookSubscriptionListVo.class).contains(x.getProperty()))
                 .leftJoin(BaseClassCourse.class, BaseClassCourse::getCourseId, Textbook::getCourseSubjectId)
@@ -140,7 +140,7 @@ public class TextbookController {
         textbookMPJLambdaWrapper
                 .select(Textbook::getId)
                 .selectAs(Textbook::getId,TextbookSubscriptionListVo::getTextbookId)
-                .selectAs(BaseCourseSubject::getName, TextbookSubscriptionListVo::getCourseSubjectIdCn)
+                .selectAs(BaseCourseSubject::getName, TextbookSubscriptionListVo::getCourseName)
                 .selectSum(BaseClassMajorSet::getTotalStudent, TextbookSubscriptionListVo::getStudentSubscriptionNumber)
                 .select(Textbook.class, x -> VoToColumnUtil.fieldsToColumns(TextbookSubscriptionListVo.class).contains(x.getProperty()))
                 .leftJoin(TextbookClassRelation.class, TextbookClassRelation::getTextbookId, Textbook::getId)

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookSubscriptionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.textbook.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -58,6 +59,7 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(WfTextbookSubscription wfTextbookSubscription) {
+        wfTextbookSubscription.setApplicantUserId(StpUtil.getLoginIdAsLong());
         wfTextbookSubscription.setStatus(1);
         wfTextbookSubscription.setCreateDate(new Date());
         wfTextbookSubscriptionWfTextbookSubscriptionMapper.insert(wfTextbookSubscription);

src/main/java/com/xjrsoft/module/textbook/vo/TextbookSubscriptionListVo.java

@@ -36,7 +36,7 @@ public class TextbookSubscriptionListVo {
      * 课程编号(base_course_subject)
      */
     @ApiModelProperty("课程编号(base_course_subject)")
-    private String courseSubjectIdCn;
+    private String courseName;
     /**
     * 书名
     */

src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -12,7 +12,9 @@
         (SELECT GROUP_CONCAT(c2.name) FROM textbook_class_relation c1
         LEFT JOIN base_class c2 ON c1.class_id = c2.id
         WHERE c1.textbook_id = t1.id) AS use_class,
-        t6.name AS use_grade,t1.version FROM textbook t1
+        t6.name AS use_grade,t1.version,
+        t1.use_type
+        FROM textbook t1
         LEFT JOIN subject_group t2 ON t1.subject_group_id = t2.id
         LEFT JOIN base_semester t3 ON t1.base_semester_id = t3.id
         LEFT JOIN base_course_subject t4 ON t1.course_subject_id = t4.id