zcloud_gbs
/
zcloud_gbs_safetyDutyList
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6-17 - bug修复

master
tianxinlei 2026-06-17 09:00:28 +08:00
parent e726aea0ae
commit d0640c72c3
10 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start/src/main/resources/templates/safetyDutyList.html
View File

@ -1,4 +1,4 @@
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0 Env/production (2026/6/9 17:57:56) App/safetyDutyList"><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 Env/production (2026/6/16 17:27:02) App/safetyDutyList"><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',
@ -20,4 +20,4 @@
redirect: '', redirect: '',
FRAMEWORK: APP_ENV.antd FRAMEWORK: APP_ENV.antd
}; };
})();</script><script defer="defer" src="/safetyDutyList/static/js/185.46e52d05996ddef5e7f4.js"></script><script defer="defer" src="/safetyDutyList/static/js/26.7e37655f7b2954f97c50.js"></script><script defer="defer" src="/safetyDutyList/static/js/main.cd9beec701b863d55554.js"></script><link href="/safetyDutyList/static/css/main.c74fbb90829596498e3a.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 Env/production (2026/6/9 17:57:56) App/safetyDutyList Version/main Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html> })();</script><script defer="defer" src="/safetyDutyList/static/js/185.46e52d05996ddef5e7f4.js"></script><script defer="defer" src="/safetyDutyList/static/js/26.7e37655f7b2954f97c50.js"></script><script defer="defer" src="/safetyDutyList/static/js/main.fa995cb26515e0ecf4f3.js"></script><link href="/safetyDutyList/static/css/main.c74fbb90829596498e3a.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 Env/production (2026/6/16 17:27:02) App/safetyDutyList Version/main Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

2
start/src/main/resources/templates/safetyDutyList/static/jjb.config.js
View File

@ -1 +1 @@
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"safetyDutyList",contextInject:{appKey:"",fileUrl:"https://jpfz.qhdsafety.com/gbsFileTest/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8080",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}}; module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"safetyDutyList",contextInject:{appKey:"",fileUrl:"https://jpfz.qhdsafety.com/gbsFileTest/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8070",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};

2
start/src/main/resources/templates/safetyDutyList/static/js/main.a74ba4179cd54ee678ed.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/safetyDutyList/static/js/main.a74ba4179cd54ee678ed.js.LICENSE.txt Normal file
View File

@ -0,0 +1 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */

2
start/src/main/resources/templates/safetyDutyList/static/js/main.e890a684a077455a1590.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/safetyDutyList/static/js/main.e890a684a077455a1590.js.LICENSE.txt Normal file
View File

@ -0,0 +1 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */

2
start/src/main/resources/templates/safetyDutyList/static/js/main.fa995cb26515e0ecf4f3.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/safetyDutyList/static/js/main.fa995cb26515e0ecf4f3.js.LICENSE.txt Normal file
View File

@ -0,0 +1 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */

27
web-app/src/main/java/com/zcloud/safetyDutyList/command/query/tasklist/FeedbackQueryExe.java
View File

@ -14,8 +14,12 @@ import com.zcloud.safetyDutyList.persistence.repository.tasklist.FeedbackReposit
import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskDetailRepository; import com.zcloud.safetyDutyList.persistence.repository.tasklist.TaskDetailRepository;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -35,16 +39,29 @@ public class FeedbackQueryExe {
// Filter by time range if provided // Filter by time range if provided
if (qry.getFeedbackTimeStart() != null || qry.getFeedbackTimeEnd() != null) { if (qry.getFeedbackTimeStart() != null || qry.getFeedbackTimeEnd() != null) {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
feedbackList = feedbackList.stream().filter(f -> { feedbackList = feedbackList.stream().filter(f -> {
boolean match = true;
if (qry.getFeedbackTimeStart() != null && !qry.getFeedbackTimeStart().isEmpty() && f.getFeedbackTime() != null) { if (f.getFeedbackTime() == null) {
match = f.getFeedbackTime().isAfter(java.time.LocalDate.parse(qry.getFeedbackTimeStart()).atStartOfDay()); return false;
} }
if (qry.getFeedbackTimeEnd() != null && !qry.getFeedbackTimeEnd().isEmpty() && f.getFeedbackTime() != null) {
match = match && f.getFeedbackTime().isBefore(java.time.LocalDate.parse(qry.getFeedbackTimeEnd()).plusDays(1).atStartOfDay()); boolean match = true;
if (qry.getFeedbackTimeStart() != null && !qry.getFeedbackTimeStart().isEmpty()) {
LocalDateTime startParse = LocalDateTime.parse(qry.getFeedbackTimeStart(), dateTimeFormatter);
LocalDateTime dayStart = startParse.with(LocalTime.MIN);
match = f.getFeedbackTime().isAfter(dayStart);
}
if (qry.getFeedbackTimeEnd() != null && !qry.getFeedbackTimeEnd().isEmpty()) {
LocalDateTime endParse = LocalDateTime.parse(qry.getFeedbackTimeEnd(), dateTimeFormatter);
LocalDateTime dayEnd = endParse.plusDays(1).with(LocalTime.MIN);
match = match && f.getFeedbackTime().isBefore(dayEnd);
} }
return match; return match;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
Map<String, List<FeedbackDO>> groupedByPeriod = feedbackList.stream() Map<String, List<FeedbackDO>> groupedByPeriod = feedbackList.stream()

2
web-infrastructure/src/main/resources/mapper/tasklist/TaskListIssueMapper.xml
View File

@ -55,7 +55,7 @@
<if test="params.status != null"> <if test="params.status != null">
AND tli.status = #{params.status} AND tli.status = #{params.status}
</if> </if>
<if test="params.scoreStatus != null"> <if test="params.scoreStatus != null and params.scoreStatus != ''">
<!-- 状态必须是 2 已完成 或 3 已关闭 --> <!-- 状态必须是 2 已完成 或 3 已关闭 -->
AND tli.status IN (2, 3) AND tli.status IN (2, 3)
<!-- scoreStatus = 0：分数为空 --> <!-- scoreStatus = 0：分数为空 -->