From e18aca6940649a7304ec5fcde32e4e9936d83394 Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Tue, 5 Sep 2023 17:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TAmentPartyAffairsController.java | 4 +-- .../base/mapper/TAmentPartyAffairsMapper.java | 4 +-- .../service/ITAmentPartyAffairsService.java | 4 +-- .../impl/TAmentPartyAffairsServiceImpl.java | 4 +-- .../mapper/base/TAmentPartyAffairsMapper.xml | 32 ++++--------------- 5 files changed, 14 insertions(+), 34 deletions(-) diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java index 9d2799c..2047823 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java @@ -225,7 +225,7 @@ public class TAmentPartyAffairsController extends BaseController @ResponseBody public AjaxResult importantWork(TAmentPartyAffairs tAmentPartyAffairs) { - List list = tAmentPartyAffairsService.importantWork(tAmentPartyAffairs); + List> list = tAmentPartyAffairsService.importantWork(tAmentPartyAffairs); return AjaxResult.success(list); } @@ -234,7 +234,7 @@ public class TAmentPartyAffairsController extends BaseController @ResponseBody public AjaxResult labelTotal(TAmentPartyAffairs tAmentPartyAffairs) { - List list = tAmentPartyAffairsService.labelTotal(tAmentPartyAffairs); + List> list = tAmentPartyAffairsService.labelTotal(tAmentPartyAffairs); return AjaxResult.success(list); } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java index c2e3b2a..eb484e3 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/mapper/TAmentPartyAffairsMapper.java @@ -83,6 +83,6 @@ public interface TAmentPartyAffairsMapper List> deptTree(TAmentPartyAffairs tAmentPartyAffairs); - List importantWork(TAmentPartyAffairs tAmentPartyAffairs); - List labelTotal(TAmentPartyAffairs tAmentPartyAffairs); + List> importantWork(TAmentPartyAffairs tAmentPartyAffairs); + List> labelTotal(TAmentPartyAffairs tAmentPartyAffairs); } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java index ad5e52a..3fbe730 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/ITAmentPartyAffairsService.java @@ -83,6 +83,6 @@ public interface ITAmentPartyAffairsService List> deptTree(TAmentPartyAffairs tAmentPartyAffairs); - List importantWork(TAmentPartyAffairs tAmentPartyAffairs); - List labelTotal(TAmentPartyAffairs tAmentPartyAffairs); + List> importantWork(TAmentPartyAffairs tAmentPartyAffairs); + List> labelTotal(TAmentPartyAffairs tAmentPartyAffairs); } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java index 950e9eb..c35543e 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/service/impl/TAmentPartyAffairsServiceImpl.java @@ -68,11 +68,11 @@ public class TAmentPartyAffairsServiceImpl implements ITAmentPartyAffairsService } @Override - public List importantWork(TAmentPartyAffairs tAmentPartyAffairs){ + public List> importantWork(TAmentPartyAffairs tAmentPartyAffairs){ return tAmentPartyAffairsMapper.importantWork(tAmentPartyAffairs); } @Override - public List labelTotal(TAmentPartyAffairs tAmentPartyAffairs){ + public List> labelTotal(TAmentPartyAffairs tAmentPartyAffairs){ return tAmentPartyAffairsMapper.labelTotal(tAmentPartyAffairs); } diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml index 3630205..c6bb618 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml @@ -156,43 +156,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" f.type - SELECT ROUND( sum(a.now_score) / sum(a.score) * 100 ) percent, a.shot_name shotName, - a.now_score nowScore, - b.`name` oprator, - c.`name` reviewer, - d.`name` header, - e.branch_name branch, - f.dept_name deptName + a.type FROM t_ament_party_affairs a - LEFT JOIN t_ament_personnel b ON a.per_id = b.id - LEFT JOIN t_ament_personnel c ON a.reviewed = c.id - LEFT JOIN t_ament_personnel d ON a.head = d.id - LEFT JOIN t_ament_branch e ON a.branch_id = e.branch_id - LEFT JOIN sys_dept f ON a.dept_id = f.dept_id group by a.type,a.shot_name - SELECT - ROUND( sum(a.now_score) / sum(a.score) * 100 ) percent, - a.shot_name shotName, - a.now_score nowScore, - b.`name` oprator, - c.`name` reviewer, - d.`name` header, - e.branch_name branch, - f.dept_name deptName + ROUND( sum(a.now_score) / sum(a.score) * 100 ) percent, + a.shot_name shotName, + a.type FROM t_ament_party_affairs a - LEFT JOIN t_ament_personnel b ON a.per_id = b.id - LEFT JOIN t_ament_personnel c ON a.reviewed = c.id - LEFT JOIN t_ament_personnel d ON a.head = d.id - LEFT JOIN t_ament_branch e ON a.branch_id = e.branch_id - LEFT JOIN sys_dept f ON a.dept_id = f.dept_id where a.type in ('党风廉政建设','党务意识形态') group by a.type,a.shot_name