保养变更申请单

“linengliang”

2023-10-17 4c9c08844bfd952babda3cb0b30b75e07bc5df0e

保养变更申请单

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

@@ -230,6 +230,7 @@
                 dailyMaintenanceOrder.setMaintenanceCycleId(maintenanceStandardDetailList.get(0).getMaintenanceCycleId());
             }
             dailyMaintenanceOrder.setMaintenanceOrderUda1(equipmentMaintenancePlan.getId());
             dailyMaintenanceOrder.setMaintenanceOrderUda2(equipmentMaintenancePlanDetail.getId());
             dailyMaintenanceOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
             dailyMaintenanceOrder.setPrecisionInspectionStatus(CommonConstant.STATUS_0);
             dailyMaintenanceOrder.setStoveExemptStatus(CommonConstant.STATUS_0);

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

@@ -1,22 +1,24 @@
package org.jeecg.modules.eam.controller;

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.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
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.common.util.DateUtils;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail;
import org.jeecg.modules.eam.entity.MaintenanceCycle;
import org.jeecg.modules.eam.entity.PlanChangeApply;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IMaintenanceCycleService;
import org.jeecg.modules.eam.service.IPlanChangeApplyService;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -45,7 +47,10 @@

    @Autowired
    private IMaintenanceCycleService maintenanceCycleService;
	

    @Autowired
    private IEquipmentMaintenancePlanDetailService maintenancePlanDetailService;

    /**
     * 分页列表查询
     *
@@ -67,7 +72,7 @@
        IPage<PlanChangeApply> pageList = planChangeApplyService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	

    /**
     *   添加
     *
@@ -106,7 +111,7 @@

        return Result.OK("添加成功！");
    }
	

    /**
     *  编辑
     *
@@ -121,7 +126,7 @@
        planChangeApplyService.updateById(planChangeApply);
        return Result.OK("编辑成功!");
    }
	

    /**
     *   通过id删除
     *
@@ -136,7 +141,7 @@
        planChangeApplyService.removeById(id);
        return Result.OK("删除成功!");
    }
	

    /**
     *  批量删除
     *
@@ -151,7 +156,7 @@
        this.planChangeApplyService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	

    /**
     * 通过id查询
     *
@@ -193,5 +198,42 @@
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PlanChangeApply.class);
    }
    @PostMapping(value = "/addForPlan")
    public Result<String> addForPlan(@RequestBody PlanChangeApply planChangeApply) {
        DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService
                .getOne(new QueryWrapper<DailyMaintenanceOrder>()
                        .eq("maintenance_order_uda1",planChangeApply.getPlanId())
                        .eq("maintenance_order_uda2",planChangeApply.getId()),false);
        if(ObjectUtils.isNull(dailyMaintenanceOrder)){
            return Result.error("尚未生成工单，无需申请");
        }else if(!dailyMaintenanceOrder.getStatus().equals(CommonConstant.STATUS_1)){
            return Result.error("工单已下达不允许进行变更");
        }
        maintenancePlanDetailService.update(new UpdateWrapper<EquipmentMaintenancePlanDetail>().eq("id",planChangeApply.getId()).set("plan_start_time",planChangeApply.getPlanDelayTime()));
        planChangeApply.setMaintenanceOrderId(dailyMaintenanceOrder.getId());
        planChangeApply.setId("");
        planChangeApplyService.save(planChangeApply);
        /**
         * 根据申请延保时间  重新计算工单的结束时间
         */
        String maintenanceCycleId = dailyMaintenanceOrder.getMaintenanceCycleId();
        Date planDelayTime = planChangeApply.getPlanDelayTime();
        MaintenanceCycle maintenanceCycle = maintenanceCycleService.getById(maintenanceCycleId);
        String unit = maintenanceCycle.getUnit();
        int effectiveTime = maintenanceCycle.getEffectiveTime().intValue();
        Date date = null;
        if ("min".equals(unit)) {
            date = DateUtils.getMinAfter(planDelayTime, effectiveTime);
        } else if ("hour".equals(unit)) {
            date = DateUtils.getHourAfter(planDelayTime, effectiveTime);
        } else if ("day".equals(unit)) {
            date = DateUtils.getDayAfter(planDelayTime, effectiveTime);
        }
        dailyMaintenanceOrder.setPlanEndTime(date);
        dailyMaintenanceOrder.setPlanStartTime(planDelayTime);
        dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
        return Result.OK("添加成功！");
    }


}

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

@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -54,15 +52,15 @@
    @ApiModelProperty(value = "maintenanceOrderId")
    private String maintenanceOrderId;
    /**planStartTime*/
    @Excel(name = "planStartTime", width = 15, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Excel(name = "planStartTime", width = 15, format = "yyyy-MM-dd HH:mm")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
    @ApiModelProperty(value = "planStartTime")
    private Date planStartTime;
    /**planDelayTime*/
    @Excel(name = "planDelayTime", width = 15, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Excel(name = "planDelayTime", width = 15, format = "yyyy-MM-dd HH:mm")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
    @ApiModelProperty(value = "planDelayTime")
    private Date planDelayTime;
    /**planUser*/
@@ -99,4 +97,7 @@
    @ApiModelProperty(value = "delFlag")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    @TableField(exist = false)
    private String planId;

}

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

@@ -20,6 +20,7 @@
        select
        t1.id id,
        t1.standard_id standardId,
        t1.plan_id planId,
        t1.plan_start_time planStartTime,
        t1.plan_end_time planEndTime,
        t2.num standardNum,