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 { ...@@ -27,7 +27,6 @@ public class AdvancePaymentBalanceSumSchedulerTask implements Task {
@Autowired @Autowired
public AdvancePaymentBalanceSumService advancePaymentBalanceSumService; public AdvancePaymentBalanceSumService advancePaymentBalanceSumService;
@Autowired
public SysConfigService sysConfigService; public SysConfigService sysConfigService;
@Override @Override
...@@ -54,12 +53,13 @@ public class AdvancePaymentBalanceSumSchedulerTask implements Task { ...@@ -54,12 +53,13 @@ public class AdvancePaymentBalanceSumSchedulerTask implements Task {
} }
private JSONObject getConfig() { private JSONObject getConfig() {
Optional<SysConfig> optional = sysConfigService.get("bill", "billAnalyseConfig"); sysConfigService = Amino.getApplicationContext().getBean(SysConfigService.class);
if (optional.isPresent()) { Optional<SysConfig> optional = sysConfigService.get("bill", "billAnalyseConfig");
return new JSONObject(optional.get().getValue().toString()); if(optional.isPresent()){
} return new JSONObject(optional.get().getValue().toString());
return null; }
} return null;
}
public void generateAdvancePaymentBalanceSum(AdvancePaymentBalanceSumService advancePaymentBalanceSumService) public void generateAdvancePaymentBalanceSum(AdvancePaymentBalanceSumService advancePaymentBalanceSumService)
throws ParseException { 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