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

update 80891 【需求变更】未符合项-状态问题需更改

Browse Source
This commit is contained in:
lijiarao
2024-01-25 17:33:39 +08:00
parent f63240287f
commit 64e2649fdf
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
+4 -2
View File
@@ -128,8 +128,10 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT); throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT);
} }
String state = notMet.getState(); String state = notMet.getState();
//判断是否是待整改，超期 //判断是否是待整改，超期，警示
if (!state.equals(AssessCommon.TO_BE_RECTIFIED) && !state.equals(AssessCommon.OVERDUE)) { if (!state.equals(AssessCommon.TO_BE_RECTIFIED)
&& !state.equals(AssessCommon.WARNING)
&& !state.equals(AssessCommon.OVERDUE)) {
return false; return false;
} }
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
+5 -3
View File
@@ -1,5 +1,6 @@
package com.jero.modules.projectLibrary.service.impl; package com.jero.modules.projectLibrary.service.impl;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,9 +24,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import java.util.List;
import java.util.Date; import java.util.*;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
@@ -96,6 +96,8 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
.like(LawsEvaluationNotMet::getStandardName,standardNumberOrName) .like(LawsEvaluationNotMet::getStandardName,standardNumberOrName)
); );
} }
//待整改，超期，警示的数据可以选择
queryWrapper.lambda().in(LawsEvaluationNotMet::getState, Arrays.asList(AssessCommon.TO_BE_RECTIFIED, AssessCommon.WARNING, AssessCommon.OVERDUE));
Page<LawsEvaluationNotMet> page = new Page<>(pageNo, pageSize); Page<LawsEvaluationNotMet> page = new Page<>(pageNo, pageSize);
return page(page, queryWrapper); return page(page, queryWrapper);
} }
laws-single-startup/src/main/resources/i18n/messages.properties
+1 -1
View File
@@ -35,7 +35,7 @@ the.job.number.cannot.be.empty.export=Line {0},job number cannot be empty
the.real.name.cannot.be.empty.export=Line {0},real name cannot be empty the.real.name.cannot.be.empty.export=Line {0},real name cannot be empty
job.number.does.not.exist.export=Line {0},job number does not exist job.number.does.not.exist.export=Line {0},job number does not exist
duplicate.job.number.export=Line {0},duplicate job number duplicate.job.number.export=Line {0},duplicate job number
cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u6216\u8D85\u671F\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u3001\u8B66\u793A\u6216\u8D85\u671F\u72B6\u6001\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED
no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55 no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55
parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
laws-single-startup/src/main/resources/i18n/messages_en.properties
+1 -1
View File
@@ -37,7 +37,7 @@ the.job.number.cannot.be.empty.export=Line {0},job number cannot be empty
the.real.name.cannot.be.empty.export=Line {0},real name cannot be empty the.real.name.cannot.be.empty.export=Line {0},real name cannot be empty
job.number.does.not.exist.export=Line {0},job number does not exist job.number.does.not.exist.export=Line {0},job number does not exist
duplicate.job.number.export=Line {0},duplicate job number duplicate.job.number.export=Line {0},duplicate job number
cannot.close=Data that is not pending rectification or overdue cannot be closed cannot.close=Data that is not pending rectification, warning, or overdue cannot be closed
laws-single-startup/src/main/resources/i18n/messages_zh.properties
+1 -1
View File
@@ -36,7 +36,7 @@ the.job.number.cannot.be.empty.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u80FD\u
the.real.name.cannot.be.empty.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A the.real.name.cannot.be.empty.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A
job.number.does.not.exist.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u5B58\u5728 job.number.does.not.exist.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u5B58\u5728
duplicate.job.number.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u91CD\u590D duplicate.job.number.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u91CD\u590D
cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u6216\u8D85\u671F\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u3001\u8B66\u793A\u6216\u8D85\u671F\u72B6\u6001\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED