Browse Source

debug

contract
Yen 2 years ago
parent
commit
c7857bc15a
  1. 2
      src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java
  2. 14
      src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java
  3. 4
      src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java

2
src/main/java/com/qs/serve/modules/bms/entity/BmsCenterExtend.java

@ -51,11 +51,13 @@ public class BmsCenterExtend implements Serializable {
/** 成本中心编码 */ /** 成本中心编码 */
@NotBlank(message = "成本中心编码不能为空") @NotBlank(message = "成本中心编码不能为空")
@Length(max = 50,message = "成本中心编码长度不能超过50字") @Length(max = 50,message = "成本中心编码长度不能超过50字")
@TableField(condition = SqlCondition.LIKE)
private String centerCode; private String centerCode;
/** 成本中心名称 */ /** 成本中心名称 */
@NotBlank(message = "成本中心名称不能为空") @NotBlank(message = "成本中心名称不能为空")
@Length(max = 200,message = "成本中心名称长度不能超过200字") @Length(max = 200,message = "成本中心名称长度不能超过200字")
@TableField(condition = SqlCondition.LIKE)
private String centerName; private String centerName;
/** 开始时间 */ /** 开始时间 */

14
src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java

@ -274,6 +274,13 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl<BmsCenterExtendMappe
BmsCenterExtend currentCenter = this.getById(param.getId()); BmsCenterExtend currentCenter = this.getById(param.getId());
currentCenter.setStopTime(nowTime); currentCenter.setStopTime(nowTime);
this.updateById(currentCenter); this.updateById(currentCenter);
//移除
LambdaQueryWrapper<BmsCenterExtend> 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) { for (BmsCenterExtendBo.Item item : saveExtendBo) {
//校验是否可添加 //校验是否可添加
@ -294,13 +301,6 @@ public class BmsCenterExtendServiceImpl extends ServiceImpl<BmsCenterExtendMappe
this.save(currentChildCenter); this.save(currentChildCenter);
this.toSaveExtendUser( currentCenter, item.getUserList(), centerDto2, currentChildCenter.getId()); this.toSaveExtendUser( currentCenter, item.getUserList(), centerDto2, currentChildCenter.getId());
} }
//移除
LambdaQueryWrapper<BmsCenterExtend> 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<BmsCenterExtend> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BmsCenterExtend> lqw = new LambdaQueryWrapper<>();
lqw.eq(BmsCenterExtend::getCenterType,param.getType()); lqw.eq(BmsCenterExtend::getCenterType,param.getType());

4
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); BigDecimal dontCheckAmt = activityMapper.sumSupplierNotCheckCost(supplierId);
if(dontCheckAmt==null){
dontCheckAmt = BigDecimal.ZERO;
}
mainInfo.setCheckedAmt(checkedAmt); mainInfo.setCheckedAmt(checkedAmt);
mainInfo.setCheckingAmt(notCheckAmt); mainInfo.setCheckingAmt(notCheckAmt);
mainInfo.setDontCheckAmt(dontCheckAmt); mainInfo.setDontCheckAmt(dontCheckAmt);

Loading…
Cancel
Save