Compare commits

...

1 Commits

@ -5,10 +5,10 @@ import lombok.Data;
import java.time.LocalDateTime;
@Data
@TableName("users")
@TableName("sys_user")
public class User {
@TableId(value = "user_id", type = IdType.AUTO)
@TableId(value = "id", type = IdType.AUTO)
private Long userId;
@TableField("created_at")

@ -17,12 +17,12 @@ public interface AuditMapper extends BaseMapper<Audit> {
@Select("SELECT a.audit_id, a.audit_status, a.audit_type_id, a.audit_data, " +
" a.created_by, a.created_at, a.auditor_id, a.audit_time, a.reject_reason, " +
" at.audit_type_name, " +
" u1.user_name as created_by_name, " +
" u2.user_name as auditor_name " +
" u1.username as created_by_name, " +
" u2.username as auditor_name " +
"FROM audit a " +
"LEFT JOIN audit_type at ON a.audit_type_id = at.audit_type_id " +
"LEFT JOIN users u1 ON a.created_by = u1.user_id " +
"LEFT JOIN users u2 ON a.auditor_id = u2.user_id " +
"LEFT JOIN sys_user u1 ON a.created_by = u1.id " +
"LEFT JOIN sys_user u2 ON a.auditor_id = u2.id " +
"WHERE a.audit_status = #{status} " +
"ORDER BY a.created_at DESC")
List<AuditVO> selectByStatus(@Param("status") String status);
@ -37,8 +37,8 @@ public interface AuditMapper extends BaseMapper<Audit> {
" u2.user_name as auditor_name " +
"FROM audit a " +
"LEFT JOIN audit_type at ON a.audit_type_id = at.audit_type_id " +
"LEFT JOIN users u1 ON a.created_by = u1.user_id " +
"LEFT JOIN users u2 ON a.auditor_id = u2.user_id " +
"LEFT JOIN sys_user u1 ON a.created_by = u1.id " +
"LEFT JOIN sys_user u2 ON a.auditor_id = u2.id " +
"WHERE a.audit_id = #{auditId}")
AuditVO selectAuditDetailById(@Param("auditId") Long auditId);
}

@ -55,10 +55,10 @@ public interface CulturalRelicsMapper extends BaseMapper<CulturalRelics>{
@Select("SELECT " +
"cr.*, " +
"rt.type_name, rt.description as type_description, " +
"u.user_name as creator_name " +
"u.username as creator_name " +
"FROM cultural_relics cr " +
"LEFT JOIN relics_type rt ON cr.relics_type_id = rt.relics_type_id AND rt.is_deleted = 0 " +
"LEFT JOIN users u ON cr.created_by = u.user_id " +
"LEFT JOIN sys_user u ON cr.created_by = u.id " +
"WHERE cr.relics_id = #{relicsId} AND cr.is_deleted = 0")
@Results(id = "relicDetailMap", value = {
@Result(property = "relicsId", column = "relics_id", id = true),

@ -1,6 +1,7 @@
package cn.edu.hnu.artifactrelic.vo;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.Data;
import java.time.LocalDateTime;
@ -19,7 +20,7 @@ public class RelicsDetailVO {
private String description;
private LocalDateTime createdAt;
// 自定义字段
private JSONObject customFields;
private JsonNode customFields;
// 类型信息
private Integer relicsTypeId;

@ -3,7 +3,7 @@ spring:
name: artifact-relic
datasource: #数据库配置
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/artifactllm1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowMultiQueries=true&useSSL=false&allowPublicKeyRetrieval=true
url: jdbc:mysql://localhost:3306/artifactllm2?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowMultiQueries=true&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123

Loading…
Cancel
Save