Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-12 6e006cb835fce4720139de0cc2ec3be734295ed9

Merge remote-tracking branch 'origin/master'

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java

@@ -106,7 +106,7 @@
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getOperator());
                        log.setDescription(order.getConfirmComment());
                        log.setDescription(order.getInspectConfirmComment());
                        log.setCreateTime(order.getActualEndTime());
                    }
                }

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

@@ -120,7 +120,7 @@
     */
    @Excel(name = "中心/工区/工段", width = 15, orderNum = "4")
    @ApiModelProperty(value = "中心/工区/工段")
    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "factory_code")
    @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
    private String factoryOrgCode;

    /**

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

@@ -78,7 +78,7 @@
     */
    @Excel(name = "标准ID", width = 15)
    @ApiModelProperty(value = "标准ID")
    @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
    @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_name")
    private String standardId;
    /**
     * è®¡åˆ’保养日期
@@ -101,15 +101,14 @@
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date actualEndTime;
    /**
     * ä¿å…»äºº
     */
    @Excel(name = "保养人", width = 15)
    @ApiModelProperty(value = "保养人")
    @Dict(dicCode = "sys_user, realname, username")
    /** æ“ä½œå·¥ */
    @ApiModelProperty(value = "操作工")
    private String operator;
    /** ç»´ä¿®å·¥ */
    @ApiModelProperty(value = "维修工")
    private String repairman ;
    /**
     * ä¿å…»çŠ¶æ€
     * ä¿å…»çŠ¶æ€  å¾…保养、保养中、管理员确认、检查人确认、已完成
     */
    @Excel(name = "保养状态", width = 15)
    @ApiModelProperty(value = "保养状态")
@@ -123,55 +122,35 @@
    @Dict(dicCode = "order_creation_method")
    private String creationMethod;
    /**
     * ç»´ä¿®ç»„长确认
     * ç®¡ç†å‘˜ç¡®è®¤
     */
    @Excel(name = "维修组长确认", width = 15)
    @ApiModelProperty(value = "维修组长确认")
    @Excel(name = "管理员确认", width = 15)
    @ApiModelProperty(value = "管理员确认")
    @Dict(dicCode = "sys_user, realname, username")
    private String confirmUser;
    /**
     * ç¡®è®¤æ„è§
     */
    @ApiModelProperty(value = "确认意见")
    private String confirmComment;

    /** ç¡®è®¤ç±»åž‹ 1 é€šè¿‡  2 é©³å›ž */
    @ApiModelProperty(value = "确认类型")
    @Dict(dicCode = "approved_rejected")
    private String confirmDealType;
    /**
     * ç¡®è®¤æ—¶é—´
     */
    @ApiModelProperty(value = "确认时间")
    private String manageUser;
    /** é—®é¢˜æè¿°;默认 æ—  */
    @ApiModelProperty(name = "问题描述",notes = "默认 æ— ")
    private String problemDescription ;
    /** å¤„理描述;默认 æ—  */
    @ApiModelProperty(name = "处理描述",notes = "默认 æ— ")
    private String dealDescription ;
    /** ç®¡ç†å‘˜ç¡®è®¤æ—¶é—´ */
    @ApiModelProperty(name = "管理员确认时间",notes = "")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmTime;
    /**
     * å•ä½é¢†å¯¼ç¡®è®¤
     */
    @Excel(name = "单位领导确认", width = 15)
    @ApiModelProperty(value = "单位领导确认")
    @Dict(dicCode = "sys_user, realname, username")
    private String confirmLeader;
    /**
     * é¢†å¯¼æ„è§
     */
    @ApiModelProperty(value = "领导意见")
    private String leaderConfirmComment;
    /**
     * é¢†å¯¼ç¡®è®¤æ—¶é—´
     */
    @ApiModelProperty(value = "领导确认时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date leaderConfirmTime;

    /**
     * ä¿å…»ä¸Šä¼ å›¾ç‰‡
     */
    @Excel(name = "保养上传图片", width = 15)
    @ApiModelProperty(value = "保养上传图片")
    private String imageFiles;
    /** æ£€æŸ¥äººç¡®è®¤ */
    @ApiModelProperty(name = "检查人确认",notes = "")
    private String inspector;
    /** æ£€æŸ¥äººæ„è§ */
    @ApiModelProperty(name = "检查人意见",notes = "")
    private String inspectConfirmComment;
    /** æ£€æŸ¥äººç¡®è®¤æ—¶é—´ */
    @ApiModelProperty(name = "检查人确认时间",notes = "")
    private String inspectConfirmTime;
    /** HF编码 */
    @ApiModelProperty(name = "HF编码",notes = "")
    private String hfCode;
    /**
     * å¤‡æ³¨
     */
@@ -184,4 +163,7 @@
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
    //型号
    @TableField(exist = false)
    private String equipmentModel;
}

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

