1、报告生成修改状态;
2、设备全部归档,修改计划完成状态;
This commit is contained in:
@@ -134,11 +134,11 @@ public class PqDevParam {
|
|||||||
@Valid
|
@Valid
|
||||||
private List<PqMonitorParam> monitorList;
|
private List<PqMonitorParam> monitorList;
|
||||||
|
|
||||||
@ApiModelProperty("icd")
|
@ApiModelProperty("icdId")
|
||||||
private String icd;
|
private String icdId;
|
||||||
|
//
|
||||||
@ApiModelProperty("power")
|
// @ApiModelProperty("power")
|
||||||
private String power;
|
// private String power;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新操作实体
|
* 更新操作实体
|
||||||
|
|||||||
@@ -204,8 +204,8 @@ public class PqDev extends BaseEntity implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private Integer factorCheckResult;
|
private Integer factorCheckResult;
|
||||||
|
|
||||||
private String icd;
|
private String icdId;
|
||||||
|
|
||||||
private String power;
|
// private String power;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
|
|||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = {Exception.class})
|
@Transactional(rollbackFor = {Exception.class})
|
||||||
public boolean addPqDev(PqDevParam pqDevParam) {
|
public boolean addPqDev(PqDevParam pqDevParam) {
|
||||||
this.checkRepeat(pqDevParam, false);
|
// this.checkRepeat(pqDevParam, false);
|
||||||
|
|
||||||
PqDev pqDev = new PqDev();
|
PqDev pqDev = new PqDev();
|
||||||
BeanUtil.copyProperties(pqDevParam, pqDev);
|
BeanUtil.copyProperties(pqDevParam, pqDev);
|
||||||
@@ -105,7 +105,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
|
|||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = {Exception.class})
|
@Transactional(rollbackFor = {Exception.class})
|
||||||
public boolean updatePqDev(PqDevParam.UpdateParam updateParam) {
|
public boolean updatePqDev(PqDevParam.UpdateParam updateParam) {
|
||||||
this.checkRepeat(updateParam, true);
|
// this.checkRepeat(updateParam, true);
|
||||||
|
|
||||||
PqDev pqDev = new PqDev();
|
PqDev pqDev = new PqDev();
|
||||||
BeanUtil.copyProperties(updateParam, pqDev);
|
BeanUtil.copyProperties(updateParam, pqDev);
|
||||||
|
|||||||
Reference in New Issue
Block a user