From 6841333d717f2adc906b31f27dd4e4e2753253ce Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 13 Mar 2024 16:31:06 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardsMeetingSituationController.java  | 39 +++++++++++++++++++
 .../meeting/entity/PayMeetingSituation.java   |  8 ++++
 .../mapper/PayMeetingSituationMapper.java     |  2 +
 .../mapper/xml/PayMeetingSituationMapper.xml  | 10 +++++
 .../service/IPayMeetingSituationService.java  |  2 +
 .../impl/PayMeetingSituationServiceImpl.java  |  5 +++
 6 files changed, 66 insertions(+)

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 fb2148ad..8c035bdc 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
@@ -90,6 +90,45 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
         return Result.OK(pageList);
     }
 
+    /**
+     * 标协会议报名信息维护
+     */
+    @CompanyNameTranslate
+    @RequiresPermissions("standardsMeetingSituation:search")
+    @ApiOperation(value = "标协会议报名信息维护")
+    @GetMapping(value = "/standardPage")
+    public Result<?> queryStandardPage(PayMeetingSituation payMeetingSituation,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
+        String year = req.getParameter("year");
+        if (StringUtils.isBlank(year)){
+            throw new JeroBootException("年份不能为空");
+        }
+        queryWrapper.eq("pm.particular_year",year);
+
+        String particularYear = req.getParameter("particularYear");
+        if (StringUtils.isNotBlank(particularYear)){
+            queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
+        }
+        queryWrapper.eq("pm.meeting_type", MEETING_TYPE);
+
+        Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
+        IPage<PayMeetingSituation> pageList = payMeetingSituationService.queryStandardPage(page, queryWrapper);
+        List<PayMeetingSituation> situationList = pageList.getRecords();
+        for (PayMeetingSituation meetingSituation : situationList) {
+            Integer payMode = meetingSituation.getPayMode();
+            //汇款并且缴费凭证为空
+            if (Objects.equals(payMode,1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())){
+                meetingSituation.setIdentification(PayProjectCommon.YES);
+            }else {
+                meetingSituation.setIdentification(PayProjectCommon.NO);
+            }
+        }
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加参会人
      */
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 0d185060..0da48f48 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -446,6 +446,14 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "会议名称")
     private String meetingName;
 
+    /**
+     * 会议名称
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "会议类型")
+    @Dict(dicCode = "standard_meeting_type")
+    private String tbMeetingType;
+
     /**打包年份*/
     @TableField(exist = false)
     @ApiModelProperty(value = "打包年份")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java
index 3bcb7b90..c4ac1763 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java
@@ -26,6 +26,8 @@ public interface PayMeetingSituationMapper extends BaseMapper<PayMeetingSituatio
     IPage<PayMeetingSituation> pageListContract(Page<PayMeetingSituation> page,
                                                 @Param(Constants.WRAPPER) QueryWrapper<PayMeetingSituation> queryWrapper);
 
+    IPage<PayMeetingSituation> queryStandardPage(Page<PayMeetingSituation> page,@Param(Constants.WRAPPER)  QueryWrapper<PayMeetingSituation> queryWrapper);
+
     IPage<PayMeetingSituation> pageListContractWorkGroup(Page<PayMeetingSituation> page,
                                                          @Param(Constants.WRAPPER) QueryWrapper<PayMeetingSituation> queryWrapper);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
index 741953cb..cdd5a5b0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml
@@ -49,6 +49,8 @@
         <result column="in_account" property="inAccount"/>
         <result column="make_invoice" property="makeInvoice"/>
         <result column="mail" property="mail"/>
+        <result column="meeting_name" property="meetingName"/>
+        <result column="tb_meeting_type" property="tbMeetingType"/>
     </resultMap>
     <resultMap id="MeetingSituationContractVOMap" type="com.jero.meeting.vo.MeetingSituationContractVO">
         <id column="id" property="id"/>
@@ -160,6 +162,14 @@
         ${ew.customSqlSegment}
     </select>
 
+    <select id="queryStandardPage" resultMap="PayMeetingSituationResultMap">
+        select distinct pms.*,pm.meeting_name,pm.tb_meeting_type
+        from pay_meeting_situation pms
+                 left join pay_meeting pm on pms.meeting_id = pm.id
+                 left JOIN pay_payment_record ppr ON ppr.project_id = pms.id
+            ${ew.customSqlSegment}
+    </select>
+
     <select id="pageListContractWorkGroup" resultMap="PayMeetingSituationResultMap">
         select distinct pms.*
         from pay_meeting_situation pms
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
index 6c6aead5..58e4a6dc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
@@ -87,6 +87,8 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
 
     IPage<PayMeetingSituation> pageListContract(String meetingId, Page<PayMeetingSituation> page, QueryWrapper<PayMeetingSituation> queryWrapper, Integer meetingType);
 
+	IPage<PayMeetingSituation> queryStandardPage(Page<PayMeetingSituation> page, QueryWrapper<PayMeetingSituation> queryWrapper);
+
 	List<Object> MeetingSituationGetModelAndView(HttpServletRequest request, PayMeetingSituation payMeetingSituation, Integer meetingType);
 
 	@Nullable
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 f7638eee..dc47f292 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
@@ -984,6 +984,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         return baseMapper.pageListContract(page, queryWrapper);
     }
 
+    @Override
+    public IPage<PayMeetingSituation> queryStandardPage(Page<PayMeetingSituation> page, QueryWrapper<PayMeetingSituation> queryWrapper) {
+        return baseMapper.queryStandardPage(page, queryWrapper);
+    }
+
     /**
      * 更新
      */