diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/StandardStateEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/StandardStateEnum.java index d250e059..b7df1a85 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/StandardStateEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/StandardStateEnum.java @@ -1,21 +1,16 @@ package com.jero.modules.activiti.process.common.enums; +import lombok.Getter; + /** * @author: Mzaxd * @Date: 2023/11/20 14:50 */ +@Getter public enum StandardStateEnum { - DRAFT("草稿","1"), - SEEK_FOR_OPINIONS("征求意见","2"), - EXAMINE("审查","3"), - APPROVAL("报批","4"), - PRE_RELEASE("预发布","5"), - RELEASE("发布","6"), - TRIAL_OPERATION("试运行","7"), CURRENTLY_EFFECTIVE("现行有效","8"), ABOLISH("废止","9"), - ARCHIVE("封存","A"), ; private final String stateName; @@ -27,12 +22,4 @@ public enum StandardStateEnum { this.stateValue = stateValue; } - public String getStateName() { - return stateName; - } - - public String getStateValue() { - return stateValue; - } - } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 462eab8f..4566f61b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -336,8 +336,7 @@ public class ActFlowCommonService { LawsEnterpriseStandard es = esService.getById(standardId); if (es != null) { String standardState = es.getStandardState(); - if (StandardStateEnum.ABOLISH.getStateValue().equals(standardState) || - StandardStateEnum.ARCHIVE.getStateValue().equals(standardState)) { + if (StandardStateEnum.ABOLISH.getStateValue().equals(standardState)) { log.error("企标编号为{}的企标已经废止或者封存，无法进行复审流程", es.getStandardNumber()); throw new JeroBootException(ResultCommon.CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java index 213c3108..db8ab314 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/controller/LawsStandardEarlyWarningController.java @@ -1,17 +1,15 @@ package com.jero.modules.laws.localTool.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; import com.jero.modules.laws.localTool.service.ILawsStandardEarlyWarningService; -import com.jero.modules.laws.standard.entity.LawsNewsFeed; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -36,52 +34,27 @@ public class LawsStandardEarlyWarningController { @Resource private ILawsEnterpriseStandardService esService; - @AutoLog(value = "标准预警-新车型实施预警") - @ApiOperation(value = "标准预警-新车型实施预警", notes = "标准预警-新车型实施预警") - @GetMapping(value = "/newModelImplementation") - @RequiresPermissions("standardWarning:search") - public Result> newModelImplementation(StandardEarlyWarning standardEarlyWarning, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - IPage pageList = lawsStandardEarlyWarningService.newModelImplementation(standardEarlyWarning, pageNo, pageSize); + @AutoLog(value = "标准预警-最新入库标准") + @ApiOperation(value = "标准预警-最新入库标准", notes = "标准预警-最新入库标准") + @GetMapping(value = "/newAddStandard") + public Result> newAddStandard(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = lawsStandardEarlyWarningService.newAddStandard(pageNo, pageSize); return Result.OK(pageList); } - @AutoLog(value = "标准预警-在产车实施预警") - @ApiOperation(value = "标准预警-在产车实施预警", notes = "标准预警-在产车实施预警") - @GetMapping(value = "/onTheProduction") - @RequiresPermissions("standardWarning:search") - public Result> onTheProduction(StandardEarlyWarning standardEarlyWarning, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - IPage pageList = lawsStandardEarlyWarningService.onTheProduction(standardEarlyWarning, pageNo, pageSize); + @AutoLog(value = "标准预警-最新入库企标") + @ApiOperation(value = "标准预警-最新入库企标", notes = "标准预警-最新入库企标") + @GetMapping(value = "/newAddEsStandard") + public Result> newAddEsStandard(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = lawsStandardEarlyWarningService.newAddEsStandard(pageNo, pageSize); return Result.OK(pageList); } - - /** - * 标准预警-企标发布预警 - * - * @return - */ - @AutoLog(value = "标准预警-企标发布预警") - @ApiOperation(value = "标准预警-企标发布预警", notes = "标准预警-企标发布预警") - @GetMapping(value = "/latestReleaseEs") - @RequiresPermissions("standardWarning:search") - public Result latestReleaseEs(@RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { - return Result.OK(esService.latestReleaseEs(pageNo, pageSize)); - } - - /** - * 标准预警-企标实施预警 - * - * @return - */ - @AutoLog(value = "标准预警-企标实施预警") - @ApiOperation(value = "标准预警-企标实施预警", notes = "标准预警-企标实施预警") + @AutoLog(value = "标准预警-将实施标准") + @ApiOperation(value = "标准预警-将实施标准", notes = "标准预警-将实施标准") @GetMapping(value = "/latestImplementEs") - @RequiresPermissions("standardWarning:search") public Result latestImplementEs(@RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { return Result.OK(esService.latestImplementEs(pageNo, pageSize)); 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 74edc862..d878571e 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,8 +1,5 @@ package com.jero.modules.laws.localTool.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; @@ -41,11 +38,6 @@ public class StandardEarlyWarning { @ApiModelProperty(value = "标准号/标准名称") private java.lang.String standardNumberOrName; - /**责任部门*/ - @Excel(name = "责任部门", width = 15) - @ApiModelProperty(value = "责任部门") - private java.lang.String responsibleDepartment; - /**标准编号*/ @Excel(name = "标准编号", width = 15) @ApiModelProperty(value = "标准编号") @@ -56,14 +48,26 @@ public class StandardEarlyWarning { @ApiModelProperty(value = "标准名称") private java.lang.String standardName; - /**在产车实施日期*/ - @Excel(name = "在产车实施日期", width = 15) - @ApiModelProperty(value = "在产车实施日期") - private java.lang.String onTheProductionDate; - /**新车型实施日期*/ - @Excel(name = "新车型实施日期", width = 15) - @ApiModelProperty(value = "新车型实施日期") - private java.lang.String newModelImplementationDate; + /**外部标准状态*/ + @ApiModelProperty(value = "外部标准状态") + private java.lang.String standardState; + + /**企标状态*/ + @Excel(name = "企标状态", width = 15) + @ApiModelProperty(value = "企标状态") + private java.lang.String esStandardState; + + /** + * 新认证车实施日期 + */ + @ApiModelProperty(value = "新认证车实施日期") + private java.lang.String newAuthImplDate; + + /** + * 新生产车实施日期 + */ + @ApiModelProperty(value = "新生产车实施日期") + private java.lang.String newProductImplDate; /**当前天前一周*/ private List dayStrings; @@ -73,6 +77,7 @@ public class StandardEarlyWarning { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "查询时间开始") private java.util.Date startDate; + /**查询时间结束*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/ILawsStandardEarlyWarningService.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/ILawsStandardEarlyWarningService.java index bf8f3434..fe2ad421 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/ILawsStandardEarlyWarningService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/service/ILawsStandardEarlyWarningService.java @@ -1,7 +1,8 @@ package com.jero.modules.laws.localTool.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; /** * @Author: liao @@ -10,24 +11,14 @@ import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; */ public interface ILawsStandardEarlyWarningService { - /** - * @Author: liao - * @Date: 2023/10/31 10:30 - * @Description: 新车型实施预警 - **/ - IPage newModelImplementation(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize); - - /** - * @Author: liao - * @Date: 2023/10/31 13:32 - * @Description: 在产车实施预警 - **/ - IPage onTheProduction(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize); - /** * @Author: liao * @Date: 2023/11/10 17:13 * @Description: 定时发送消息 **/ void sendMsg(); + + IPage newAddStandard(Integer pageNo, Integer pageSize); + + IPage newAddEsStandard(Integer pageNo, Integer pageSize); } 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 4c077c7e..7dd35b0b 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 @@ -4,26 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.SendMessageAPI; -import com.jero.common.api.dto.message.SendMessageDTO; -import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; -import com.jero.modules.laws.common.util.DateUtil; -import com.jero.modules.laws.localTool.entity.LawsEarlyWarningMessage; +import com.jero.modules.activiti.process.common.enums.StandardStateEnum; import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; -import com.jero.modules.laws.localTool.mapper.LawsStandardEarlyWarningMapper; -import com.jero.modules.laws.localTool.service.ILawsEarlyWarningMessageService; import com.jero.modules.laws.localTool.service.ILawsStandardEarlyWarningService; -import com.jero.modules.system.entity.SysUserDepart; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.entity.OutStandardStateEnum; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.system.service.ISysUserDepartService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.stream.Collectors; +import java.time.LocalDate; +import java.util.List; /** * @Author: liao @@ -34,55 +29,14 @@ import java.util.stream.Collectors; @Slf4j public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWarningService { - @Autowired - private LawsStandardEarlyWarningMapper lawsStandardEarlyWarningMapper; - @Resource - private ILawsStandardEarlyWarningService lawsStandardEarlyWarningService; @Resource private ISysUserDepartService userDepartService; @Resource private SendMessageAPI sendMessageAPI; @Resource - private ILawsEarlyWarningMessageService lawsEarlyWarningMessageService; - - /** - * @Author: liao - * @Date: 2023/10/31 10:30 - * @Description: 新车型实施预警 - **/ - @Override - public IPage newModelImplementation(StandardEarlyWarning standardEarlyWarning, Integer pageNo, Integer pageSize) { - standardEarlyWarning.setNewModelImplementationDate("A"); - IPage pageList = pageList(standardEarlyWarning, pageNo, pageSize); - return pageList; - } - - /** - * @Author: liao - * @Date: 2023/10/31 13:32 - * @Description: 在产车实施预警 - **/ - @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.getHalfYearAsString(); - log.info("标准预警：当前半年的日期为{}", StringUtils.join(dayStrings, ",")); - standardEarlyWarning.setDayStrings(dayStrings); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = lawsStandardEarlyWarningMapper.pageList(page, standardEarlyWarning); - return pageList; - } + private ILawsDomesticStandardService domesticStandardService; + @Resource + private ILawsEnterpriseStandardService enterpriseStandardService; /** * @Author: liao @@ -91,21 +45,43 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa **/ @Override public void sendMsg() { - StandardEarlyWarning newModelImplementation = new StandardEarlyWarning(); - IPage newPage = lawsStandardEarlyWarningService.newModelImplementation(newModelImplementation, -1, -1); - List newList = newPage.getRecords(); - StandardEarlyWarning onTheProduction = new StandardEarlyWarning(); - IPage onPage = lawsStandardEarlyWarningService.onTheProduction(onTheProduction, -1, -1); - List onList = onPage.getRecords(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - // 新车型实施日期 - if (CollectionUtils.isNotEmpty(newList)) { - sendMsgList(MessageTemplateCodeCommon.NEW_MODEL_IMPLEMENTATION, newList, true); - } - // 在产车实施日期 - if (CollectionUtils.isNotEmpty(onList)) { - sendMsgList(MessageTemplateCodeCommon.ON_THE_PRODUCTION, onList, false); - } +// StandardEarlyWarning newModelImplementation = new StandardEarlyWarning(); +// IPage newPage = lawsStandardEarlyWarningService.newModelImplementation(newModelImplementation, -1, -1); +// List newList = newPage.getRecords(); +// StandardEarlyWarning onTheProduction = new StandardEarlyWarning(); +// IPage onPage = lawsStandardEarlyWarningService.onTheProduction(onTheProduction, -1, -1); +// List onList = onPage.getRecords(); +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// // 新车型实施日期 +// if (CollectionUtils.isNotEmpty(newList)) { +// sendMsgList(MessageTemplateCodeCommon.NEW_MODEL_IMPLEMENTATION, newList, true); +// } +// // 在产车实施日期 +// if (CollectionUtils.isNotEmpty(onList)) { +// sendMsgList(MessageTemplateCodeCommon.ON_THE_PRODUCTION, onList, false); +// } + } + + @Override + public IPage newAddStandard(Integer pageNo, Integer pageSize) { + // 获取当前日期往前90天以内创建的外部标准 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.ne(LawsDomesticStandard::getStandardState, OutStandardStateEnum.ABOLISH.getStateValue()); + queryWrapper.between(LawsDomesticStandard::getCreateTime, LocalDate.now().minusDays(90), LocalDate.now()); + queryWrapper.orderByDesc(LawsDomesticStandard::getCreateTime); + IPage page = new Page<>(pageNo, pageSize); + return domesticStandardService.page(page, queryWrapper); + } + + @Override + public IPage newAddEsStandard(Integer pageNo, Integer pageSize) { + // 获取当前日期往前90天以内创建的外部标准 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.ne(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ABOLISH.getStateValue()); + queryWrapper.between(LawsEnterpriseStandard::getCreateTime, LocalDate.now().minusDays(90), LocalDate.now()); + queryWrapper.orderByDesc(LawsEnterpriseStandard::getCreateTime); + IPage page = new Page<>(pageNo, pageSize); + return enterpriseStandardService.page(page, queryWrapper); } /** @@ -114,65 +90,45 @@ public class LawsStandardEarlyWarningServiceImpl implements ILawsStandardEarlyWa * @Description: 发送消息 **/ private void sendMsgList(String templateCode, List distinctList, Boolean flag) { - distinctList.forEach(data -> { - String departId = data.getResponsibleDepartment(); - List userDepartList = new ArrayList<>(); - if (StringUtils.isNotBlank(departId)) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUserDepart::getDepId, Arrays.asList(departId.split(","))); - userDepartList = userDepartService.list(queryWrapper); - } - if (CollectionUtils.isNotEmpty(userDepartList)) { - // 每个部门需要发消息的用户id集合 - List userIdList = userDepartList.stream().map(SysUserDepart::getUserId).collect(Collectors.toList()); - String userIds = StringUtils.join(userIdList, ","); - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - sendMessageDTO.setTemplateCode(templateCode); - sendMessageDTO.setToUserId(userIds); - Map map = new HashMap<>(); - String standardNumber = data.getStandardNumber(); - map.put("standardNumber", standardNumber); - map.put("standardName", data.getStandardName()); - String dateDay; - if (flag) { // 新车型实施日期 - dateDay = data.getNewModelImplementationDate(); - if (isNotExist(standardNumber, dateDay, "1")) { - map.put("days", dateDay); - sendMessageDTO.setMap(map); - sendMessageAPI.sendMessage(sendMessageDTO); - saveWarningMessage(standardNumber, dateDay, "1"); - } - } else { // 在产车实施日期 - dateDay = data.getOnTheProductionDate(); - if (isNotExist(standardNumber, dateDay, "2")) { - map.put("days", dateDay); - sendMessageDTO.setMap(map); - sendMessageAPI.sendMessage(sendMessageDTO); - saveWarningMessage(standardNumber, dateDay, "2"); - } - } - } - }); - } - - private Boolean isNotExist(String standardNumber, String dateDay, String type) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(LawsEarlyWarningMessage::getStandardNumber, standardNumber) - .eq(LawsEarlyWarningMessage::getWarningDay, dateDay) - .eq(LawsEarlyWarningMessage::getWarningType, type); - LawsEarlyWarningMessage lawsEarlyWarningMessage = lawsEarlyWarningMessageService.getOne(queryWrapper, false); - if (lawsEarlyWarningMessage == null) { - return true; - } - return false; - } - - private void saveWarningMessage(String standardNumber, String dateDay, String type) { - LawsEarlyWarningMessage lawsEarlyWarningMessage = new LawsEarlyWarningMessage(); - lawsEarlyWarningMessage.setStandardNumber(standardNumber); - lawsEarlyWarningMessage.setWarningDay(dateDay); - lawsEarlyWarningMessage.setWarningType(type); - lawsEarlyWarningMessageService.save(lawsEarlyWarningMessage); +// distinctList.forEach(data -> { +// String departId = data.getResponsibleDepartment(); +// List userDepartList = new ArrayList<>(); +// if (StringUtils.isNotBlank(departId)) { +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.in(SysUserDepart::getDepId, Arrays.asList(departId.split(","))); +// userDepartList = userDepartService.list(queryWrapper); +// } +// if (CollectionUtils.isNotEmpty(userDepartList)) { +// // 每个部门需要发消息的用户id集合 +// List userIdList = userDepartList.stream().map(SysUserDepart::getUserId).collect(Collectors.toList()); +// String userIds = StringUtils.join(userIdList, ","); +// SendMessageDTO sendMessageDTO = new SendMessageDTO(); +// sendMessageDTO.setTemplateCode(templateCode); +// sendMessageDTO.setToUserId(userIds); +// Map map = new HashMap<>(); +// String standardNumber = data.getStandardNumber(); +// map.put("standardNumber", standardNumber); +// map.put("standardName", data.getStandardName()); +// String dateDay; +// if (flag) { // 新车型实施日期 +// dateDay = data.getNewModelImplementationDate(); +// if (isNotExist(standardNumber, dateDay, "1")) { +// map.put("days", dateDay); +// sendMessageDTO.setMap(map); +// sendMessageAPI.sendMessage(sendMessageDTO); +// saveWarningMessage(standardNumber, dateDay, "1"); +// } +// } else { // 在产车实施日期 +// dateDay = data.getOnTheProductionDate(); +// if (isNotExist(standardNumber, dateDay, "2")) { +// map.put("days", dateDay); +// sendMessageDTO.setMap(map); +// sendMessageAPI.sendMessage(sendMessageDTO); +// saveWarningMessage(standardNumber, dateDay, "2"); +// } +// } +// } +// }); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsDomesticStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsDomesticStandard.java index 654529fb..772bed6f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsDomesticStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsDomesticStandard.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.standard.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -115,6 +116,7 @@ public class LawsDomesticStandard implements Serializable { /**标准状态*/ @Excel(name = "标准状态", width = 15) @ApiModelProperty(value = "标准状态") + @Dict(dicCode = "standard_state") private java.lang.String standardState; /**责任人*/ @Excel(name = "责任人", width = 15) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java index 33d2b2a1..29af6346 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/job/UpdateStandardStatusJob.java @@ -41,7 +41,7 @@ public class UpdateStandardStatusJob implements Job { esWrapper.eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getInteger()); esWrapper.isNotNull(LawsEnterpriseStandard::getReleaseDate); esWrapper.isNotNull(LawsEnterpriseStandard::getImplementationDate); - esWrapper.eq(LawsEnterpriseStandard::getStandardState, StandardStateEnum.RELEASE.getStateValue()); + esWrapper.eq(LawsEnterpriseStandard::getStandardState, StandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue()); List esList = esService.list(esWrapper); for (LawsEnterpriseStandard es : esList) { // 实施日期及之后的标准 状态更新为现行有效