src/main/java/com/xjrsoft/module/base/dto/AddBaseClassPageDto.java

@@ -45,4 +45,7 @@ public class AddBaseClassPageDto implements Serializable {
 
     @ApiModelProperty("专业方向id(base_major_set)")
     private Long majorSetId;
+
+    @ApiModelProperty("实习次数")
+    private Integer internshipFrequency;
 }

src/main/java/com/xjrsoft/module/base/entity/BaseClass.java

@@ -78,4 +78,7 @@ public class BaseClass implements Serializable {
 
     @ApiModelProperty("专业方向id(base_major_set)")
     private Long majorSetId;
+
+    @ApiModelProperty("实习次数")
+    private Integer internshipFrequency;
 }

src/main/java/com/xjrsoft/module/base/vo/BaseClassPageVo.java

@@ -73,4 +73,7 @@ public class BaseClassPageVo {
 
     @ApiModelProperty("手机号")
     private String teacherMobile;
+
+    @ApiModelProperty("实习次数")
+    private Integer internshipFrequency;
 }

src/main/java/com/xjrsoft/module/base/vo/BaseClassVo.java

@@ -71,4 +71,7 @@ public class BaseClassVo {
     @ApiModelProperty("专业方向id(base_major_set)")
     private Long majorSetId;
 
+    @ApiModelProperty("实习次数")
+    private Integer internshipFrequency;
+
 }

src/main/resources/logback.xml

@@ -37,8 +37,8 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 15天 -->
-            <maxHistory>15</maxHistory>
+            <!-- 日志最大的历史 7天 -->
+            <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -82,7 +82,7 @@
             <!-- 按天回滚 daily -->
             <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 15天 -->
-            <maxHistory>15</maxHistory>
+            <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

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

@@ -87,7 +87,7 @@
             AND t2.credential_number LIKE concat('%', #{dto.credentialNumber}, '%')
         </if>
         <if test="dto.notInIds != null and dto.notInIds.size() > 0">
-            and t2.id in
+            and t2.id not in
             <foreach item="notInId" index="index" collection="dto.notInIds" open="(" close=")" separator=",">
                 #{notInId}
             </foreach>

src/test/java/com/xjrsoft/xjrsoftboot/WechatMessageTest.java

@@ -1,8 +1,12 @@
 package com.xjrsoft.xjrsoftboot;
 
+import camundajar.impl.com.google.gson.JsonObject;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.xjrsoft.XjrSoftApplication;
+import com.xjrsoft.common.enums.WeChatType;
+import com.xjrsoft.common.utils.WeChatUtil;
 import com.xjrsoft.module.organization.dto.WeChatSendMessageDto;
 import com.xjrsoft.module.organization.service.IWeChatService;
 import org.junit.jupiter.api.Test;
@@ -23,6 +27,9 @@ class WechatMessageTest {
     @Autowired
     private IWeChatService weChatService;
 
+    @Autowired
+    private WeChatUtil weChatUtil;
+
     @Test
     void test(){
 
@@ -57,4 +64,17 @@ class WechatMessageTest {
             }
         }
     }
+
+    @Test
+    public void getRidInfo(){
+        String token = weChatUtil.getToken(WeChatType.WEWEB);
+        String url = "https://api.weixin.qq.com/cgi-bin/openapi/rid/get?access_token=" + token;
+
+        JSONObject object = new JSONObject();
+        object.put("rid", "686b6714-61e7b031-42b4ea15");
+        String result = HttpUtil.post(url, JSONObject.toJSONString(object));
+
+        System.out.println(result);
+    }
+
 }