From 75a17f4f267353633a2dd21004ed23d435b79bf6 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 12 八月 2024 18:03:41 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis --- ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java index cc9253a..fdcb44c 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java @@ -1125,10 +1125,10 @@ String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); - if(null !=code && code.equals("200")){ - JSONArray resultData = object.getJSONArray("ResultData"); - Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0); - String cfh = resultDatasss.get("cfh").toString(); + if(null !=code && code.equals("0")){ + JSONObject resultData = object.getJSONObject("ResultData"); +// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0); + String cfh = resultData.getStr("cfh"); for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) { TjCf cf=new TjCf(); @@ -1786,7 +1786,8 @@ } //鑾峰彇浣撴寮傚父鏁� LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>(); - wq1.between(TjOrder::getFinishTime, DateUtil.lastMonth(), DateUtil.now()); + wq1.between(TjOrder::getCreateTime, DateUtil.lastMonth(), DateUtil.now()); + wq1.isNotNull(TjOrder::getFinishTime); wq1.eq(TjOrder::getCheckStatus, 1); List<TjOrder> orderAbnormalCountList = orderService.list(wq1); if (null != orderAbnormalCountList && orderAbnormalCountList.size() > 0) { -- Gitblit v1.8.0