From 63fd66413265dfc6d6248ec7f1700bd7d7837f8c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 七月 2025 15:19:18 +0800
Subject: [PATCH] art: 技术状态鉴定工单-锁定、过期定时任务

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java |  237 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 141 insertions(+), 96 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
index 7117add..257f24f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -40,6 +41,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -165,14 +167,15 @@
             throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冩鏌ラ」涓虹┖锛屾坊鍔犲け璐ワ紒");
         }
         EamTechnicalStatusEvaluationOrder order = new EamTechnicalStatusEvaluationOrder();
-        order.setOrderNum(request.getOrderNum());
         order.setEquipmentId(request.getEquipmentId());
         order.setStandardId(request.getStandardId());
         order.setEvaluationDate(request.getEvaluationDate());
+        order.setFreezeOrderDate(request.getFreezeOrderDate());
+        order.setOrderExpirationDate(request.getOrderExpirationDate());
         order.setRemark(request.getRemark());
         String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE);
         order.setOrderNum(codeSeq);
-        order.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+        order.setCreationMethod(request.getCreationMethod());
         //鐘舵�佸垵濮嬪寲
         order.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
         //鍒犻櫎鏍囪
@@ -330,6 +333,9 @@
         List<UserSelector> userSelectors;
         switch (status) {
             case UNDER_EVALUATION:
+                if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+                    throw new JeecgBootException("妫�鏌ユ槑缁嗕俊鎭负绌猴紒");
+                }
                 boolean parallelCompletion = flowTaskService.checkParallelCompletion(flowMyBusiness.getTaskId());
                 //鎵ц瀹屾垚
                 userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
