From ab7eb1659277c6c402eb0368caa37e6c9b2c72fe Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 7 Apr 2025 13:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=88=86=E9=85=8D=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/open/service/impl/OpenServiceImpl.java | 3 +-- .../impl/QcCheckTaskIncomeServiceImpl.java | 18 +++++++++--------- .../service/impl/QcInterfaceServiceImpl.java | 2 +- .../service/impl/QcStaticTableServiceImpl.java | 4 ++-- .../mapper/quality/QcInterfaceMapper.xml | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 0d5c4b253..61f7a06bb 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -431,7 +431,7 @@ public class OpenServiceImpl implements OpenService { List users = openMapper.getCheckUserBelongLine(qcCheckTaskProduce); if (CollectionUtils.isEmpty(users)) { users = openMapper.getCheckUsers(qcCheckTaskProduce.getCheckType()); - } else { + } for (QcUserMaterialDTO user : users) { user.setId(IdUtils.fastSimpleUUID()); user.setBelongTo(beLongId); @@ -440,7 +440,6 @@ public class OpenServiceImpl implements OpenService { user.setFactoryCode(factoryCode); user.setCreateTime(nowDate); } - } /**qc_check_task_user**/ int m = openMapper.addCheckUsers(users); logger.info(qcCheckTaskProduce.getOrderNo()+":检查人新增" + m + "成功"); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 5f3be4aea..9db257027 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -239,16 +239,16 @@ public class QcCheckTaskIncomeServiceImpl implements users = qcCheckTaskIncomeMapper.getCheckUserBelongStandar(qcCheckTaskIncome); if(CollectionUtils.isEmpty(users)){ users = qcCheckTaskIncomeMapper.getCheckUser(qcCheckTaskIncome); - }else{ - for(QcUserMaterialDTO user:users){ - user.setId(IdUtils.fastSimpleUUID()); - user.setBelongTo(beLongId); - user.setCheckNo(qcCheckTaskIncome.getCheckNo()); - user.setCreateBy(createBy); - user.setFactoryCode(factoryCode); - user.setCreateTime(nowDate); - } } + for(QcUserMaterialDTO user:users){ + user.setId(IdUtils.fastSimpleUUID()); + user.setBelongTo(beLongId); + user.setCheckNo(qcCheckTaskIncome.getCheckNo()); + user.setCreateBy(createBy); + user.setFactoryCode(factoryCode); + user.setCreateTime(nowDate); + } + int m=qcCheckTaskIncomeMapper.addCheckUsers(users); logger.info("检查人新增"+m+"成功"); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java index e581e4e06..ad082938a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java @@ -128,7 +128,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { qcInterface.setYmd(nowYMD); List dtos = qcInterfaceMapper.getSupplierTaskList(qcInterface); for (QcInterface dto : dtos) { - String[] ymdArray = dto.getIncomeTime().split("-"); + String[] ymdArray = dto.getIncomeTime().split(" ")[0].split("-"); LocalDate date1 = LocalDate.of(Integer.parseInt(ymdArray[0]), Integer.parseInt(ymdArray[1]), Integer.parseInt(ymdArray[2])); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 781e73220..f3254b30b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -1779,7 +1779,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { Map dto2= new HashMap<>(); dto2.put("dataType","不良比例"); Map dto3 = new HashMap<>(); - dto3.put("dataType","累计不良率"); + dto3.put("dataType","累计不良比例"); for(int i=0;i dto2= new HashMap<>(); dto2.put("dataType","不良比例"); Map dto3 = new HashMap<>(); - dto3.put("dataType","累计不良率"); + dto3.put("dataType","累计不良比例"); for(int i=0;i