|
|
@@ -17,6 +17,7 @@
|
|
|
package org.springblade.meter.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
@@ -31,18 +32,16 @@ import org.springblade.core.mp.support.Query;
|
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.meter.dto.ContractMeterPeriodDTO;
|
|
|
-import org.springblade.meter.entity.ContractMaterialAdjust;
|
|
|
-import org.springblade.meter.entity.InterimPayCertificate;
|
|
|
-import org.springblade.meter.entity.MeterPeriod;
|
|
|
+import org.springblade.meter.entity.*;
|
|
|
import org.springblade.meter.service.IContractMaterialAdjustService;
|
|
|
import org.springblade.meter.service.IInterimPayCertificateService;
|
|
|
+import org.springblade.meter.service.IMiddleMeterApplyService;
|
|
|
import org.springblade.meter.utils.StringUtils;
|
|
|
import org.springblade.meter.vo.ContractMeterPeriodVO;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import org.springblade.meter.entity.ContractMeterPeriod;
|
|
|
import org.springblade.meter.service.IContractMeterPeriodService;
|
|
|
import org.springblade.core.boot.ctrl.BladeController;
|
|
|
|
|
|
@@ -65,6 +64,7 @@ public class ContractMeterPeriodController extends BladeController {
|
|
|
private final IContractMeterPeriodService contractMeterPeriodService;
|
|
|
private final IInterimPayCertificateService interimPayCertificateService;
|
|
|
private final IContractMaterialAdjustService adjustService;
|
|
|
+ private final IMiddleMeterApplyService middleMeterApplyService;
|
|
|
|
|
|
/**
|
|
|
* 分页
|
|
|
@@ -136,6 +136,14 @@ public class ContractMeterPeriodController extends BladeController {
|
|
|
if (period.getEndDate().compareTo(period.getStartDate()) == -1){
|
|
|
throw new ServiceException("结束日期必须大于开始日期");
|
|
|
}
|
|
|
+ /** 同步计量单*/
|
|
|
+ if (period.getId() != null && period.getApproveStatus() == 0){
|
|
|
+ middleMeterApplyService.update(new LambdaUpdateWrapper<MiddleMeterApply>()
|
|
|
+ .eq(MiddleMeterApply::getContractId,dto.getContractId())
|
|
|
+ .eq(MiddleMeterApply::getContractPeriodId,period.getId())
|
|
|
+ .set(MiddleMeterApply::getBusinessDate,period.getEndDate()));
|
|
|
+ }
|
|
|
+
|
|
|
lastDate = period.getEndDate();
|
|
|
period.setSort(i);
|
|
|
period.setPayNumber(contractNumber + "-" +StringUtils.padZeroToFront(period.getPeriodNumber(),3));
|
|
|
@@ -151,6 +159,7 @@ public class ContractMeterPeriodController extends BladeController {
|
|
|
}
|
|
|
}
|
|
|
this.contractMeterPeriodService.saveBatch(list);
|
|
|
+
|
|
|
}
|
|
|
return R.success("保存成功");
|
|
|
}
|
qianxb