ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 80334 未符合项流程发起，页面状态没有发生变化

Browse Source
This commit is contained in:
lijiarao
2024-01-08 16:02:22 +08:00
parent 20d58adf06
commit 94a2db2a42
4 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/projectLibrary/job/UpdateStatusJob.java
+11 -2
View File
@@ -31,11 +31,15 @@ public class UpdateStatusJob implements Job {
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
DateTime date = DateUtil.parseDateTime(DateUtil.formatDateTime(new Date()));
date = date.setField(DateField.SECOND,0);
date = date
.setField(DateField.HOUR_OF_DAY,0)
.setField(DateField.MINUTE,0)
.setField(DateField.SECOND,0);
//预计整改完成日期前一天
DateTime theDayBefore = DateUtil.offsetDay(date, 1);
LambdaQueryWrapper<LawsEvaluationNotMet> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsEvaluationNotMet::getExpectedTime,theDayBefore);
wrapper.eq(LawsEvaluationNotMet::getState, AssessCommon.TO_BE_RECTIFIED);
List<LawsEvaluationNotMet> list = lawsEvaluationNotMetService.list(wrapper);
for (LawsEvaluationNotMet lawsEvaluationNotMet : list) {
LambdaUpdateWrapper<LawsEvaluationNotMet> updateWrapper = new LambdaUpdateWrapper<>();
@@ -46,7 +50,12 @@ public class UpdateStatusJob implements Job {
//预计整改完成日期后一天
DateTime theDayAfter = DateUtil.offsetDay(date, -1);
LambdaQueryWrapper<LawsEvaluationNotMet> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(LawsEvaluationNotMet::getExpectedTime,theDayAfter);
wrapper1.le(LawsEvaluationNotMet::getExpectedTime,theDayAfter);
wrapper1.and(a -> {
a.eq(LawsEvaluationNotMet::getState, AssessCommon.TO_BE_RECTIFIED)
.or()
.eq(LawsEvaluationNotMet::getState, AssessCommon.WARNING);
});
List<LawsEvaluationNotMet> list1 = lawsEvaluationNotMetService.list(wrapper1);
for (LawsEvaluationNotMet lawsEvaluationNotMet : list1) {
LambdaUpdateWrapper<LawsEvaluationNotMet> updateWrapper = new LambdaUpdateWrapper<>();
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
+4 -4
View File
@@ -75,12 +75,12 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
parameterMap.remove("standardNumber");
parameterMap.remove("standardName");
QueryWrapper<LawsEvaluationNotMet> queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, parameterMap);
String standardNumber = lawsEvaluationNotMet.getStandardNumber();
if (StringUtils.isNotBlank(standardNumber)){
String standardNumberOrName = lawsEvaluationNotMet.getStandardNumberOrName();
if (StringUtils.isNotBlank(standardNumberOrName)){
queryWrapper.lambda().and(
a-> a.like(LawsEvaluationNotMet::getStandardNumber,standardNumber)
a-> a.like(LawsEvaluationNotMet::getStandardNumber,standardNumberOrName)
.or()
.like(LawsEvaluationNotMet::getStandardName,standardNumber)
.like(LawsEvaluationNotMet::getStandardName,standardNumberOrName)
);
}
Page<LawsEvaluationNotMet> page = new Page<>(pageNo, pageSize);