update 参会人排序由原来的按照创建时间排序修改为按照公司名称排序

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");
         //门户端-分页查询所有会员名称

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<PayMeeti
         if (StringUtils.isBlank(meetingId)) {
             throw new JeroBootException("会议id不能为空");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = req.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)) {
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )", particularYear);

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.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
 
 
 /**
@@ -66,7 +63,9 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
         if (StringUtils.isBlank(meetingId)) {
             throw new JeroBootException("会议id不能为空");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = req.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)) {
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )", particularYear);

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<PayMeet
         if (StringUtils.isBlank(meetingId)) {
             throw new JeroBootException("会议id不能为空");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = req.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)) {
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )", particularYear);

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<PayMeetin
         if (StringUtils.isBlank(meetingId)) {
             throw new JeroBootException("会议id不能为空");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = request.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)){
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);

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<PayMeetingSi
         if (StringUtils.isBlank(meetingId)) {
             throw new JeroBootException("会议id不能为空");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = req.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)){
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);

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.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -96,7 +93,9 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         String publicKey = req.getParameter("publicKey");
         String token = req.getParameter("token");
         authenticationUtils.check(token, publicKey);
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
         IPage<PayMeetingSituation> pageList = payMeetingSituationService.page(page, queryWrapper);
         pageList.getRecords().forEach(
@@ -253,7 +252,9 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     @RequiresPermissions("meetingSituation:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         List<PayMeetingSituation> pageList = payMeetingSituationService.list(queryWrapper);
         // 过滤选中数据
         String selections = request.getParameter("selections");

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<PayMe
         if (StringUtils.isBlank(meetingId)) {
             throw new JeroBootException("会议id不能为空");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = req.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)){
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);

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<PayMeeti
         if (StringUtils.isBlank(meetingId)) {
             throw new JeroBootException("会议id不能为空");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = req.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)){
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);

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.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -73,7 +70,9 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
         if (StringUtils.isBlank(meetingId)) {
             throw new JeroBootException("会议id不能为空");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = req.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)){
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -997,6 +997,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = loginUser.getId();
         queryWrapper.eq("pm.meeting_type", meetingType);
+        queryWrapper.orderByAsc("pms.company_name");
 
         LambdaQueryWrapper<PayMeetingContacts> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.eq(PayMeetingContacts::getMeetingId, meetingId);
@@ -1032,7 +1033,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
     @Override
     public IPage<PayMeetingSituation> queryStandardPage(Page<PayMeetingSituation> page, PayMeetingSituation payMeetingSituation, HttpServletRequest req) {
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
 
         String standardsId = req.getParameter("standardsId");
         if (StringUtils.isNotBlank(standardsId)){
@@ -1801,7 +1804,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (!Objects.equals(payMeeting.getMeetingType(),meetingType)){
             throw new JeroBootException("数据权限不足");
         }
-        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        parameterMap.remove("column");
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, parameterMap);
         String particularYear = request.getParameter("particularYear");
         if (StringUtils.isNotBlank(particularYear)){
             queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);