Commit c98c413e by wukaiqiang

Merge branch 'develop' into feature/form_statistics_05

# Conflicts:
#	backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTask.java
#	backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTaskRegister.java
parents 88b9bf9c 30913f82
......@@ -27,7 +27,6 @@ public class AdvancePaymentBalanceSumSchedulerTask implements Task {
@Autowired
public AdvancePaymentBalanceSumService advancePaymentBalanceSumService;
@Autowired
public SysConfigService sysConfigService;
@Override
......@@ -54,12 +53,13 @@ public class AdvancePaymentBalanceSumSchedulerTask implements Task {
}
private JSONObject getConfig() {
Optional<SysConfig> optional = sysConfigService.get("bill", "billAnalyseConfig");
if (optional.isPresent()) {
return new JSONObject(optional.get().getValue().toString());
}
return null;
}
sysConfigService = Amino.getApplicationContext().getBean(SysConfigService.class);
Optional<SysConfig> optional = sysConfigService.get("bill", "billAnalyseConfig");
if(optional.isPresent()){
return new JSONObject(optional.get().getValue().toString());
}
return null;
}
public void generateAdvancePaymentBalanceSum(AdvancePaymentBalanceSumService advancePaymentBalanceSumService)
throws ParseException {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment