移动端班级考核调整

src/main/java/com/xjrsoft/module/ledger/controller/LedgerCustomController.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.ledger.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.db.Entity;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
@@ -16,6 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.Map;
 
 /**
 * @title: 台账自定义接口
@@ -40,6 +45,14 @@ public class LedgerCustomController {
         Entity where = Entity.create(dto.getTableName());
         where.set("id", dto.getId());
 
+        Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(dto.getTableName(), where);
+        if(objectMap.containsKey("modify_user_id")){
+            params.set("modify_user_id", StpUtil.getLoginIdAsLong());
+        }
+        if(objectMap.containsKey("modify_date")){
+            params.set("modify_date", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        }
+
         return RT.ok(SqlRunnerAdapter.db().dynamicUpdate(dto.getTableName(), params, where));
     }
 

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

@@ -1,5 +1,7 @@
 package com.xjrsoft.module.student.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentStudentRelation;
 import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
@@ -112,8 +114,14 @@ public class BaseStudentAssessmentInspectionMobileVo {
     private List<File> fileInfos;
 
     @ApiModelProperty("类型")
-    private  String assessmentType;
+    private String assessmentType;
 
     @ApiModelProperty("考核项目")
-    private  String assessmentItemName;
+    private String assessmentItemName;
+
+    @ApiModelProperty("修改人")
+    private String modifyUserName;
+
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
 }

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

@@ -100,7 +100,8 @@
 
     <select id="getMobileInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo">
         select t.id,t.class_id,t.base_student_assessment_inspection_id,t1.score,t5.name as assessment_class_name,t2.name as assessment_category_name,t3.name as assessment_project_name,t1.assessment_date,t1.reason,
-        t6.name as assessment_user_name,t7.name as create_user_name,t1.create_date,t1.file_id,t1.score_type,t4.name as score_type_cn,t1.assessment_type,t8.name as assessment_item_name
+        t6.name as assessment_user_name,t7.name as create_user_name,t1.create_date,t1.file_id,t1.score_type,t4.name as score_type_cn,t1.assessment_type,
+        t8.name as assessment_item_name,t9.name as modify_user_name,t1.modify_date
         from base_student_assessment_class_relation t
         left join base_student_assessment_inspection t1 on t1.id=t.base_student_assessment_inspection_id
         left join base_student_assessment_category t2 on (t2.id = t1.base_student_assessment_category_id)
@@ -108,8 +109,9 @@
         left join base_student_assessment_item t8 on (t8.id = t1.base_student_assessment_item_id)
         left join xjr_dictionary_detail t4 on t4.code=t1.score_type
         left join base_class t5 on t5.id=t.class_id
-        left join xjr_user t6 on t1.assessment_user_id=t6.id
-        left join xjr_user t7 on t1.create_user_id=t7.id
+        left join xjr_user t6 on t1.assessment_user_id = t6.id
+        left join xjr_user t7 on t1.create_user_id = t7.id
+        left join xjr_user t9 on t1.modify_user_id = t9.id
         where t.id = #{id};
     </select>