Merge branch 'pre'

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -100,7 +100,7 @@ public class ActivityInfoController {
     @SaCheckPermission("activityinfo:detail")
     public RT<ActivityInfoVo> info(@RequestParam Long id, Integer category){
         ActivityInfoVo infoVo = null;
-        if(category != null && (category == 1 || category == 2)){
+        if(category == null || (category == 1 || category == 2)){
             ActivityInfo activityInfo = activityInfoService.getByIdDeep(id);
             if (activityInfo == null) {
                 return RT.error("找不到此数据！");

src/main/java/com/xjrsoft/module/courseTable/controller/SecondCourseController.java

@@ -237,7 +237,7 @@ public class SecondCourseController {
     @PostMapping(value = "/enroll")
     @ApiOperation(value="报名")
     @SaCheckPermission("secondcourse:detail")
-    public RT<Boolean> enroll(@Valid UserEnrollDto dto){
+    public RT<Boolean> enroll(@Valid @RequestBody UserEnrollDto dto){
         Boolean enroll = secondCourseService.enroll(dto);
         return RT.ok(enroll);
     }

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -228,27 +228,26 @@ public class DataUtil {
         JsonParser jsonParser = new JsonParser();
 
         Map<String, String> idMap = new HashMap<>();
-        for (Map<String, Object> userMap : xjrUsers) {
-            XjrUser user = SqlRunnerAdapterUtil.convertMapToEntity(userMap, XjrUser.class);
+        for (Map<String, Object> user : xjrUsers) {
             String url  = ScheduleUtil.apiUrl + "teacher/create";
             JsonObject paramJson = new JsonObject();
-            paramJson.addProperty("jobNumber", user.getUserName());
-            if("SB10001".equals(user.getGender())){
+            paramJson.addProperty("jobNumber", user.get("user_name").toString());
+            if("SB10001".equals(user.get("gender").toString())){
                 paramJson.addProperty("gender", 1);
-            }else if("SB10002".equals(user.getGender())){
+            }else if("SB10002".equals(user.get("gender").toString())){
                 paramJson.addProperty("gender", 2);
             }
 
-            paramJson.addProperty("name", user.getName());
-            paramJson.addProperty("alias", user.getNickName());
-            paramJson.addProperty("extendId", user.getId().toString());
+            paramJson.addProperty("name", user.get("name").toString());
+            paramJson.addProperty("alias", user.get("nick_name").toString());
+            paramJson.addProperty("extendId", user.get("id").toString());
             //获取时间戳
             long timestamp = System.currentTimeMillis();
             //生成签名
             String sign = ScheduleUtil.createSign(timestamp);
-            if(ids != null && ids.get(user.getId().toString()) != null){
+            if(ids != null && ids.get(user.get("id").toString()) != null){
                 url  = ScheduleUtil.apiUrl + "teacher/update";
-                paramJson.addProperty("serialNo", ids.get(user.getId().toString()));
+                paramJson.addProperty("serialNo", ids.get(user.get("id").toString()));
                 ScheduleUtil.doPost(url, paramJson.toString(), sign, timestamp);
                 continue;
             }
@@ -258,7 +257,7 @@ public class DataUtil {
                 continue;
             }
             JsonObject resultJson = jsonParser.parse(result).getAsJsonObject();
-            idMap.put(user.getId().toString(), resultJson.get("data").getAsString());
+            idMap.put(user.get("id").toString(), resultJson.get("data").getAsString());
         }
         //插入记录表
         insertRecord(tableName, idMap);

src/main/resources/mapper/courseTable/SecondCourseMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.courseTable.mapper.SecondCourseMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.courseTable.dto.SecondCoursePageDto" resultType="com.xjrsoft.module.courseTable.vo.SecondCoursePageVo">
-        SELECT t1.id,t2.name AS semester_name,t1.name,t1.place,t1.content,t1.teacher_name,t1.status,
+        SELECT t1.id,t2.name AS semester_name,t1.name,t1.place,t1.content,t1.teacher_name,t1.status,t1.cover_id,
         (SELECT COUNT(*) FROM second_course_enroll WHERE delete_mark = 0 AND second_course_id = t1.id) AS enroll_count,
         ifnull((SELECT COUNT(*) FROM second_course_enroll WHERE delete_mark = 0 AND second_course_id = t1.id and user_id = #{dto.userId}), 0) AS enroll_status FROM second_course t1
         LEFT JOIN base_semester t2 ON t1.base_semester_id = t2.id

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

@@ -14,7 +14,7 @@
         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,
-        t1.use_type,t1.publishing_date,t1.is_secd,t1.category,t1.plan_batch,t1.work_total_count,t8.name as textbook_category
+        t1.use_type,t1.publishing_date,t1.is_secd,t1.category,t1.plan_batch,t1.work_total_count,t1.textbook_category
         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