夏文涛 2 dienas atpakaļ
vecāks
revīzija
82743f346d

+ 4 - 1
src/main/java/com/template/model/pojo/WelcomeRole.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author ceshi
@@ -73,6 +73,9 @@ public class WelcomeRole implements Serializable {
     @ApiModelProperty(value = "设置管理设置 0.全部, 1.修改,2查看页面")
     private String settingManagementSetting;
 
+    @ApiModelProperty(value = "设置管理设置 0.全部, 1查看页面")
+    private String logManagementSetting;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

+ 28 - 1
src/main/java/com/template/services/impl/WelcomeLogServiceImpl.java

@@ -136,7 +136,34 @@ public class WelcomeLogServiceImpl extends ServiceImpl<WelcomeLogMapper, Welcome
                     }
                 }
             }else if(methodName.equals("isRegistered")){
-                //将参数转一下json然后特殊记录一下 例如XXX给XXX进行了现场报道操作
+                //将参数转一下json然后特殊记录一下 例如XXX给XXX进行了现场报道操作// 去掉类名和括号
+                String content = params.toString().substring(params.toString().indexOf('(') + 1, params.toString().lastIndexOf(')'));
+                String[] pairs = content.split(",\\s*");
+
+                Integer id = null;
+                Integer isRegistered = null;
+                for (String pair : pairs) {
+                    String[] kv = pair.split("=", 2);
+                    if (kv.length == 2) {
+                        switch (kv[0].trim()) {
+                            case "id":
+                                id = Integer.valueOf( kv[1].trim());
+                                break;
+                            case "isRegistered":
+                                isRegistered = Integer.valueOf(kv[1].trim());
+                                break;
+                        }
+                    }
+                }
+
+                if(id !=null){
+                    System.out.println("id: " + id + ", isRegistered: " + isRegistered);
+                    WelcomeStudent student = welcomeStudentService.getManageById(id);
+                    if(student != null){
+                        log.setOperation("对录取号为"+student.getAdmissNum()+"名字叫"+student.getName()+"的学生进行现场报到操作");
+                    }
+                }
+
             }
         }
         log.setCreateTime(new Date());

+ 2 - 1
src/main/resources/mapper/template/WelcomeLogMapper.xml

@@ -13,7 +13,7 @@
         <result property="olevel" column="olevel"/>
     </resultMap>
     <select id="queryLogPages" resultType="com.template.model.vo.LogVo" resultMap="LogPageMap">
-        SELECT id,create_time,account_num,user_name,oper_mode,otype,operation,ip,olevel FROM `alumni_log`
+        SELECT id,create_time,account_num,user_name,oper_mode,otype,operation,ip,olevel FROM `welcome_log`
         where deleted = 0
         <if test="userName != null and userName != ''">
             and user_name like '%' #{userName} '%'
@@ -27,5 +27,6 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and create_time BETWEEN #{startTime} AND #{endTime}
         </if>
+        order by create_time desc
     </select>
 </mapper>