@@ -342,7 +348,10 @@
                 values.put("comment", "鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
                 request.setComment("鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
                 //璁剧疆entity
-                if (parallelCompletion) {
+                if (CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())
+                        && CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())
+                        && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())
+                        && parallelCompletion) {
                     //澶氫釜浠诲姟閮藉凡瀹屾垚涓旂淮淇涓讳换閮藉凡瀹℃壒閫氳繃,浼氱瀹屾垚锛岃繘琛岀淮淇伐绛惧瓧
                     userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
                     userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
@@ -352,102 +361,93 @@
                 }
                 if ("safety_equipment_check".equals(flowMyBusiness.getTaskNameId())) {
                     //鎵ц瀹夊叏妫�鏌�
-                    if (CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())) {
-                        values.put("safetyEquipmentCheckFlag", request.getSafetyCheckConfirmResult());
-                        entity.setSafetyCheckConfirmResult(request.getSafetyCheckConfirmResult());
-                        entity.setSafetyCheckConfirm(user.getUsername());
-                        entity.setSafetyCheckConfirmTime(new Date());
-                        entity.setSafetyCheckConfirmComment(request.getSafetyCheckConfirmComment());
-                        //缁翠慨瀹や富浠诲鎵�
-                        if (!CommonConstant.STATUS_1.equals(request.getSafetyCheckConfirmResult())) {
-                            //椹冲洖 缁欑洃瀵熶汉
-                            userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
-                            values.put("NextAssignee", userApprovalList);
-                            entity.setSafetyCheckCompleted(CommonConstant.STATUS_0);
-                        }
-                    } else {
-                        //瀹夊叏瑁呯疆妫�鏌ョ粨鏋滃~鎶�
-                        List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
-                        if(CollectionUtil.isEmpty(collect)) {
-                            throw new JeecgBootException("瀹夊叏瑁呯疆妫�鏌ラ」鏄庣粏涓虹┖锛�");
-                        }
-                        //缁撴灉椤规鏌�
-                        checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK);
-                        //娣诲姞鎿嶄綔浜轰俊鎭�
-                        for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
-                            detail.setRepairmanSignature(user.getUsername());
-                            detail.setRepairmanSignatureTime(new Date());
-                        }
-                        orderDetailService.updateBatchById(collect);
+                    //瀹夊叏瑁呯疆妫�鏌ョ粨鏋滃~鎶�
+                    List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
+                    if (CollectionUtil.isEmpty(collect)) {
+                        throw new JeecgBootException("瀹夊叏瑁呯疆妫�鏌ラ」鏄庣粏涓虹┖锛�");
+                    }
+                    //缁撴灉椤规鏌�
+                    checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK);
+                    //娣诲姞鎿嶄綔浜轰俊鎭�
+                    for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
+                        detail.setRepairmanSignature(user.getUsername());
+                        detail.setRepairmanSignatureTime(new Date());
+                    }
+                    orderDetailService.updateBatchById(collect);
+                    values.put("NextAssignee", userApprovalList);
+                    entity.setSafetyCheckCompleted(CommonConstant.STATUS_1);
+                } else if ("safety_equipment_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())) {
+                    values.put("safetyEquipmentCheckFlag", request.getSafetyCheckConfirmResult());
+                    entity.setSafetyCheckConfirmResult(request.getSafetyCheckConfirmResult());
+                    entity.setSafetyCheckConfirm(user.getUsername());
+                    entity.setSafetyCheckConfirmTime(new Date());
+                    entity.setSafetyCheckConfirmComment(request.getSafetyCheckConfirmComment());
+                    //缁翠慨瀹や富浠诲鎵�
+                    if (!CommonConstant.STATUS_1.equals(request.getSafetyCheckConfirmResult())) {
+                        //椹冲洖 缁欑洃瀵熶汉
+                        userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
                         values.put("NextAssignee", userApprovalList);
-                        entity.setSafetyCheckCompleted(CommonConstant.STATUS_1);
+                        entity.setSafetyCheckCompleted(CommonConstant.STATUS_0);
                     }
                 } else if ("equipment_precision_check".equals(flowMyBusiness.getTaskNameId())) {
                     //澶勭悊绮惧害妫�楠�
-                    if (CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())) {
-                        values.put("precisionCheckFlag", request.getPrecisionCheckConfirmResult());
-                        entity.setPrecisionCheckConfirmResult(request.getPrecisionCheckConfirmResult());
-                        entity.setPrecisionCheckConfirm(user.getUsername());
-                        entity.setPrecisionCheckConfirmTime(new Date());
-                        entity.setPrecisionCheckConfirmComment(request.getPrecisionCheckConfirmComment());
-                        //缁翠慨瀹や富浠诲鎵�
-                        if (!CommonConstant.STATUS_1.equals(request.getPrecisionCheckConfirmResult())) {
-                            //椹冲洖 缁欑洃瀵熶汉
-                            userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
-                            values.put("NextAssignee", userApprovalList);
-                            entity.setPrecisionCheckCompleted(CommonConstant.STATUS_0);
-                        }
-                    } else {
-                        //璁惧绮惧害妫�鏌ョ粨鏋滃~鎶�
-                        List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
-                        if(CollectionUtil.isEmpty(collect)) {
-                            throw new JeecgBootException("璁惧绮惧害妫�鏌ラ」鏄庣粏涓虹┖锛�");
-                        }
-                        //缁撴灉椤规鏌�
-                        checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK);
-                        //娣诲姞鎿嶄綔浜轰俊鎭�
-                        for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
-                            detail.setRepairmanSignature(user.getUsername());
-                            detail.setRepairmanSignatureTime(new Date());
-                        }
-                        orderDetailService.updateBatchById(collect);
-                        values.put("NextAssignee", userApprovalList);
-                        entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
+                    //璁惧绮惧害妫�鏌ョ粨鏋滃~鎶�
+                    List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
+                    if (CollectionUtil.isEmpty(collect)) {
+                        throw new JeecgBootException("璁惧绮惧害妫�鏌ラ」鏄庣粏涓虹┖锛�");
                     }
