|
@@ -88,12 +88,13 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
|
|
String tenantId=currentUser.getTenantId();
|
|
String tenantId=currentUser.getTenantId();
|
|
measurementSettlement.setTenantId(tenantId);
|
|
measurementSettlement.setTenantId(tenantId);
|
|
setTotalWaters(measurementSettlementDto,measurementSettlement);
|
|
setTotalWaters(measurementSettlementDto,measurementSettlement);
|
|
|
|
+ Integer id=measurementSettlement.getId();
|
|
measurementSettlementMapper.insert(measurementSettlement);
|
|
measurementSettlementMapper.insert(measurementSettlement);
|
|
|
|
+ measurementSettlementDto.setId(id);
|
|
String add = xxlJobUtil.add(setInfo(measurementSettlementDto));
|
|
String add = xxlJobUtil.add(setInfo(measurementSettlementDto));
|
|
JSONObject jsonObject = JSON.parseObject(add);
|
|
JSONObject jsonObject = JSON.parseObject(add);
|
|
String taskId = jsonObject.getString("content");
|
|
String taskId = jsonObject.getString("content");
|
|
if(taskId!=null){
|
|
if(taskId!=null){
|
|
- Integer id=measurementSettlement.getId();
|
|
|
|
measurementSettlement=new MeasurementSettlement();
|
|
measurementSettlement=new MeasurementSettlement();
|
|
measurementSettlement.setTaskId(Long.parseLong(taskId));
|
|
measurementSettlement.setTaskId(Long.parseLong(taskId));
|
|
measurementSettlement.setId(id);
|
|
measurementSettlement.setId(id);
|