|
@@ -255,7 +255,7 @@ public class OpsAppApi {
|
|
|
BaseContextHandler.setTenant("0000");
|
|
|
LambdaUpdateWrapper<EquBarrel> updateWrapper = new LambdaUpdateWrapper();
|
|
|
updateWrapper.set(EquBarrel::getMtrId, equRecord.getReplaceMaterial()).set(EquBarrel::getMtrName, equRecord.getMtName()).set(EquBarrel::getMtrResidue, equRecord.getSpecs())
|
|
|
- .set(EquBarrel::getExprTime, equRecord.getDate()).eq(EquBarrel::getId, equRecord.getMaterialId());
|
|
|
+ .set(StringUtil.isNotEmpty(equRecord.getDate()), EquBarrel::getExprTime, DateUtils.getStartTime(equRecord.getDate())).eq(EquBarrel::getId, equRecord.getMaterialId());
|
|
|
Boolean bool = equBarrelService.update(null, updateWrapper);
|
|
|
if(bool){
|
|
|
bool = equRecordService.save(equRecord);
|