-
+                    //缁撴灉椤规鏌�
+                    checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK);
+                    //娣诲姞鎿嶄綔浜轰俊鎭�
+                    for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
+                        detail.setRepairmanSignature(user.getUsername());
+                        detail.setRepairmanSignatureTime(new Date());
+                    }
+                    orderDetailService.updateBatchById(collect);
+                    values.put("NextAssignee", userApprovalList);
+                    entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
+                } else if ("equipment_precision_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())) {
+                    values.put("precisionCheckFlag", request.getPrecisionCheckConfirmResult());
+                    entity.setPrecisionCheckConfirmResult(request.getPrecisionCheckConfirmResult());
+                    entity.setPrecisionCheckConfirm(user.getUsername());
+                    entity.setPrecisionCheckConfirmTime(new Date());
+                    entity.setPrecisionCheckConfirmComment(request.getPrecisionCheckConfirmComment());
+                    //缁翠慨瀹や富浠诲鎵�
+                    if (!CommonConstant.STATUS_1.equals(request.getPrecisionCheckConfirmResult())) {
+                        //椹冲洖 缁欑洃瀵熶汉
+                        userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
+                        values.put("NextAssignee", userApprovalList);
+                        entity.setPrecisionCheckCompleted(CommonConstant.STATUS_0);
+                    }
                 } else if ("other_check".equals(flowMyBusiness.getTaskNameId())) {
                     //澶勭悊鍏朵粬妫�鏌�
-                    if (CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())) {
-                        values.put("otherCheckFlag", request.getOtherCheckResult());
-                        entity.setOtherCheckResult(request.getOtherCheckConfirmResult());
-                        entity.setOtherCheckConfirm(user.getUsername());
-                        entity.setOtherCheckConfirmTime(new Date());
-                        entity.setOtherCheckConfirmComment(request.getOtherCheckConfirmComment());
-                        //缁翠慨瀹や富浠诲鎵�
-                        if (!CommonConstant.STATUS_1.equals(request.getOtherCheckConfirmResult())) {
-                            //椹冲洖 缁欑洃瀵熶汉
-                            userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
-                            values.put("NextAssignee", userApprovalList);
-                            entity.setOtherCheckCompleted(CommonConstant.STATUS_0);
-                        }
-                    } else {
-                        //鍏朵粬妫�鏌ョ粨鏋滃~鎶�
-                        List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
-                        if(CollectionUtil.isEmpty(collect)) {
-                            throw new JeecgBootException("鍏朵粬妫�鏌ラ」鏄庣粏涓虹┖锛�");
-                        }
-                        //缁撴灉椤规鏌�
-                        checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK);
-                        //娣诲姞鎿嶄綔浜轰俊鎭�
-                        for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
-                            detail.setRepairmanSignature(user.getUsername());
-                            detail.setRepairmanSignatureTime(new Date());
-                        }
-                        orderDetailService.updateBatchById(collect);
+                    //鍏朵粬妫�鏌ョ粨鏋滃~鎶�
+                    List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
+                    if (CollectionUtil.isEmpty(collect)) {
+                        throw new JeecgBootException("鍏朵粬妫�鏌ラ」鏄庣粏涓虹┖锛�");
+                    }
+                    //缁撴灉椤规鏌�
+                    checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK);
+                    //娣诲姞鎿嶄綔浜轰俊鎭�
+                    for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
+                        detail.setRepairmanSignature(user.getUsername());
+                        detail.setRepairmanSignatureTime(new Date());
+                    }
+                    orderDetailService.updateBatchById(collect);
+                    values.put("NextAssignee", userApprovalList);
+                    entity.setOtherCheckCompleted(CommonConstant.STATUS_1);
+                } else if ("other_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())) {
+                    values.put("otherCheckFlag", request.getOtherCheckConfirmResult());
+                    entity.setOtherCheckConfirmResult(request.getOtherCheckConfirmResult());
+                    entity.setOtherCheckConfirm(user.getUsername());
+                    entity.setOtherCheckConfirmTime(new Date());
+                    entity.setOtherCheckConfirmComment(request.getOtherCheckConfirmComment());
+                    //缁翠慨瀹や富浠诲鎵�
+                    if (!CommonConstant.STATUS_1.equals(request.getOtherCheckConfirmResult())) {
+                        //椹冲洖 缁欑洃瀵熶汉
+                        userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
                         values.put("NextAssignee", userApprovalList);
-                        entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
-                        values.put("NextAssignee", userApprovalList);
-                        entity.setOtherCheckCompleted(CommonConstant.STATUS_1);
+                        entity.setOtherCheckCompleted(CommonConstant.STATUS_0);
                     }
                 }
                 break;
@@ -487,6 +487,7 @@
                 entity.setRepairManagerSignature(user.getUsername());
                 entity.setRepairManagerSignatureTime(new Date());
                 entity.setRepairManagerComment(request.getRepairManagerComment());
+                entity.setRepairManagerSignatureResult(request.getRepairManagerSignatureResult());
                 //璁剧疆entity
                 if (BusinessCodeConst.APPROVED.equals(request.getRepairManagerSignatureResult())) {
                     values.put("NextAssignee", userApprovalList);
@@ -533,14 +534,15 @@
                 entity.setDepartTechnicalLeaderSignature(user.getUsername());
                 entity.setDepartTechnicalLeaderSignatureTime(new Date());
                 entity.setDepartTechnicalLeaderComment(request.getDepartTechnicalLeaderComment());
+                entity.setDepartTechnicalLeaderSignatureResult(request.getDepartTechnicalLeaderSignatureResult());
                 //璁剧疆entity
                 if (BusinessCodeConst.APPROVED.equals(request.getDepartTechnicalLeaderSignatureResult())) {
                     values.put("NextAssignee", userApprovalList);
-                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name());
+                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name());
                 } else {
                     userApprovalList = Collections.singletonList(entity.getProcessTechnicianSignature());
                     values.put("NextAssignee", userApprovalList);
-                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name());
+                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name());
                 }
                 break;
             case INSPECTOR_SIGNING:
