fuliqi
2024-03-21 95c08b4b0a31fcf5ae14ffea6337fb5da6718e1c
Merge remote-tracking branch 'origin/master'
3个文件已修改
20 ■■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
@@ -27,6 +29,12 @@
    @TableField("default_id")
    private Integer defaultId;
    @TableField("score")
    private BigDecimal score;
    @TableField("check_publish_id")
    private Integer checkPublishId;
    @ApiModelProperty("审核状态")
    @TableField("auditing_status")
    private String auditingStatus;
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
@@ -3,6 +3,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.DefaultAuditing;
import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
@@ -25,6 +27,12 @@
    /** 违规 */
    private Integer defaultId;
    /** 违规扣分 */
    private BigDecimal score;
    /** 考核发布ID */
    private Integer checkPublishId;
    /**
     * 违约规则名
     */
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
@@ -6,6 +6,8 @@
    <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultAuditingVO">
        <result column="id" property="id" />
        <result column="create_time" property="createTime" />
        <result column="score" property="score" />
        <result column="check_publish_id" property="checkPublishId" />
        <result column="default_id" property="defaultId" />
        <result column="auditing_status" property="auditingStatus" />
        <result column="remark" property="remark" />
@@ -18,6 +20,8 @@
    <select id="page" resultMap="BaseResultMap">
        SELECT
               tda.id,
               tda.score,
               tda.check_publish_id,
               tda.create_time,
               tda.default_id,
               tda.auditing_status,