From b14980d3dec62bfc6b535ad99ee22b2e5e24703f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 2 Jun 2021 16:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=85=8D=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 4 +++- .../mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index faea2ebc..c270712c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -190,12 +190,14 @@ public class XmTaskController { xmTaskVoList=xmTaskCacheService.getTasks(queryKeys); if(xmTaskVoList==null){ xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 + PageUtils.responePage(m,xmTaskVoList); xmTaskCacheService.putTasks(queryKeys,xmTaskVoList); } }else { xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 + PageUtils.responePage(m,xmTaskVoList); } - PageUtils.responePage(m,xmTaskVoList); + m.put("data",xmTaskVoList); m.put("tips", tips); return m; diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml index 65b133c8..81178a94 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml @@ -56,10 +56,10 @@ sum( ifnull( menu_cnt, 0 ) ) menu_cnt FROM XM.xm_branch_state res - where res.biz_date = DATE_FORMAT(date_sub(now(),INTERVAL 1 DAY), '%Y-%m-%d') + - - + + {call load_project_state_to_xm_branch_state(#{branchId,mode=IN})}