update
This commit is contained in:
@@ -8,12 +8,15 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
|||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||||
import org.jeecg.common.system.base.controller.JeecgController;
|
import org.jeecg.common.system.base.controller.JeecgController;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
|
import org.jeecg.modules.database.entity.Equipment;
|
||||||
import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
|
import org.jeecg.modules.database.entity.ExperimentDeviationEquipment;
|
||||||
|
import org.jeecg.modules.database.service.IEquipmentService;
|
||||||
import org.jeecg.modules.database.service.IExperimentDeviationEquipmentService;
|
import org.jeecg.modules.database.service.IExperimentDeviationEquipmentService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@@ -35,6 +38,8 @@ public class ExperimentDeviationEquipmentController
|
|||||||
extends JeecgController<ExperimentDeviationEquipment, IExperimentDeviationEquipmentService> {
|
extends JeecgController<ExperimentDeviationEquipment, IExperimentDeviationEquipmentService> {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IExperimentDeviationEquipmentService experimentDeviationEquipmentService;
|
private IExperimentDeviationEquipmentService experimentDeviationEquipmentService;
|
||||||
|
@Autowired
|
||||||
|
private IEquipmentService equipmentService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
@@ -70,6 +75,11 @@ public class ExperimentDeviationEquipmentController
|
|||||||
@RequiresPermissions("database:experiment:add")
|
@RequiresPermissions("database:experiment:add")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<String> add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
|
public Result<String> add(@RequestBody ExperimentDeviationEquipment experimentDeviationEquipment) {
|
||||||
|
String equipmentNo = experimentDeviationEquipment.getEquipmentNo();
|
||||||
|
if (StringUtils.isNotBlank(equipmentNo)) {
|
||||||
|
Equipment equipment = equipmentService.getByManagementNo(equipmentNo);
|
||||||
|
experimentDeviationEquipment.setMeasurementValidity(equipment.getExpireDate());
|
||||||
|
}
|
||||||
experimentDeviationEquipmentService.save(experimentDeviationEquipment);
|
experimentDeviationEquipmentService.save(experimentDeviationEquipment);
|
||||||
return Result.OK("添加成功!");
|
return Result.OK("添加成功!");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user