diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java index e26a3335..e5df544c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFile.java @@ -75,6 +75,7 @@ public class LawsDataCenterFile implements Serializable { @Excel(name = "上传资料（文件id）", width = 15) @ApiModelProperty(value = "上传资料（文件id，上传时多个用逗号分隔）") @NotBlank(message = "上传资料不能为空") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private java.lang.String fileId; /**推送范围（用户id逗号拼接）*/ @Excel(name = "推送范围（用户id逗号拼接）", width = 15) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java index 3a112525..c044e9cf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java @@ -156,24 +156,8 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl fileIds = Arrays.asList(lawsDataCenterFile.getFileId().split(",")); - if (1 == fileIds.size()) { - updateById(lawsDataCenterFile); - return; - } - // 删除原来存储的 - removeById(lawsDataCenterFile.getId()); - List fileList = new ArrayList(); - fileIds.forEach(fileId -> { - LawsDataCenterFile file = new LawsDataCenterFile(); - BeanUtils.copyProperties(lawsDataCenterFile, file); - file.setFileId(fileId); - file.setId(null); - fileList.add(file); - }); - - saveBatch(fileList); + updateById(lawsDataCenterFile); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java index f357ee4b..09960493 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java @@ -1,6 +1,7 @@ package com.jero.modules.laws.localTool.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml index 9e79b06a..e33de5db 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml @@ -39,11 +39,13 @@ ) AS standard WHERE + standard.new_model_implementation_date IS NOT NULL AND standard.new_model_implementation_date LIKE CONCAT('%', #{item}, '%') + standard.on_the_production_date IS NOT NULL AND standard.on_the_production_date LIKE CONCAT('%', #{item}, '%') diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java index 17acb4b6..317d6d9d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/impl/LawsStandardEarlyWarningServiceImpl.java @@ -6,9 +6,12 @@ import com.jero.modules.laws.common.util.DateUtil; import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; import com.jero.modules.laws.localTool.mapper.LawsStandardEarlyWarningMapper; import com.jero.modules.laws.localTool.service.ILawsStandardEarlyWarningService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; /** @@ -17,6 +20,7 @@ import java.util.List; * @Description: 标准预警 */ @Service +@Slf4j public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWarningService { @Autowired @@ -29,12 +33,8 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa **/ @Override public IPage newModelImplementation(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) { - // 获取当前日前一周的日期字符串集合 - List dayStrings = DateUtil.getLastWeekDateAsString(); - standardEarlyWarning.setDayStrings(dayStrings); standardEarlyWarning.setNewModelImplementationDate("A"); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning); + IPage pageList = pageList(standardEarlyWarning, pageNo, pageSize); return pageList; } @@ -45,12 +45,37 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa **/ @Override public IPage onTheProduction(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) { + standardEarlyWarning.setOnTheProductionDate("A"); + IPage pageList = pageList(standardEarlyWarning, pageNo, pageSize); + return pageList; + } + + /** + * @Author: liao + * @Date: 2023/10/31 14:08 + * @Description: 标准预警通用分页查询 + **/ + private IPage pageList(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) { // 获取当前日前一周的日期字符串集合 List dayStrings = DateUtil.getLastWeekDateAsString(); + log.info("标准预警：当前一周的日期为{}", StringUtils.join(dayStrings, ",")); standardEarlyWarning.setDayStrings(dayStrings); - standardEarlyWarning.setOnTheProductionDate("A"); Page page = new Page<>(pageNo, pageSize); IPage pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning); + pageList.getRecords().forEach(warning -> { + // 新车型实施日期 + if (StringUtils.isNotBlank(standardEarlyWarning.getNewModelImplementationDate())) { + List eStrings = Arrays.asList(warning.getNewModelImplementationDate().split(",")); + eStrings.retainAll(dayStrings); // 删除eStrings中与dayStrings不相同的元素 + warning.setNewModelImplementationDate(eStrings.get(0)); + } + // 在产车实施日期 + if (StringUtils.isNotBlank(standardEarlyWarning.getOnTheProductionDate())) { + List eStrings = Arrays.asList(warning.getOnTheProductionDate().split(",")); + eStrings.retainAll(dayStrings); // 删除eStrings中与dayStrings不相同的元素 + warning.setOnTheProductionDate(eStrings.get(0)); + } + }); return pageList; }