diff --git a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java index 0833616..083e367 100644 --- a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java +++ b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java @@ -111,9 +111,17 @@ public class TargetServiceImpl extends ServiceImpl @Override public String getResult(JSONObject params) { String sql = getResultSql(params); - List> list = SqlRunner.db().selectList(sql); + List searchList = params.getJSONArray("search").toJavaList(TargetOption.class); + String cycle = "yesterday"; + for (TargetOption search : searchList) { + if (search.getType() == 1) { + cycle = search.getFun(); + } + } + String[] strArr = utilService.getCurrentCycleDataByCycle(new Date(), cycle); + List> list = SqlRunner.db().selectList(sql, strArr[3], strArr[4]); TargetOption result = params.getJSONObject("result").toJavaObject(TargetOption.class); - return list.get(0).get(result.getColumnName()).toString(); + return list.get(0) == null ? "0" : list.get(0).get(result.getColumnName()).toString(); } @Override