fix bug 40541 国际研讨会--会议详情--用来款年份查询无效果
This commit is contained in:
lijiarao
+5
-1
@@ -73,8 +73,12 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
|
||||
String particularYear = req.getParameter("particularYear");
|
||||
if (StringUtils.isNotBlank(particularYear)){
|
||||
queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
|
||||
}
|
||||
Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.page(page, queryWrapper);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.pageListContract(page, queryWrapper);
|
||||
List<PayMeetingSituation> situationList = pageList.getRecords();
|
||||
for (PayMeetingSituation meetingSituation : situationList) {
|
||||
Integer payMode = meetingSituation.getPayMode();
|
||||
|
||||
+5
-1
@@ -73,8 +73,12 @@ public class InternalMeetingSituationController extends JeroController<PayMeetin
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
|
||||
String particularYear = req.getParameter("particularYear");
|
||||
if (StringUtils.isNotBlank(particularYear)){
|
||||
queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
|
||||
}
|
||||
Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.page(page, queryWrapper);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.pageListContract(page, queryWrapper);
|
||||
List<PayMeetingSituation> situationList = pageList.getRecords();
|
||||
for (PayMeetingSituation meetingSituation : situationList) {
|
||||
Integer payMode = meetingSituation.getPayMode();
|
||||
|
||||
+5
-1
@@ -73,8 +73,12 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
|
||||
String particularYear = req.getParameter("particularYear");
|
||||
if (StringUtils.isNotBlank(particularYear)){
|
||||
queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
|
||||
}
|
||||
Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.page(page, queryWrapper);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.pageListContract(page, queryWrapper);
|
||||
List<PayMeetingSituation> situationList = pageList.getRecords();
|
||||
for (PayMeetingSituation meetingSituation : situationList) {
|
||||
Integer payMode = meetingSituation.getPayMode();
|
||||
|
||||
+5
-1
@@ -74,8 +74,12 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
|
||||
String particularYear = req.getParameter("particularYear");
|
||||
if (StringUtils.isNotBlank(particularYear)){
|
||||
queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
|
||||
}
|
||||
Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.page(page, queryWrapper);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.pageListContract(page, queryWrapper);
|
||||
List<PayMeetingSituation> situationList = pageList.getRecords();
|
||||
for (PayMeetingSituation meetingSituation : situationList) {
|
||||
Integer payMode = meetingSituation.getPayMode();
|
||||
|
||||
+5
-1
@@ -73,8 +73,12 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
|
||||
String particularYear = req.getParameter("particularYear");
|
||||
if (StringUtils.isNotBlank(particularYear)){
|
||||
queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
|
||||
}
|
||||
Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.page(page, queryWrapper);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.pageListContract(page, queryWrapper);
|
||||
List<PayMeetingSituation> situationList = pageList.getRecords();
|
||||
for (PayMeetingSituation meetingSituation : situationList) {
|
||||
Integer payMode = meetingSituation.getPayMode();
|
||||
|
||||
+5
-1
@@ -73,8 +73,12 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap());
|
||||
String particularYear = req.getParameter("particularYear");
|
||||
if (StringUtils.isNotBlank(particularYear)){
|
||||
queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear);
|
||||
}
|
||||
Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.page(page, queryWrapper);
|
||||
IPage<PayMeetingSituation> pageList = payMeetingSituationService.pageListContract(page, queryWrapper);
|
||||
List<PayMeetingSituation> situationList = pageList.getRecords();
|
||||
for (PayMeetingSituation meetingSituation : situationList) {
|
||||
Integer payMode = meetingSituation.getPayMode();
|
||||
|
||||
+7
@@ -1,6 +1,9 @@
|
||||
package com.jero.meeting.mapper;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
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.vo.MeetingSituationContractVO;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
@@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
public interface PayMeetingSituationMapper extends BaseMapper<PayMeetingSituation> {
|
||||
|
||||
Page<MeetingSituationContractVO> contractPage(Page<MeetingSituationContractVO> page, @Param("param") MeetingSituationContractVO vo);
|
||||
|
||||
IPage<PayMeetingSituation> pageListContract(Page<PayMeetingSituation> page,
|
||||
@Param(Constants.WRAPPER) QueryWrapper<PayMeetingSituation> queryWrapper);
|
||||
|
||||
}
|
||||
|
||||
+7
@@ -151,4 +151,11 @@
|
||||
and pica.id is null
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="pageListContract" resultMap="PayMeetingSituationResultMap">
|
||||
select pms.*
|
||||
from pay_meeting_situation pms
|
||||
left JOIN pay_payment_record ppr ON ppr.project_id = pms.id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
+4
@@ -1,5 +1,7 @@
|
||||
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 com.jero.meeting.entity.PayMeetingSituation;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
@@ -70,4 +72,6 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
|
||||
PayMeetingSituation queryByMeetingIdAndContactId(String meetingId);
|
||||
|
||||
void editTerminal(PayMeetingSituationVO payMeetingSituationVO);
|
||||
|
||||
IPage<PayMeetingSituation> pageListContract(Page<PayMeetingSituation> page, QueryWrapper<PayMeetingSituation> queryWrapper);
|
||||
}
|
||||
|
||||
+7
@@ -6,6 +6,8 @@ import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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.common.ProjectCommon;
|
||||
import com.jero.common.dto.SendMessageDTO;
|
||||
@@ -660,6 +662,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
updateById(payMeetingSituation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<PayMeetingSituation> pageListContract(Page<PayMeetingSituation> page, QueryWrapper<PayMeetingSituation> queryWrapper) {
|
||||
return baseMapper.pageListContract(page,queryWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user