故障报修流程审批节点字段调整

hyingbo

2 天以前 d4d757f2d1a32deecb5e13111d6e753dfa18a58e

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

@@ -24,22 +24,20 @@
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.entity.RepairWarehouse;
import org.jeecg.modules.eam.mapper.EamRepairOrderMapper;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.request.EamRepairOrderRequest;
import org.jeecg.modules.eam.request.EamRepairOrderResponse;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.util.DateUtils;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
@@ -91,6 +89,9 @@

    @Autowired
    private ISysUserService sysUserService;

    @Autowired
    private IRepairWarehouseService repairWarehouseService;

    /**
     * 分页列表
@@ -221,6 +222,7 @@
        eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_INTERNAL_CONFIRM.name());
        eamRepairOrder.setActualStartTime(DateUtils.getNow());
        eamRepairOrder.setRepairer(eamReportRepairQuery.getRepairer());
        eamRepairOrder.setReportId(eamReportRepairQuery.getId());
        super.save(eamRepairOrder);
        EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId());
        // 启动维修流程
@@ -298,6 +300,8 @@
        Map<String, Object> values = new HashMap<>();
        List<UserSelector> userSelectors;
        List<String> userApprovalList;

        RepairWarehouse repairWarehouse = null;
        switch (status) {
            case WAIT_INTERNAL_CONFIRM:
                order.setRepairConfirm(request.getRepairConfirm());
@@ -324,7 +328,7 @@
                    //提交机动办维修，车间管理员确认
                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
                    if (CollectionUtil.isEmpty(userSelectors)) {
                        throw new JeecgBootException("设备未分配给班组长，无法进入下级审批！");
                        throw new JeecgBootException("设备未分配给维修主任，无法进入下级审批！");
                    }
                    userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                    values.put("NextAssignee", userApprovalList);
@@ -344,6 +348,17 @@
                order.setFaultReason(request.getFaultReason());
                order.setRepairDescription(request.getRepairDescription());
                order.setActualEndTime(new Date());
                order.setFaultType(request.getFaultType());
                order.setFaultPart(request.getFaultPart());
                order.setFaultChildPart(request.getFaultChildPart());
                order.setSeverity(request.getSeverity());
                order.setRepairDescription(request.getRepairDescription());

                //保存维修知识库
                repairWarehouse = new RepairWarehouse();
                BeanUtils.copyProperties(request, repairWarehouse);
                repairWarehouseService.saveData(repairWarehouse);

                // 处理附件
                if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
                    List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -431,6 +446,17 @@
                order.setFaultReason(request.getFaultReason());
                order.setRepairDescription(request.getRepairDescription());
                order.setActualEndTime(new Date());
                order.setFaultType(request.getFaultType());
                order.setFaultPart(request.getFaultPart());
                order.setFaultChildPart(request.getFaultChildPart());
                order.setSeverity(request.getSeverity());
                order.setRepairDescription(request.getRepairDescription());

                //保存维修知识库
                repairWarehouse = new RepairWarehouse();
                BeanUtils.copyProperties(request, repairWarehouse);
                repairWarehouseService.saveData(repairWarehouse);

                // 处理附件
                if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
                    List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -458,6 +484,17 @@
                order.setFaultReason(request.getFaultReason());
                order.setRepairDescription(request.getRepairDescription());
                order.setActualEndTime(new Date());
                order.setFaultType(request.getFaultType());
                order.setFaultPart(request.getFaultPart());
                order.setFaultChildPart(request.getFaultChildPart());
                order.setSeverity(request.getSeverity());
                order.setRepairDescription(request.getRepairDescription());

                //保存维修知识库
                repairWarehouse = new RepairWarehouse();
                BeanUtils.copyProperties(request, repairWarehouse);
                repairWarehouseService.saveData(repairWarehouse);

                // 处理附件
                if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
                    List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();