cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	safety-eval-start/src/main/resources/templates/safetyEval.html
dev
huwei 2026-07-08 16:46:15 +08:00
parent 306637d44b 25c9ca645f
commit 480e9fbfa9
9 changed files with 9 additions and 2103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgQualificationGatewayImpl.java
View File

@ -86,8 +86,8 @@ public class OrgQualificationGatewayImpl implements OrgQualificationGateway {
wrapper.eq(OrgQualificationDO::getEnableFlag, query.getEnableFlag()); wrapper.eq(OrgQualificationDO::getEnableFlag, query.getEnableFlag());
} }
if (query.getStartTime() != null && query.getEndTime() != null) { if (query.getStartTime() != null && query.getEndTime() != null) {
wrapper.ge(OrgQualificationDO::getValidStartDate, query.getStartTime().toLocalDate()) wrapper.le(OrgQualificationDO::getValidStartDate, query.getStartTime().toLocalDate())
.le(OrgQualificationDO::getValidEndDate, query.getEndTime().toLocalDate()); .ge(OrgQualificationDO::getValidEndDate, query.getEndTime().toLocalDate());
} }
Page<OrgQualificationDO> page = new Page<>(query.getPageNum(), query.getPageSize()); Page<OrgQualificationDO> page = new Page<>(query.getPageNum(), query.getPageSize());

4
safety-eval-start/src/main/resources/templates/safetyEval.html
View File

@ -1,4 +1,4 @@
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/8 16:24:36] App_Identifier[safetyEval]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () { <!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/8 15:29:29] App_Identifier[safetyEval]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () {
const APP_ENV = { const APP_ENV = {
antd: { antd: {
'ant-prefix': 'micro-temp', 'ant-prefix': 'micro-temp',
@ -89,4 +89,4 @@
}, },
} }
}</script><script defer="defer" src="/safetyEval/static/js/934.ada55f776be86394.js"></script><script defer="defer" src="/safetyEval/static/js/121.ae75e71830bf4ae0.js"></script><script defer="defer" src="/safetyEval/static/js/289.f12da2fe2f6ad2ae.js"></script><script defer="defer" src="/safetyEval/static/js/main.5ef5933af7c7f2d5.js"></script><link href="/safetyEval/static/css/main.cb6068c6562f0d94.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/8 16:24:36] App_Identifier[safetyEval] Frontend_Branch[dev] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html> }</script><script defer="defer" src="/safetyEval/static/js/379.7b4c2533d0a3b689.js"></script><script defer="defer" src="/safetyEval/static/js/121.ae75e71830bf4ae0.js"></script><script defer="defer" src="/safetyEval/static/js/289.f12da2fe2f6ad2ae.js"></script><script defer="defer" src="/safetyEval/static/js/main.a42edbbd465b6cbd.js"></script><link href="/safetyEval/static/css/main.cb6068c6562f0d94.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/8 15:29:29] App_Identifier[safetyEval] Frontend_Branch[dev] Backend_Branch[dev]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

1649
safety-eval-start/src/main/resources/templates/safetyEval/static/css/main.f0c1f19621be5be6.css
View File

File diff suppressed because it is too large Load Diff

2
safety-eval-start/src/main/resources/templates/safetyEval/static/jjb.config.js
View File

@ -1 +1 @@
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"http://192.168.0.103"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"safetyEval",contextInject:{appKey:"",fileUrl:"https://skqhdg.porthebei.com:9004/file/uploadFiles2/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8081",host:"192.168.0.187",open:!1},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}}; module.exports={javaGit:"http://47.92.113.182:3000/cq_anquan/safety-eval-service.git",javaGitName:"safety-eval-service",environment:{development:{javaGitBranch:"dev",API_HOST:"http://192.168.0.152"},production:{javaGitBranch:"dev",API_HOST:""}},appIdentifier:"safetyEval",contextInject:{appKey:"",fileUrl:"https://skqhdg.porthebei.com:9004/file/uploadFiles2/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8081",host:"192.168.0.187",open:!1},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};

444
safety-eval-start/src/main/resources/templates/safetyEval/static/js/237.0100f317a982ca7b.js
View File

File diff suppressed because one or more lines are too long

6
safety-eval-start/src/main/resources/templates/safetyEval/static/js/934.ada55f776be86394.js → safety-eval-start/src/main/resources/templates/safetyEval/static/js/379.7b4c2533d0a3b689.js
View File

File diff suppressed because one or more lines are too long

1
safety-eval-start/src/main/resources/templates/safetyEval/static/js/main.0c74d245d3778f67.js
View File

File diff suppressed because one or more lines are too long

1
safety-eval-start/src/main/resources/templates/safetyEval/static/js/main.6ff8cc6ae670e8a0.js
View File

File diff suppressed because one or more lines are too long

1
safety-eval-start/src/main/resources/templates/safetyEval/static/js/main.a42edbbd465b6cbd.js Normal file
View File

File diff suppressed because one or more lines are too long