增加下次三保时间 技术状态类型及单号

qushaowei

2023-10-29 2c250bb7d2c0efd16e5f124648bc77f5fd93040a

增加下次三保时间  技术状态类型及单号

 lxzn-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -710,6 +710,19 @@
    }

    /**
     * 获取指定时间之后的几年 qsw
     */
    public static Date getYearAfter(Date data,int number) {
        Calendar c = Calendar.getInstance();
        c.setTime(data);
        c.add(Calendar.YEAR, number);
        Date afterTime = c.getTime();
//        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//        String resultDate = f.format(afterTime);
        return afterTime;
    }

    /**
     * 获取指定时间之后的几天 qsw
     */
    public static Date getDayAfter(Date data,int number) {

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

@@ -764,6 +764,7 @@
    @RequestMapping(value = "/editTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> editTechnologyStatus(@RequestBody Equipment equipment) {
        equipment.setTechnologyStatusVerificationType("1");
        equipmentService.updateById(equipment);

        DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(equipment.getMaintenanceOrderId());

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

@@ -15,10 +15,13 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.MaintenanceThreeAcceptance;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IMaintenanceThreeAcceptanceService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -58,6 +61,9 @@

     @Autowired
    private IDailyMaintenanceOrderService dailyMaintenanceOrderService;

     @Autowired
     private IEamEquipmentService equipmentService;
    
    /**
     * 分页列表查询
@@ -95,6 +101,8 @@
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
        String maintenanceOrderId = maintenanceThreeAcceptance.getMaintenanceOrderId();
        String equipmentId = maintenanceThreeAcceptance.getEquipmentId();
        int maintenanceCycle = Integer.parseInt(maintenanceThreeAcceptance.getMaintenanceCycle());
        List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances = maintenanceThreeAcceptance.getMaintenanceThreeAcceptances();
        String checkStatus = "1";//三级保养验收状态（1通过，2未通过）
        for (MaintenanceThreeAcceptance threeAcceptance : maintenanceThreeAcceptances) {
@@ -115,9 +123,18 @@
        maintenanceOrder.setInspectDate(new Date());
//        maintenanceOrder.setStatus("8");
        dailyMaintenanceOrderService.updateById(maintenanceOrder);

        if("1".equals(checkStatus)){
            Equipment equipment = equipmentService.getById(equipmentId);
            Date dayAfter = DateUtils.getYearAfter(new Date(), maintenanceCycle);
            equipment.setNextThirdMaintenanceTime(dayAfter);
            equipment.setThirdMaintenanceTime(new Date());
            equipmentService.updateById(equipment);
        }

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

    /**
     *  编辑
     *

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

@@ -201,6 +201,12 @@
    @Dict(dicCode = "id",dictTable = "mom_eam_precision_parameters_template",dicText = "name")
    private String precisionParametersTemplateId;

    @ApiModelProperty(value = "技术状态鉴定类型（字典technology_status_verification_type）")
    private String technologyStatusVerificationType;

    @ApiModelProperty(value = "技术状态鉴定单据")
    private String technologyStatusVerificationBill;

    @TableField(exist = false)
    private String processParametersTemplateName;


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

@@ -71,4 +71,10 @@

    @TableField(exist = false)
    private String notPassReason;

    @TableField(exist = false)
    private String maintenanceCycle;

    @TableField(exist = false)
    private String equipmentId;
}

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

@@ -46,9 +46,11 @@
            t1.status,
            t5.item_text as statusName,
            t1.num,
            t1.num as technologyStatusVerificationBill,
            t4.id as maintenanceCycleId,
            t4.maintenance_type as maintenanceType,
            t10.item_text as maintenanceTypeName,
            t4.cycle as maintenanceCycle,
            concat(t4.code, '/', t4.name) as maintenanceCycleName,
            t3.id as equipmentId,
            t3.num as equipmentNum,