审批完成

qushaowei

2023-09-01 29d74c2b0706143e550524153857737975eb88a0

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

@@ -37,6 +37,8 @@
import lombok.extern.slf4j.Slf4j;


import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -84,6 +86,12 @@
    @Autowired
    private IMaintenanceOrderActualWorkingHourService maintenanceOrderActualWorkingHourService;

    @Autowired
    private IFinishTransferOrderService finishTransferOrderService;

    @Autowired
    private ISysUserService sysUserService;


    /**
     * 分页列表查询
@@ -114,6 +122,7 @@
        List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords();
        for (Map<String, Object> record : records) {
            String id = (String) record.get("id");
            String equipmentId = (String) record.get("equipmentId");
            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
            record.put("maintenanceCycles", maintenanceCycles);
@@ -151,6 +160,34 @@
                actualQuantity = (BigDecimal) map.get("actualQuantity");
            }
            record.put("actualWorkingHourQuota", actualQuantity);

            List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
                    .eq(FinishTransferOrder::getMaintenanceOrderId, id)
                    .eq(FinishTransferOrder::getEquipmentId, equipmentId).list();
            for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
                String operateUser = finishTransferOrder.getOperateUser();
                if(StringUtils.isNotBlank(operateUser)){
                    SysUser sysUser = sysUserService.getById(operateUser);
                    record.put("operateUserName", sysUser.getRealname());
                }
                String repairUser = finishTransferOrder.getRepairUser();
                if(StringUtils.isNotBlank(repairUser)){
                    SysUser sysUser = sysUserService.getById(repairUser);
                    record.put("repairUserName", sysUser.getRealname());
                }
                String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
                if(StringUtils.isNotBlank(repairDirectorUser)){
                    SysUser sysUser = sysUserService.getById(repairDirectorUser);
                    record.put("repairDirectorUserName", sysUser.getRealname());
                }
                String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
                if(StringUtils.isNotBlank(equipmentInspectorUser)){
                    SysUser sysUser = sysUserService.getById(equipmentInspectorUser);
                    record.put("equipmentInspectorUserName", sysUser.getRealname());
                }

            }

        }
        return Result.ok(dailyMaintenanceOrderList);
    }
@@ -179,7 +216,9 @@
        } else if ("day".equals(unit)) {
            date = DateUtils.getDayAfter(planStartTime, effectiveTime);
        }
        dailyMaintenanceOrder.setPlanEndTime(date);
        dailyMaintenanceOrder.setPlanEndTime(date);//创建类型（1手动创建，2自动创建）
        dailyMaintenanceOrder.setCreateType("1");//创建类型（1手动创建，2自动创建）
        dailyMaintenanceOrder.setConfirmStatus("0");//移交确认状态（0未确认，1主任确认，2检验员确认）
        dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
@@ -400,6 +439,14 @@
        if ("5".equals(status)) {
            maintenanceOrder.setActualEndTime(null);
            boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

            List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
                    .eq(FinishTransferOrder::getMaintenanceOrderId, id)
                    .eq(FinishTransferOrder::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
            for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
                finishTransferOrderService.removeById(finishTransferOrder);
            }

            if (b) {
                return Result.OK("撤销成功!");
            } else {
@@ -429,6 +476,18 @@
        dailyMaintenanceOrder.setMaintenanceUserId(userId);
        dailyMaintenanceOrder.setActualEndTime(new Date());
        boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
        FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
        finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId());
        finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId());
        finishTransferOrder.setOperateUser(userId);
        finishTransferOrder.setRepairUser(userId);
        finishTransferOrder.setStatus("1");
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

        if (!b) {
            return Result.error("报工失败!");
        } else {
@@ -446,4 +505,41 @@
        return Result.ok(sysDeparts);
    }

    /**
     * 审批
     */
    @RequestMapping(value = "/approve", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> approve(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();

        String orderId = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId);
        String equipmentId = maintenanceOrder.getEquipmentId();
        String confirmStatus = maintenanceOrder.getConfirmStatus();

        List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
                .eq(FinishTransferOrder::getMaintenanceOrderId, orderId)
                .eq(FinishTransferOrder::getEquipmentId, equipmentId).list();
       if(finishTransferOrders.size()>0){
           FinishTransferOrder finishTransferOrder = finishTransferOrders.get(0);
           if ("0".equals(confirmStatus)){
               finishTransferOrder.setRepairDirectorUser(userId);
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus("1");
               dailyMaintenanceOrderService.updateById(maintenanceOrder);
           }else{
               finishTransferOrder.setEquipmentInspectorUser(userId);
               finishTransferOrderService.updateById(finishTransferOrder);

               maintenanceOrder.setConfirmStatus("2");
               maintenanceOrder.setStatus("8");
               dailyMaintenanceOrderService.updateById(maintenanceOrder);
           }
       }

        return Result.OK("审批成功!");
    }

}