add 标准统计

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingStandardProject.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -55,6 +56,7 @@ public class PayMeetingStandardProject {
      * 标准类型（强/推/行/团/地）
      */
     @TableField(value = "standard_type")
+    @Dict(dicCode = "standard_type")
     @ApiModelProperty(value = "标准类型（强/推/行/团/地）")
     private Integer standardType;
 
@@ -62,6 +64,7 @@ public class PayMeetingStandardProject {
      * 制修订（制定/修订）
      */
     @TableField(value = "preparation_and_revision")
+    @Dict(dicCode = "preparation_and_revision")
     @ApiModelProperty(value = "制修订（制定/修订）")
     private Integer preparationAndRevision;
 
@@ -70,6 +73,7 @@ public class PayMeetingStandardProject {
      */
     @TableField(value = "promoter")
     @ApiModelProperty(value = "宣贯人")
+    @Dict(dictTable = "sys_user",dicText = "realname", dicCode = "id")
     private String promoter;
 
     /**

jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingStandardProjectMapper.java

@@ -1,7 +1,12 @@
 package com.jero.meeting.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.meeting.entity.PayMeetingStandardProject;
+import org.apache.ibatis.annotations.Param;
 
 /**
   *
@@ -9,4 +14,5 @@ import com.jero.meeting.entity.PayMeetingStandardProject;
   *@date 2024-03-13 11:16
   */
 public interface PayMeetingStandardProjectMapper extends BaseMapper<PayMeetingStandardProject> {
+    IPage<PayMeetingStandardProject> pageList(Page<PayMeetingStandardProject> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeetingStandardProject> queryWrapper);
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingStandardProjectMapper.xml

@@ -19,4 +19,10 @@
     id, meeting_id, standard_no, standard_name, standard_type, preparation_and_revision, 
     promoter, promotion_time, `promotion _location`
   </sql>
+
+  <select id="pageList" resultMap="BaseResultMap">
+    select * from pay_meeting_standard_project pmsp
+        left join pay_meeting pm on pm.id = pmsp.meeting_id
+    ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -1,5 +1,8 @@
 package com.jero.meeting.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
@@ -14,4 +17,8 @@ import com.jero.meeting.entity.PayMeetingStandardProject;
 @Service
 public class PayMeetingStandardProjectService extends ServiceImpl<PayMeetingStandardProjectMapper, PayMeetingStandardProject> {
 
+    public IPage<PayMeetingStandardProject> pageList(Page<PayMeetingStandardProject> page, QueryWrapper<PayMeetingStandardProject> queryWrapper) {
+
+        return baseMapper.pageList(page, queryWrapper);
+    }
 }

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/MemberStatisticsController.java

@@ -4,18 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
-import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.PasswordUtil;
-import com.jero.index.vo.LineChartVO;
-import com.jero.index.vo.PieChartVO;
-import com.jero.meeting.service.IPayMeetingService;
-import com.jero.meeting.service.IPayMeetingSituationService;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.service.ITbMemberProjectSubitemService;
-import com.jero.payment.service.impl.PayConfirmPaymentRecordService;
-import com.jero.statistics.entity.MeetingPackStatisticsSearch;
 import com.jero.statistics.entity.MemberLineChartVO;
 import com.jero.statistics.entity.MemberPieChartVO;
 import io.swagger.annotations.Api;
@@ -25,12 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Objects;
 
 
 @Api(tags = "会员统计")

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/StandardStatisticsController.java

@@ -0,0 +1,46 @@
+package com.jero.statistics.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.meeting.entity.PayMeetingStandardProject;
+import com.jero.meeting.service.PayMeetingStandardProjectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+
+@Api(tags = "标准统计")
+@RestController
+@RequestMapping("/statistics/standard")
+@Slf4j
+public class StandardStatisticsController {
+    @Resource
+    private PayMeetingStandardProjectService meetingStandardProjectService;
+
+    @ApiOperation(value = "会议标准项目分页查询")
+    @GetMapping(value = "/standardProjectPage")
+    public Result<IPage<PayMeetingStandardProject>> standardProjectPage(PayMeetingStandardProject meetingStandardProject,
+                                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        QueryWrapper<PayMeetingStandardProject> queryWrapper = QueryGenerator.initQueryWrapper(meetingStandardProject, req.getParameterMap());
+        String meetingName = req.getParameter("meetingName");
+        if (StringUtils.isNotBlank(meetingName)){
+            queryWrapper.eq("pm.meeting_name",meetingName);
+        }
+        Page<PayMeetingStandardProject> page = new Page<>(pageNo, pageSize);
+        IPage<PayMeetingStandardProject> pageList = meetingStandardProjectService.pageList(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+}