@@ -570,24 +572,67 @@
         return entity;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateEvaluationStatus(String orderId, String evaluationStatus) {
+        UpdateWrapper<EamTechnicalStatusEvaluationOrder> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id", orderId);
+        updateWrapper.set("evaluation_status", evaluationStatus);
+        updateWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+        updateWrapper.in("evaluation_status", Arrays.asList(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name(), TechnicalStatusEvaluationOrderStatusEnum.LOCKED.name()));
+        int update = this.getBaseMapper().update(null, updateWrapper);
+        return update > 0;
+    }
+
+    @Override
+    public List<EamTechnicalStatusEvaluationOrder> selectWaitEvaluationOrderList() {
+        LambdaQueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(EamTechnicalStatusEvaluationOrder::getEvaluationStatus, TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
+        queryWrapper.isNotNull(EamTechnicalStatusEvaluationOrder::getFreezeOrderDate);
+        queryWrapper.eq(EamTechnicalStatusEvaluationOrder::getDelFlag, CommonConstant.DEL_FLAG_0);
+        LocalDate localDate = LocalDate.now();
+        queryWrapper.lt(EamTechnicalStatusEvaluationOrder::getFreezeOrderDate, localDate.toString());
+        return this.getBaseMapper().selectList(queryWrapper);
+    }
+
+    @Override
+    public List<EamTechnicalStatusEvaluationOrder> selectUncompletedEvaluationOrderList() {
+        LambdaQueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = new LambdaQueryWrapper<>();
+        List<String> statusList = Arrays.asList(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name(),
+                TechnicalStatusEvaluationOrderStatusEnum.UNDER_EVALUATION.name(),
+                TechnicalStatusEvaluationOrderStatusEnum.REPAIRER_SIGNING.name(),
+                TechnicalStatusEvaluationOrderStatusEnum.REPAIR_MANAGER_SIGNING.name(),
+                TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name(),
+                TechnicalStatusEvaluationOrderStatusEnum.DEPART_TECHNICAL_LEADER_SIGNING.name(),
+                TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name(),
+                TechnicalStatusEvaluationOrderStatusEnum.LOCKED.name()
+        );
+        queryWrapper.in(EamTechnicalStatusEvaluationOrder::getEvaluationStatus, statusList);
+        queryWrapper.isNotNull(EamTechnicalStatusEvaluationOrder::getOrderExpirationDate);
+        queryWrapper.eq(EamTechnicalStatusEvaluationOrder::getDelFlag, CommonConstant.DEL_FLAG_0);
+        LocalDate localDate = LocalDate.now();
+        queryWrapper.lt(EamTechnicalStatusEvaluationOrder::getOrderExpirationDate, localDate.toString());
+        return this.getBaseMapper().selectList(queryWrapper);
+    }
+
     private void checkDetailResult(List<EamTechnicalStatusEvaluationOrderDetail> detailList, TechnicalStatusEvaluationCheckCategoryEnum checkCategory) {
         boolean b;
         switch (checkCategory) {
             case SAFETY_EQUIPMENT_CHECK:
                 b = detailList.stream().allMatch(item -> StringUtils.isNotBlank(item.getSafetyEquipmentCheckResult()));
-                if(!b) {
+                if (!b) {
                     throw new JeecgBootException("鏈夊畨鍏ㄨ缃鏌ョ粨鏋滄湭濉啓锛�");
                 }
                 break;
             case PRECISION_CHECK:
                 b = detailList.stream().allMatch(item -> item.getPrecisionCheckResult() != null);
-                if(!b) {
+                if (!b) {
                     throw new JeecgBootException("鏈夎澶囩簿搴︽鏌ョ粨鏋滄湭濉啓锛�");
                 }
                 break;
             case OTHER_CHECK:
                 b = detailList.stream().allMatch(item -> StringUtils.isNotBlank(item.getOtherCheckResult()));
-                if(!b) {
+                if (!b) {
                     throw new JeecgBootException("鏈夊叾浠栨鏌ョ粨鏋滄湭濉啓锛�");
                 }
                 break;

--
Gitblit v1.9.3