点检添加周报校验

Lius

2025-07-12 60e43e1bc0785a7151fd050b20b04f2047df2727

点检添加周报校验

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java

@@ -1099,8 +1099,8 @@
        // èŽ·å–本周第一天（周一）
        LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);

        // è½¬æ¢å›ž java.sql.Date ç±»åž‹
        return java.sql.Date.valueOf(firstDayOfWeek);
        // è½¬æ¢å›ž Date ç±»åž‹
        return Date.from(firstDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
    }

    /**
@@ -1116,8 +1116,8 @@
        // èŽ·å–本周第一天（周一）
        LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY);

        // è½¬æ¢å›ž java.sql.Date ç±»åž‹
        return java.sql.Date.valueOf(firstDayOfWeek);
        // è½¬æ¢å›ž Date ç±»åž‹
        return Date.from(firstDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
    }

    /**
@@ -1128,11 +1128,11 @@
        // å°† java.util.Date è½¬æ¢ä¸º LocalDate
        LocalDate localDate = LocalDate.parse(date);

        // èŽ·å–本周第一天（周一）
        LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
        // èŽ·å–本周第一天（周日）
        LocalDate lastDayOfWeek = localDate.with(DayOfWeek.SUNDAY);

        // è½¬æ¢å›ž java.sql.Date ç±»åž‹
        return java.sql.Date.valueOf(firstDayOfWeek);
        // è½¬æ¢å›ž Date ç±»åž‹
        return Date.from(lastDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
    }

    /**
@@ -1144,10 +1144,21 @@
        LocalDate localDate = date.toInstant()
                .atZone(ZoneId.systemDefault())
                .toLocalDate();
        // èŽ·å–本周第一天（周一）
        LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY);
        // èŽ·å–本周第一天（周日）
        LocalDate lastDayOfWeek = localDate.with(DayOfWeek.SUNDAY);

        // è½¬æ¢å›ž java.sql.Date ç±»åž‹
        return java.sql.Date.valueOf(firstDayOfWeek);
        // è½¬æ¢å›ž Date ç±»åž‹
        return Date.from(lastDayOfWeek.atStartOfDay(ZoneId.systemDefault()).toInstant());
    }

    public static boolean isSameDay(Date date1, Date date2) {
        if (date1 == null || date2 == null) {
            return false;
        }

        LocalDate localDate1 = date1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
        LocalDate localDate2 = date2.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();

        return localDate1.equals(localDate2);
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java

@@ -11,11 +11,8 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java

@@ -10,9 +10,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java

@@ -7,14 +7,10 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamPrecisionParameters;
import org.jeecg.modules.eam.entity.EamProcessParameters;
import org.jeecg.modules.eam.service.IEamPrecisionParametersService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionParameters.java

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamPrecisionCheckDetailMapper.java

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamPrecisionParametersMapper.java

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamPrecisionCheckDetailMapper.xml

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamPrecisionParametersMapper.xml

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java

@@ -7,7 +7,6 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.springframework.format.annotation.DateTimeFormat;
@@ -61,12 +60,12 @@
    @ApiModelProperty(value = "删除 ä¿å…»é¡¹æ˜Žç»†")
    private List<EamThirdMaintenanceOrderDetail> removeDetailList;

    /**列表 ç²¾åº¦å‚数明细*/
    @ApiModelProperty(value = "列表 ç²¾åº¦å‚数明细")
    private List<EamPrecisionCheckDetail> precisionDetailList;
    /**删除 ç²¾åº¦å‚数明细*/
    @ApiModelProperty(value = "删除 ç²¾åº¦å‚数明细")
    private List<EamPrecisionCheckDetail> removePrecisionDetailList;
//    /**列表 ç²¾åº¦å‚数明细*/
//    @ApiModelProperty(value = "列表 ç²¾åº¦å‚数明细")
//    private List<EamPrecisionCheckDetail> precisionDetailList;
//    /**删除 ç²¾åº¦å‚数明细*/
//    @ApiModelProperty(value = "删除 ç²¾åº¦å‚数明细")
//    private List<EamPrecisionCheckDetail> removePrecisionDetailList;


    //确认操作

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionParametersService.java

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java