@@ -51,28 +51,19 @@
    @Excel(name = "项目序号", width = 15)
    @ApiModelProperty(value = "项目序号")
    private Integer itemCode;
    /**保养项目*/
    @Excel(name = "保养项目", width = 15)
    @ApiModelProperty(value = "保养项目")
    /** ä¿å…»åˆ†ç±»;操作工、维修工 */
    @ApiModelProperty(name = "保养分类",notes = "操作工、维修工")
    private String itemCategory;
    /** ä¿å…»å†…容 */
    @ApiModelProperty(name = "保养内容",notes = "")
    private String itemName;
    /**部位*/
    @Excel(name = "部位", width = 15)
    @ApiModelProperty(value = "部位")
    private String itemPart;
    /**保养要求*/
    @Excel(name = "保养要求", width = 15)
    @ApiModelProperty(value = "保养要求")
    private String itemDemand;
    /**保养结果*/
    @Excel(name = "保养结果", width = 15)
    @ApiModelProperty(value = "保养结果")
    @ApiModelProperty(name = "保养结果",notes = "")
    private String maintenanceResult;
    /**报修标记*/
    @Excel(name = "报修标记", width = 15)
    @ApiModelProperty(value = "报修标记")
    @ApiModelProperty(name = "报修标记",notes = "")
    private String reportFlag;
    /**异常描述*/
    @Excel(name = "异常描述", width = 15)
    @ApiModelProperty(value = "异常描述")
    @ApiModelProperty(name = "异常描述",notes = "")
    private String exceptionDescription;
}

 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/EamEquipmentPrecisionParametersController.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -80,7 +80,7 @@
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        if (CollectionUtil.isEmpty(request.getTableDetailList())) {
        if (StrUtil.isEmpty(request.getStandardId())) {
            return Result.error("保养项不能为空！");
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SECOND_MAINTENANCE_CODE_RULE);
@@ -106,7 +106,7 @@
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        if (CollectionUtil.isEmpty(request.getTableDetailList())) {
        if (StrUtil.isEmpty(request.getStandardId())) {
            return Result.error("保养项不能为空！");
        }
        boolean b = eamSecondMaintenanceOrderService.editMaintenance(request);
@@ -228,7 +228,7 @@
        if (request == null) {
            return Result.error("审批的对象不能为空！");
        }
        if (CollectionUtil.isEmpty(request.getTableDetailList())) {
        if (StrUtil.isEmpty(request.getStandardId())) {
            return Result.error("保养项不能为空！");
        }
        // æ£€æŸ¥è¯·æ±‚参数

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 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/entity/EamProcessParameters.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderGenerateJob.java

@@ -9,7 +9,6 @@
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamEquipmentPrecisionParametersService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
@@ -34,8 +33,6 @@
@Slf4j
public class ThirdMaintenanceOrderGenerateJob implements Job {

    @Autowired
    private IEamEquipmentPrecisionParametersService eamEquipmentPrecisionParametersService;
    @Autowired
    private IEamThirdMaintenanceOrderService eamThirdMaintenanceOrderService;
    @Autowired
@@ -122,20 +119,6 @@
//                List<EamThirdMaintenanceOrderDetail> collect = standardDetailList.stream().map(EamThirdMaintenanceOrderDetail::new).collect(Collectors.toList());
                request.setTableDetailList(tableDetailList);

                //通过设备 èŽ·å–设备精度参数
                List<EamEquipmentPrecisionParameters> precisionParametersList = eamEquipmentPrecisionParametersService
                        .lambdaQuery().eq(EamEquipmentPrecisionParameters::getEquipmentId, standard.getEquipmentId()).list();
                if(precisionParametersList.size()>0){
                    List<EamPrecisionCheckDetail> precisionDetailList = new ArrayList<>();
                    for (EamEquipmentPrecisionParameters epp : precisionParametersList) {
                        EamPrecisionCheckDetail pcd = new EamPrecisionCheckDetail();
                        pcd.setParameterId(epp.getParameterId());
                        pcd.setEquipmentId(standard.getEquipmentId());
                        pcd.setParameterValue(epp.getParameterValue());
                        precisionDetailList.add(pcd);
                    }
                    request.setPrecisionDetailList(precisionDetailList);
                }
                eamThirdMaintenanceOrderService.addMaintenance(request);

//                standard.setLastGenerateTime(new Date());

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentPurchasePlanMapper.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/EamProcessParametersMapper.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 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/mapper/xml/EamProcessParametersMapper.xml

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamSecondMaintenanceOrderMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder">
        select wmo.*, e.equipment_code, e.equipment_name
        select wmo.*, e.equipment_code, e.equipment_name,e.equipment_model
        from eam_second_maintenance_order wmo
        inner join eam_equipment e
        on wmo.equipment_id = e.id

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

@@ -7,8 +7,10 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
@@ -24,43 +26,100 @@
    /**主键*/
    @ApiModelProperty(value = "主键")
    private String id;
    /**工单号*/
    /**
     * å·¥å•å·
     */
    @Excel(name = "工单号", width = 15)
    @ApiModelProperty(value = "工单号")
    private String orderNum;
    /**设备ID*/
    /**
     * è®¾å¤‡ID
     */
    @Excel(name = "设备ID", width = 15)
    @ApiModelProperty(value = "设备ID")
    private String equipmentId;
    /**标准ID*/
    /**
     * æ ‡å‡†ID
     */
    @Excel(name = "标准ID", width = 15)
    @ApiModelProperty(value = "标准ID")
    @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
    private String standardId;
    /**保养日期*/
    @ApiModelProperty(value = "保养日期")
    /**
     * è®¡åˆ’保养日期
     */
    @ApiModelProperty(value = "计划保养日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDate;
    /**保养人*/
    @ApiModelProperty(value = "保养人")
    /**
     * å®žé™…开始时间
     */
    @ApiModelProperty(value = "实际开始时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date actualStartTime;
    /**
     * å®žé™…结束时间
     */
    @ApiModelProperty(value = "实际结束时间")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date actualEndTime;
    /** æ“ä½œå·¥ */
    @ApiModelProperty(value = "操作工")
    private String operator;
    /**备注*/
    /** ç»´ä¿®å·¥ */
    @ApiModelProperty(value = "维修工")
    private String repairman ;
    /**
     * ä¿å…»çŠ¶æ€  å¾…保养、保养中、管理员确认、检查人确认、已完成
     */
    @Excel(name = "保养状态", width = 15)
    @ApiModelProperty(value = "保养状态")
    @Dict(dicCode = "second_maintenance_status")
    private String maintenanceStatus;
    /**
     * åˆ›å»ºæ–¹å¼
     */
    @Excel(name = "创建方式", width = 15)
    @ApiModelProperty(value = "创建方式")
    @Dict(dicCode = "order_creation_method")
    private String creationMethod;
    /**
     * ç®¡ç†å‘˜ç¡®è®¤
     */
    @Excel(name = "管理员确认", width = 15)
    @ApiModelProperty(value = "管理员确认")
    @Dict(dicCode = "sys_user, realname, username")
    private String manageUser;
    /** é—®é¢˜æè¿°;默认 æ—  */
    @ApiModelProperty(name = "问题描述",notes = "默认 æ— ")
    private String problemDescription ;
    /** å¤„理描述;默认 æ—  */
    @ApiModelProperty(name = "处理描述",notes = "默认 æ— ")
    private String dealDescription ;
    /** ç®¡ç†å‘˜ç¡®è®¤æ—¶é—´ */
    @ApiModelProperty(name = "管理员确认时间",notes = "")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmTime ;
    /** æ£€æŸ¥äººç¡®è®¤ */
    @ApiModelProperty(name = "检查人确认",notes = "")
    private String inspector;
    /** æ£€æŸ¥äººæ„è§ */
    @ApiModelProperty(name = "检查人意见",notes = "")
    private String inspectConfirmComment;
    /** æ£€æŸ¥äººç¡®è®¤æ—¶é—´ */
    @ApiModelProperty(name = "检查人确认时间",notes = "")
    private String inspectConfirmTime;
    /** HF编码 */
    @ApiModelProperty(name = "HF编码",notes = "")
    private String hfCode;
    /**
     * å¤‡æ³¨
     */
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**创建方式*/
    @ApiModelProperty(value = "创建方式")
    private String creationMethod;
    /**列表 ä¿å…»é¡¹æ˜Žç»†*/
    @ApiModelProperty(value = "列表 ä¿å…»é¡¹æ˜Žç»†")
    private List<EamSecondMaintenanceOrderDetail> tableDetailList;
    /**删除 ä¿å…»é¡¹æ˜Žç»†*/
    @ApiModelProperty(value = "删除 ä¿å…»é¡¹æ˜Žç»†")
    private List<EamSecondMaintenanceOrderDetail> removeDetailList;

    //确认操作
    /**确认意见*/
    @ApiModelProperty(value = "确认意见")
    private String confirmComment;
    @ApiModelProperty(value = "确认类型")
    private String confirmDealType;
    /**领导确认意见*/
    @ApiModelProperty(value = "领导确认意见")
    private String leaderConfirmComment;
}

 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/IEamEquipmentPrecisionParametersService.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 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/IEamProcessParametersService.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPurchasePlanServiceImpl.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/EamProcessParametersServiceImpl.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -39,6 +39,7 @@
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -82,6 +83,10 @@
    private IEamReportRepairService eamReportRepairService;
    @Autowired
    private IEamEquipmentExtendService eamEquipmentExtendService;
    @Autowired
    private IEamBaseHFCodeService hfCodeService;
    @Autowired
    private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;

    @Override
    public IPage<EamSecondMaintenanceOrder> queryPageList(Page<EamSecondMaintenanceOrder> page, EamSecondMaintenanceQuery query) {
@@ -155,6 +160,12 @@
        order.setStandardId(request.getStandardId());
        order.setMaintenanceDate(request.getMaintenanceDate());
        order.setOperator(request.getOperator());
        //技术状态鉴定表
        EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.SECOND_MAINTENANCE.name());
        if(eamBaseHFCode == null) {
            throw new JeecgBootException("未配置技术状态鉴定表的HF编码，添加失败！");
        }
        order.setHfCode(eamBaseHFCode.getHfCode());
        order.setRemark(request.getRemark());
        //状态初始化
        order.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
@@ -163,43 +174,17 @@
        order.setDelFlag(CommonConstant.DEL_FLAG_0);
        eamSecondMaintenanceOrderMapper.insert(order);
        //处理明细数据
        if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
            request.getTableDetailList().forEach(tableDetail -> {
                tableDetail.setId(null);
                tableDetail.setOrderId(order.getId());
        List<EamMaintenanceStandardDetail> eamMaintenanceStandardDetailList= eamMaintenanceStandardDetailService.selectByStandardId(order.getStandardId());
        List<EamSecondMaintenanceOrderDetail> requestTableDetailList = new ArrayList<>();
        if (CollectionUtil.isNotEmpty(eamMaintenanceStandardDetailList)) {
            eamMaintenanceStandardDetailList.forEach(item -> {
                EamSecondMaintenanceOrderDetail detail = new EamSecondMaintenanceOrderDetail();
                BeanUtils.copyProperties(item, detail);
                detail.setOrderId(order.getId());
                requestTableDetailList.add(detail);
            });
            secondMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
            secondMaintenanceOrderDetailService.saveBatch(requestTableDetailList);
        }
        //判断是否存在保养人 å¦‚果存在则启动流程
        if (StringUtils.isNotBlank(order.getOperator())) {
            //启动流程
            flowCommonService.initActBusiness("工单号: " + order.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
                    order.getId(), "IEamSecondMaintenanceOrderService", "second_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);
            List<String> usernames = new ArrayList<>();
            usernames.add(order.getOperator());
            variables.put("NextAssignee", usernames);
            Result result = flowDefinitionService.startProcessInstanceByKey("second_maintenance_process", variables);
            if (result != null) {
                //更新周保状态
                order.setMaintenanceStatus(SecondMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
                order.setActualStartTime(new Date());
                eamSecondMaintenanceOrderMapper.updateById(order);
                //更新设备保养状态
                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
                return result.isSuccess();
            }
        }

        return true;
    }

@@ -218,33 +203,9 @@
            throw new JeecgBootException("只有待保养状态的数据才可编辑！");
        }
        entity.setMaintenanceDate(request.getMaintenanceDate());
        entity.setOperator(request.getOperator());
        entity.setRemark(request.getRemark());

        eamSecondMaintenanceOrderMapper.updateById(entity);
        //处理详情
        if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
            List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
            List<EamSecondMaintenanceOrderDetail> updateList = new ArrayList<>();
            request.getTableDetailList().forEach(tableDetail -> {
                tableDetail.setOrderId(entity.getId());
                if (tableDetail.getId() == null) {
                    addList.add(tableDetail);
                } else {
                    updateList.add(tableDetail);
                }
            });
            if (CollectionUtil.isNotEmpty(addList)) {
                secondMaintenanceOrderDetailService.saveBatch(addList);
            }
            if (CollectionUtil.isNotEmpty(updateList)) {
                secondMaintenanceOrderDetailService.updateBatchById(updateList);
            }
        }
        if (CollectionUtil.isNotEmpty(request.getRemoveDetailList())) {
            List<String> ids = request.getRemoveDetailList().stream().map(EamSecondMaintenanceOrderDetail::getId).collect(Collectors.toList());
            secondMaintenanceOrderDetailService.removeBatchByIds(ids);
        }
        //判断是否存在保养人 å¦‚果存在则启动流程
        if (StringUtils.isNotBlank(entity.getOperator())) {
            //启动流程
@@ -385,10 +346,6 @@
                //设置entity
                entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_CONFIRM.name());
                entity.setActualEndTime(new Date());
                //处理详情
                if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
                    secondMaintenanceOrderDetailService.updateBatchById(request.getTableDetailList());
                }
                //更新设备保养状态
                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.SECOND_MAINTENANCE_WAIT_CONFIRM.name());
                break;
@@ -399,33 +356,12 @@
                }
                //班组长确认
                userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                values.put("dataId", entity.getId());
                values.put("organization", request.getConfirmComment());
                values.put("comment", request.getConfirmComment());
                values.put("NextAssignee", userApprovalList);
                values.put("confirmation", request.getConfirmDealType());
                request.setComment(request.getConfirmComment());
                //设置entity
                entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_LEADER_CONFIRM.name());
                entity.setConfirmTime(new Date());
                if (CommonConstant.HAS_CANCLE.equals(request.getConfirmDealType())) {
                    //驳回
                    userApprovalList = new ArrayList<>();
                    userApprovalList.add(entity.getOperator());
                    values.put("NextAssignee", userApprovalList);
                    entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
                }
                //处理报修
                List<EamSecondMaintenanceOrderDetail> collect = request.getTableDetailList().stream().filter((detail) -> CommonConstant.DEFAULT_1.equals(detail.getReportFlag())).collect(Collectors.toList());
                if (CollectionUtil.isNotEmpty(collect)) {
                    eamReportRepairService.reportRepairFromSecondMaintenance(equipment.getId(), entity.getOperator(), collect);
                }
                break;
            case WAIT_LEADER_CONFIRM:
                values.put("dataId", entity.getId());
                values.put("organization", request.getLeaderConfirmComment());
                values.put("comment", request.getLeaderConfirmComment());
                request.setComment(request.getLeaderConfirmComment());
                //设置entity
                entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.COMPLETE.name());
                //更新设备保养状态

 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;
@@ -175,44 +169,37 @@
        //处理明细数据
        if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
            request.getTableDetailList().forEach(tableDetail -> {
                tableDetail.setId(null);
//                tableDetail.setId(null);
                tableDetail.setOrderId(order.getId());
            });
            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 (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 +305,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", "新增三保工单默认启动流程");