Merge remote-tracking branch 'origin/master'

xiangpei

2024-04-28 06ba5eb015fc27866858c70460fc0ee1e9aaeede

Merge remote-tracking branch 'origin/master'

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java

@@ -1,6 +1,8 @@
package com.ycl.platform.domain.entity;

import annotation.Excel;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.entity.BaseEntity;
@@ -55,4 +57,9 @@
    /** 图标 */
    @Excel(name = "icon")
    private String icon;

    /** 更新时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

}

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckPublishServiceImpl.java

 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java

@@ -82,7 +82,7 @@
        Integer examineCategory = checkScore.getExamineCategory();
        String[] indexTableArr ={"t_check_index_car","t_check_index_face","t_check_index_video"};
        String tableName = indexTableArr[examineCategory];
        //TODO:获取当前月份 暂定 后期改为前端传
        //TODO:获取当前月份
        LocalDate now = LocalDate.now();
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
        String date = formatter.format(now);
@@ -121,6 +121,7 @@
     */
    @Override
    public List<CheckScore> page(CheckScore checkScore) {
        //TODO:数据权限
        return scoreMapper.selectCheckScoreList(checkScore);
    }
    /**