From 477f2b86e3608a622a36a57c8d451c301b6af9b2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 11 Sep 2024 14:57:23 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8F=82=E4=BC=9A=E4=BA=BA=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E7=94=B1=E5=8E=9F=E6=9D=A5=E7=9A=84=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8C=89=E7=85=A7=E5=85=AC=E5=8F=B8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/config/shiro/ShiroConfig.java | 2 +- .../CommitteeMeetingSituationController.java | 5 ++++- .../CouncilMeetingSituationController.java | 9 ++++----- .../DraftGroupMeetingSituationController.java | 5 ++++- .../InternalMeetingSituationController.java | 5 ++++- .../controller/OtherMeetingSituationController.java | 5 ++++- .../controller/PayMeetingSituationController.java | 13 +++++++------ .../SafetyCenterMeetingSituationController.java | 5 ++++- .../StandardsMeetingSituationController.java | 5 ++++- .../WorkGroupMeetingSituationController.java | 9 ++++----- .../impl/PayMeetingSituationServiceImpl.java | 9 +++++++-- 11 files changed, 47 insertions(+), 25 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 59937ee0..9f9a2b41 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -143,7 +143,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/meeting/internalMeeting/getLinkTopics","anon");//查询关联会议 filterChainDefinitionMap.put("/pack/payPackCompany/judgeCompanyIsPackaged","anon");//判断当前企业是否是打包企业 filterChainDefinitionMap.put("/company/payCompanyManagement/judgeCompanyIsPackaged","anon");//判断当前企业是否是打包企业 - filterChainDefinitionMap.put("/drafting/payDraftingGroupSubitem/queryInfoByDraftIdAndContactId","anon");//通过起草组id和参会人id查询企业信息和所有联系人信息 + filterChainDefinitionMap.put("/drafting/payDraftingGroupSubitem/queryInfoByDraftIdAndCompanyId","anon");//通过起草组id和参会人id查询企业信息和所有联系人信息 //通过单位名称查询该单位是否可用 filterChainDefinitionMap.put("/member/tbMemberProjectSubitem/enableMemberByCompanyName", "anon"); //门户端-分页查询所有会员名称 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index 8012c6c0..57bd851e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -32,6 +32,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Objects; @@ -73,7 +74,9 @@ public class CommitteeMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = req.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)) { queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )", particularYear); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java index 2542546e..d369c9c7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java @@ -30,10 +30,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; /** @@ -66,7 +63,9 @@ public class CouncilMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = req.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)) { queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )", particularYear); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java index 7db06547..be9bb18b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java @@ -39,6 +39,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; @@ -77,7 +78,9 @@ public class DraftGroupMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = req.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)) { queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )", particularYear); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java index 699bbb20..9207ae31 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java @@ -32,6 +32,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Objects; @@ -73,7 +74,9 @@ public class InternalMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); + Map parameterMap = request.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = request.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)){ queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index 9fa0da4d..8ec48aab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -31,6 +31,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Objects; @@ -70,7 +71,9 @@ public class OtherMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = req.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)){ queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index 1fdf4085..941e9ebd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -1,9 +1,6 @@ package com.jero.meeting.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -96,7 +93,9 @@ public class PayMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); Page page = new Page<>(pageNo, pageSize); IPage pageList = payMeetingSituationService.page(page, queryWrapper); pageList.getRecords().forEach( @@ -253,7 +252,9 @@ public class PayMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); + Map parameterMap = request.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); List pageList = payMeetingSituationService.list(queryWrapper); // 过滤选中数据 String selections = request.getParameter("selections"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java index 2a286556..bf1988b1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java @@ -34,6 +34,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Objects; @@ -73,7 +74,9 @@ public class SafetyCenterMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = req.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)){ queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index bf9558cf..9e8271a5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -32,6 +32,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Objects; @@ -71,7 +72,9 @@ public class StandardsMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = req.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)){ queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index 92d01069..22537818 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -30,10 +30,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; @@ -73,7 +70,9 @@ public class WorkGroupMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = req.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)){ queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 532d6dfb..45b4f25b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -997,6 +997,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(PayMeetingContacts::getMeetingId, meetingId); @@ -1032,7 +1033,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl queryStandardPage(Page page, PayMeetingSituation payMeetingSituation, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String standardsId = req.getParameter("standardsId"); if (StringUtils.isNotBlank(standardsId)){ @@ -1801,7 +1804,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); + Map parameterMap = request.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap); String particularYear = request.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)){ queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);