diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java index 36342019..0b0d20bb 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java @@ -51,11 +51,13 @@ public class BmsCenterExtend implements Serializable { /** 成本中心编码 */ @NotBlank(message = "成本中心编码不能为空") @Length(max = 50,message = "成本中心编码长度不能超过50字") + @TableField(condition = SqlCondition.LIKE) private String centerCode; /** 成本中心名称 */ @NotBlank(message = "成本中心名称不能为空") @Length(max = 200,message = "成本中心名称长度不能超过200字") + @TableField(condition = SqlCondition.LIKE) private String centerName; /** 开始时间 */ diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java index 1b97eaa5..0d3c85d9 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java @@ -274,6 +274,13 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl dellqw = new LambdaQueryWrapper<>(); + dellqw.eq(BmsCenterExtend::getCenterType,param.getType()); + dellqw.eq(BmsCenterExtend::getCenterId,param.getSourceCenterId()); + dellqw.ne(BmsCenterExtend::getSourceId,0); + dellqw.notIn(BmsCenterExtend::getId,updateIds); + this.remove(dellqw); //新增 for (BmsCenterExtendBo.Item item : saveExtendBo) { //校验是否可添加 @@ -294,13 +301,6 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl dellqw = new LambdaQueryWrapper<>(); - dellqw.eq(BmsCenterExtend::getCenterType,param.getType()); - dellqw.eq(BmsCenterExtend::getCenterId,param.getSourceCenterId()); - dellqw.ne(BmsCenterExtend::getSourceId,0); - dellqw.notIn(BmsCenterExtend::getId,updateIds); - this.remove(dellqw); //更新 LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(BmsCenterExtend::getCenterType,param.getType()); diff --git a/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java index 66617b88..b48d84dc 100644 --- a/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java @@ -225,7 +225,9 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService { } //不再支付统计 BigDecimal dontCheckAmt = activityMapper.sumSupplierNotCheckCost(supplierId); - + if(dontCheckAmt==null){ + dontCheckAmt = BigDecimal.ZERO; + } mainInfo.setCheckedAmt(checkedAmt); mainInfo.setCheckingAmt(notCheckAmt); mainInfo.setDontCheckAmt(dontCheckAmt);