@@ -611,6 +611,19 @@
                throw new JeecgBootException("设备不存在，请检查！");
            }

            // æ£€æŸ¥å‘¨ä¿è¿‡æœŸæ—¶é—´
            if (eamInspectionOrderRequest.getTableWeekDetailList() == null || eamInspectionOrderRequest.getTableWeekDetailList().isEmpty()) {
                List<EamWeekInspectionDetail> weekInspectionDetailList = eamWeekInspectionDetailService.list(new LambdaQueryWrapper<EamWeekInspectionDetail>().eq(EamWeekInspectionDetail::getStandardId, eamInspectionOrderRequest.getStandardId()).between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(eamInspectionOrderRequest.getInspectionDate()), DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate())));
                if (weekInspectionDetailList != null && !weekInspectionDetailList.isEmpty()) {
                    if (StrUtil.isEmpty(eamInspectionOrderRequest.getOperator())) {
                        Date lastDate = DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate());
                        if (DateUtils.isSameDay(lastDate, new Date())) {
                            throw new JeecgBootException("本周点检未完成，请进行填报！");
                        }
                    }
                }
            }

            // è®¾ç½®æµç¨‹å˜é‡
            setupProcessVariables(eamInspectionOrderRequest, eamInspectionOrder, user, equipment);


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionParametersServiceImpl.java

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java

@@ -9,13 +9,10 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
@@ -45,7 +42,6 @@
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -85,8 +81,6 @@
    private IEamReportRepairService eamReportRepairService;
    @Autowired
    private IEamEquipmentExtendService eamEquipmentExtendService;
    @Autowired
    private IEamPrecisionCheckDetailService precisionCheckDetailService;

    @Resource
    private IBaseFactoryUserService baseFactoryUserService;
@@ -181,38 +175,38 @@
            thirdMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
        }
        //处理精度参数
        if (CollectionUtil.isNotEmpty(request.getPrecisionDetailList())) {
            request.getPrecisionDetailList().forEach(tableDetail -> {
                tableDetail.setId(null);
                tableDetail.setOrderId(order.getId());
            });
            precisionCheckDetailService.saveBatch(request.getPrecisionDetailList());
        }
//        if (CollectionUtil.isNotEmpty(request.getPrecisionDetailList())) {
//            request.getPrecisionDetailList().forEach(tableDetail -> {
//                tableDetail.setId(null);
//                tableDetail.setOrderId(order.getId());
//            });
//            precisionCheckDetailService.saveBatch(request.getPrecisionDetailList());
//        }
        //判断是否存在保养人 å¦‚果存在则启动流程
        if (StringUtils.isNotBlank(order.getOperator())) {
            //启动流程
            flowCommonService.initActBusiness("工单号:" + order.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
                    order.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
            Map<String, Object> variables = new HashMap<>();
            variables.put("dataId", order.getId());
            if (StrUtil.isEmpty(order.getRemark())) {
                variables.put("organization", "新增三保工单默认启动流程");
                variables.put("comment", "新增三保工单默认启动流程");
            } else {
                variables.put("organization", order.getRemark());
                variables.put("comment", order.getRemark());
            }
            variables.put("proofreading", true);
            //并行任务会签
            variables.put("maintenance_execution", Collections.singletonList(request.getOperator()));
//            variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
            Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
            if (result != null) {
                //更新设备保养状态
                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
                return result.isSuccess();
            }
        }
//        if (StringUtils.isNotBlank(order.getOperator())) {
//            //启动流程
//            flowCommonService.initActBusiness("工单号:" + order.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
//                    order.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
//            Map<String, Object> variables = new HashMap<>();
//            variables.put("dataId", order.getId());
//            if (StrUtil.isEmpty(order.getRemark())) {
//                variables.put("organization", "新增三保工单默认启动流程");
//                variables.put("comment", "新增三保工单默认启动流程");
//            } else {
//                variables.put("organization", order.getRemark());
//                variables.put("comment", order.getRemark());
//            }
//            variables.put("proofreading", true);
//            //并行任务会签
//            variables.put("maintenance_execution", Collections.singletonList(request.getOperator()));
////            variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
//            Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
//            if (result != null) {
//                //更新设备保养状态
//                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
//                return result.isSuccess();
//            }
//        }

        return true;
    }
@@ -318,8 +312,8 @@
        flowCommonService.initActBusiness("工单号:" + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
                entity.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
        Map<String, Object> variables = new HashMap<>();
        boolean equipmentPrecisionFlag = precisionCheckDetailService.hasPrecisionCheckDetail(entity.getId());
        variables.put("equipmentPrecisionFlag", equipmentPrecisionFlag);
//        boolean equipmentPrecisionFlag = precisionCheckDetailService.hasPrecisionCheckDetail(entity.getId());
//        variables.put("equipmentPrecisionFlag", equipmentPrecisionFlag);
        variables.put("dataId", entity.getId());
        if (StrUtil.isEmpty(entity.getRemark())) {
            variables.put("organization", "新增三保工单默认启动流程");