From 978a5d8f3cbcb642e213374e6ff43544714d597b Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Fri, 7 Feb 2025 17:31:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/service/WorkPlanAllServiceImpl.java | 2 +- .../train/service/PersonTrainServiceImpl.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java index 5caafa3..966e3f1 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java @@ -51,7 +51,7 @@ public class WorkPlanAllServiceImpl implements WorkPlanAllService { if (list.size() > 0) { for (WorkPlanAllBean item : list) { //计算完成率 - if (item.getTotalNum() == null || "".equals(item.getTotalNum())) { + if (item.getTotalNum() == null || "".equals(item.getTotalNum())||item.getWorkNum() == null || "".equals(item.getWorkNum())) { item.setCompleteRate("0%"); } else { //计算完成率 diff --git a/modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java index 230a7a7..2b745e0 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java @@ -83,6 +83,16 @@ public class PersonTrainServiceImpl implements PersonTrainService { personComprehensiveDao.updateRedPersonData(id); } } + //判断分数是否为空 20250207 + if (StringUtils.isNull(bean.getCompanyExamScore())){ + bean.setCompanyExamScore(0); + } + if (StringUtils.isNull(bean.getDeptExamScore())){ + bean.setDeptExamScore(0); + } + if (StringUtils.isNull(bean.getTeamExamScore())){ + bean.setTeamExamScore(0); + } dao.updateWorkerLight(bean); return i > 0 ? R.ok(Constants.INSERT_SUCCESS) : R.fail(Constants.INSERT_FAIL); } @@ -152,12 +162,8 @@ public class PersonTrainServiceImpl implements PersonTrainService { private void getLight(PersonTrainBean o) { String light = "0"; - if (o.getCompanyExamScore() != null && - o.getDeptExamScore() != null && - o.getTeamExamScore() != null) { - if (o.getCompanyExamScore() >= 80 && - o.getDeptExamScore() >= 80 && - o.getTeamExamScore() >= 80) { + if (o.getCompanyExamScore() != null && o.getDeptExamScore() != null && o.getTeamExamScore() != null) { + if (o.getCompanyExamScore() >= 80 && o.getDeptExamScore() >= 80 && o.getTeamExamScore() >= 80) { light = "1"; o.setIsPass("1"); if (StringUtils.isNotEmpty(o.getTeamId()) && From 43904ad51f9b4b0cc371d1706b65862b33bc41e8 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Mon, 10 Feb 2025 15:27:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/file/upload/service/LocalSysFileServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/file/src/main/java/com/bonus/file/upload/service/LocalSysFileServiceImpl.java b/modules/file/src/main/java/com/bonus/file/upload/service/LocalSysFileServiceImpl.java index 759d875..1d2bf49 100644 --- a/modules/file/src/main/java/com/bonus/file/upload/service/LocalSysFileServiceImpl.java +++ b/modules/file/src/main/java/com/bonus/file/upload/service/LocalSysFileServiceImpl.java @@ -35,7 +35,7 @@ import java.util.regex.Pattern; /** * 本地文件存储 - * + * * @author zys */ @Primary @@ -62,7 +62,7 @@ public class LocalSysFileServiceImpl implements ISysFileService { /** * 本地文件上传接口 - * + * * @return 访问地址 * @throws Exception */ @@ -469,7 +469,7 @@ public class LocalSysFileServiceImpl implements ISysFileService { : R.fail(FaceStatusCodeReturn.faceStatusCodeReturn(Integer.parseInt(code))); } catch (Exception e) { log.error("上传文件失败", e); - return R.fail(e.getMessage()); + return R.fail("人脸识别失败,请重试"); } } From 51bd5f609824a01d13a5a07d8854827c5ffab329 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 14 Feb 2025 17:35:37 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AttendanceMachine/personEntryView.html | 1207 ++++++++--------- .../AttendanceMachine/personEntryView.js | 469 ++++--- .../Person/personEntry/personEntryView.html | 1093 ++++++++------- 3 files changed, 1410 insertions(+), 1359 deletions(-) diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html index 9b333f9..d08eb6d 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html @@ -1,5 +1,6 @@ + 施工人员库 @@ -7,664 +8,663 @@ + -
-
- -
-
- -
-
身份证信息
-
+
+ + +
+
+ +
+
身份证信息
+
-
- -
- - -
-
- -
- -
- - -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
- -
-
关键信息 - (必须填写,自动创建用户账号,手机号为登录账号) -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
-
-
- -
-
安全培训考试 - (7日内未完成禁止入场考勤打卡) -
-
-
- -
-
-
-
- -
- +
+ +
+ +
-
-
- -
- -
-
-
- -
-
-
-
- -
- +
+ +
+ +
-
-
- -
- -
-
-
- -
-
-
-
- -
- +
+ +
+
-
-
- -
- -
-
-
-
- -
-
社保信息 - (自有人员必须填写) -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
-
- -
- +
+ +
+
-
-
-
- -
-
其它信息 - (非必填项) -
-
-
- -
- +
+
+ +
+ +
+ - - - +
-
-
- -
-
+
+ +
+ +
-
-
- -
- -
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
分包班组信息 - (固定人员生成工资册之前必须完善) -
-
-
- -
- - + +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- -
-
-
- -
- - -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
-
-