|
@@ -51,6 +51,18 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
|
|
|
(judgeFaultLogicBo.getKeyWord()));
|
|
|
queryWrapper.or(JUDGE_FAULT_LOGIC.REMARKS.like
|
|
|
(judgeFaultLogicBo.getKeyWord()));
|
|
|
+ queryWrapper.or(JUDGE_FAULT_LOGIC.MODEL.eq
|
|
|
+ (judgeFaultLogicBo.getModel()));
|
|
|
+ queryWrapper.or(JUDGE_FAULT_LOGIC.HMC_CODE.eq
|
|
|
+ (judgeFaultLogicBo.getHmcCode()));
|
|
|
+ queryWrapper.or(JUDGE_FAULT_LOGIC.NAME.eq
|
|
|
+ (judgeFaultLogicBo.getName()));
|
|
|
+ queryWrapper.or(JUDGE_FAULT_LOGIC.SYS_NAME.eq
|
|
|
+ (judgeFaultLogicBo.getSysName()));
|
|
|
+ queryWrapper.or(JUDGE_FAULT_LOGIC.SYS_ID.eq
|
|
|
+ (judgeFaultLogicBo.getSysId()));
|
|
|
+ queryWrapper.or(JUDGE_FAULT_LOGIC.REMARKS.eq
|
|
|
+ (judgeFaultLogicBo.getRemarks()));
|
|
|
|
|
|
return queryWrapper;
|
|
|
}
|
|
@@ -114,8 +126,8 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
|
|
|
@Override
|
|
|
public boolean insert(JudgeFaultLogicBo judgeFaultLogicBo) {
|
|
|
JudgeFaultLogic judgeFaultLogic = MapstructUtils.convert(judgeFaultLogicBo, JudgeFaultLogic.class);
|
|
|
-
|
|
|
- return this.save(judgeFaultLogic);//使用全局配置的雪花算法主键生成器生成ID值
|
|
|
+ //使用全局配置的雪花算法主键生成器生成ID值
|
|
|
+ return this.save(judgeFaultLogic);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -127,9 +139,8 @@ public class JudgeFaultLogicServiceImpl extends BaseServiceImpl<JudgeFaultLogicM
|
|
|
@Override
|
|
|
public boolean insertWithPk(JudgeFaultLogicBo judgeFaultLogicBo) {
|
|
|
JudgeFaultLogic judgeFaultLogic = MapstructUtils.convert(judgeFaultLogicBo, JudgeFaultLogic.class);
|
|
|
-
|
|
|
-
|
|
|
- return judgeFaultLogicMapper.insertWithPk(judgeFaultLogic) > 0;//前台传来主键值
|
|
|
+ //前台传来主键值
|
|
|
+ return judgeFaultLogicMapper.insertWithPk(judgeFaultLogic) > 0;
|
|
|
}
|
|
|
|
|
|
/**
|