xuhy
2025-11-04 21e4896c1097cbb38667533e530419f99dd6c9f9
供应商核查
4个文件已修改
21 ■■■■■ 已修改文件
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierVerifyServiceImpl.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysNoticeServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/vo/TSysNoticeVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TCrmSupplierVerifyMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierVerifyServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.system.vo.TCrmDeviceVO;
import com.ruoyi.system.vo.TCrmSupplierVerifyVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysNoticeServiceImpl.java
@@ -11,8 +11,10 @@
import com.ruoyi.system.query.TSysNoticeQuery;
import com.ruoyi.system.service.TSysNoticeService;
import com.ruoyi.system.vo.TSysNoticeVO;
import io.jsonwebtoken.lang.Collections;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -41,6 +43,20 @@
    public PageInfo<TSysNoticeVO> pageList(TSysNoticeQuery query) {
        PageInfo<TSysNoticeVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TSysNoticeVO> list = this.baseMapper.pageList(query,pageInfo);
        if(Collections.isEmpty(list)){
            return pageInfo;
        }
        for (TSysNoticeVO tSysNoticeVO : list) {
            if(tSysNoticeVO.getStartTime().isAfter(LocalDateTime.now())){
                tSysNoticeVO.setShowStatus(1);
            }
            if(tSysNoticeVO.getStartTime().isBefore(LocalDateTime.now()) && tSysNoticeVO.getEndTime().isAfter(LocalDateTime.now())){
                tSysNoticeVO.setShowStatus(2);
            }
            if(tSysNoticeVO.getEndTime().isBefore(LocalDateTime.now())){
                tSysNoticeVO.setShowStatus(3);
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
ruoyi-system/src/main/java/com/ruoyi/system/vo/TSysNoticeVO.java
@@ -10,6 +10,6 @@
public class TSysNoticeVO extends TSysNotice {
    @ApiModelProperty(value = "显示状态 1=未开始 2=展示中 3=已结束")
    private String showStatus;
    private Integer showStatus;
}
ruoyi-system/src/main/resources/mapper/system/TCrmSupplierVerifyMapper.xml
@@ -20,7 +20,7 @@
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TCrmSupplierVerifyVO">
        SELECT tcsv.id, tcsv.supplier_id, tcsv.status, tcsv.verify_remark, tcsv.generate_time, tcsv.verify_time, tcsv.operation_name, tcsv.operation_time,
               tcs.supplier_name, tcs.supplier_contact, tcs.phone, tcs.remarks
               tcs.supplier_name, tcs.supplier_contact, tcs.phone, tcs.remarks,tcs.status
        FROM t_crm_supplier_verify tcsv
        LEFT JOIN t_crm_supplier tcs ON tcsv.supplier_id = tcs.id
        <where>