From 31bb31760bf748fe0492cb91c817205c598c4d02 Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Thu, 14 Oct 2021 09:56:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMailBillServiceImpl.java | 13 +++++++++---- .../impl/PayPaymentRecordServiceImpl.java | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 045d88e3..40c4e072 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -46,8 +46,11 @@ import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -96,6 +99,8 @@ public class PayMailBillServiceImpl extends ServiceImpl selectMailBillVO(String projectId) { @@ -131,7 +136,7 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList = payMailBill.getBmpList(); - //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额 + //校验不同项目是否属于同一个公司，开票金额是否大于当前欠未开票金额，企业名称是否审核 String res = checkCompanyProject(bmpList); if (!"success".equals(res)) { return Result.error(res); @@ -276,7 +281,7 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList) { String standardCompanyId = null;//基准公司id @@ -398,8 +403,8 @@ public class PayMailBillServiceImpl extends ServiceImpl mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate){ + + //如果前端传来模糊查询的字段有%，就替换掉它 + if(!StringUtils.isBlank(payCommonProject.getChargeProject())){ + payCommonProject.setChargeProject(oConvertUtils.replaceAllPercent(payCommonProject.getChargeProject())); + } + if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){ + payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName())); + } return payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate); } @@ -499,6 +508,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl clazz, String title) { // Step.2 获取导出数据 + //如果前端传来模糊查询的字段有%，就替换掉它 + if(!StringUtils.isBlank(payCommonProject.getChargeProject())){ + payCommonProject.setChargeProject(oConvertUtils.replaceAllPercent(payCommonProject.getChargeProject())); + } + if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){ + payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName())); + } List pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject, projectType,paymentDate); pageList.forEach(p-> { if (!Objects.isNull(p.getChargeUse())) { From 4039a61f7179a314233855c37f65a9442b22a91c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 14 Oct 2021 09:57:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0openId=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CompanyLoginController.java | 85 +++++++++++++++++-- .../company/entity/PayContactsManagement.java | 7 ++ .../modules/system/model/SysLoginModel.java | 2 + 3 files changed, 86 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index 34229c0c..ca5afc39 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -69,6 +69,7 @@ public class CompanyLoginController { Result result = new Result<>(); String phone = sysLoginModel.getUsername(); String password = sysLoginModel.getPassword(); + String openId = sysLoginModel.getOpenId(); String rsaPublicKey = sysLoginModel.getRsaPublicKey(); String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey)); //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题 @@ -95,6 +96,9 @@ public class CompanyLoginController { //解密获取密码和用户名 password = CommonUtils.decryptBtRsaPriKey(password, rsaPrivateKey); phone = CommonUtils.decryptBtRsaPriKey(phone, rsaPrivateKey); + if (StringUtils.isNotBlank(openId)){ + openId = CommonUtils.decryptBtRsaPriKey(openId, rsaPrivateKey); + } } catch (Exception e) { e.printStackTrace(); } @@ -145,8 +149,23 @@ public class CompanyLoginController { //update-begin--Author:wangshuai Date:20200714 for：登录日志没有记录人员 LoginUser loginUser = new LoginUser(); BeanUtils.copyProperties(contactsManagement, loginUser); - baseCommonService.addLog("用户名: " + phone + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser); + baseCommonService.addLog("手机号: " + phone + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser); //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 + //绑定微信openId + if (StringUtils.isNotBlank(openId)){ + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(PayContactsManagement::getOpenId, PasswordUtil.encrypt(openId)); + PayContactsManagement contactsManagement1 = payContactsManagementService.getOne(queryWrapper1); + //没有绑定过就绑定 + if (contactsManagement1 == null){ + contactsManagement.setOpenId(PasswordUtil.encrypt(openId)); + contactsManagement.setPhone(PasswordUtil.encrypt(phone)); + payContactsManagementService.updateById(contactsManagement); + //绑定过就判断是否是当前用户,如果不是就报错 + }else if (!Objects.equals(contactsManagement1.getPhone(),PasswordUtil.encrypt(phone))){ + throw new JeroBootException("微信已经绑定过其他账号"); + } + } return result; } @@ -155,16 +174,15 @@ public class CompanyLoginController { public Result smsLogin(@RequestBody SysLoginModel sysLoginModel) { Result result = new Result<>(); String phone = sysLoginModel.getUsername(); + String openId = sysLoginModel.getOpenId(); String rsaPublicKey = sysLoginModel.getRsaPublicKey(); String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey)); - //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题 - //前端密码加密，后端进行密码解密 - //password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密 - //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题 - //update-begin-author:taoyan date:20190828 for:校验验证码 try { - //解密获取密码和用户名 + //解密获取手机号和openId phone = CommonUtils.decryptBtRsaPriKey(phone, rsaPrivateKey); + if (StringUtils.isNotBlank(openId)){ + openId = CommonUtils.decryptBtRsaPriKey(openId, rsaPrivateKey); + } } catch (Exception e) { e.printStackTrace(); } @@ -196,14 +214,65 @@ public class CompanyLoginController { //update-begin--Author:wangshuai Date:20200714 for：登录日志没有记录人员 LoginUser loginUser = new LoginUser(); BeanUtils.copyProperties(contactsManagement, loginUser); - baseCommonService.addLog("用户名: " + phone + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser); + baseCommonService.addLog("手机号: " + phone + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser); //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 + //绑定微信openId + if (StringUtils.isNotBlank(openId)){ + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(PayContactsManagement::getOpenId, PasswordUtil.encrypt(openId)); + PayContactsManagement contactsManagement1 = payContactsManagementService.getOne(queryWrapper1); + //没有绑定过就绑定 + if (contactsManagement1 == null){ + contactsManagement.setOpenId(PasswordUtil.encrypt(openId)); + contactsManagement.setPhone(PasswordUtil.encrypt(phone)); + payContactsManagementService.updateById(contactsManagement); + //绑定过就判断是否是当前用户,如果不是就报错 + }else if (!Objects.equals(contactsManagement1.getPhone(),PasswordUtil.encrypt(phone))){ + throw new JeroBootException("微信已经绑定过其他账号"); + } + } + + //如果没有密码，返回 if (Objects.isNull(contactsManagement.getPassword())){ result.setMessage("updatePassword"); } return result; } + @ApiOperation("微信登录接口") + @PostMapping(value = "/WCLogin") + public Result WCLogin(@RequestBody SysLoginModel sysLoginModel) { + Result result = new Result<>(); + String openId = sysLoginModel.getOpenId(); + String rsaPublicKey = sysLoginModel.getRsaPublicKey(); + String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey)); + try { + //解密获取openId + if (StringUtils.isNotBlank(openId)){ + openId = CommonUtils.decryptBtRsaPriKey(openId, rsaPrivateKey); + } + } catch (Exception e) { + e.printStackTrace(); + } + + //1. 校验用户是否有效 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getOpenId, PasswordUtil.encrypt(openId)); + PayContactsManagement contactsManagement = payContactsManagementService.getOne(queryWrapper); + if (Objects.isNull(contactsManagement)) { + throw new JeroBootException("暂未授权"); + } + + //用户登录信息 + userInfo(contactsManagement, result); + //update-begin--Author:wangshuai Date:20200714 for：登录日志没有记录人员 + LoginUser loginUser = new LoginUser(); + BeanUtils.copyProperties(contactsManagement, loginUser); + baseCommonService.addLog("手机号: " + contactsManagement.getPhone() + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser); + //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 + return result; + } + /** * 退出登录 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index ab8841f1..724e323e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -121,6 +121,13 @@ public class PayContactsManagement implements Serializable { */ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private String salt; + + /** + * openId + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String openId; + /** * 审核状态（1：通过，2：待审核）财务人员添加企业不需要审核默认是通过状态 */ diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginModel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginModel.java index 293ae9b3..2f214208 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginModel.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysLoginModel.java @@ -27,4 +27,6 @@ public class SysLoginModel { private String checkKey; @ApiModelProperty(value = "RSA公钥") private String rsaPublicKey; + @ApiModelProperty(value = "openId") + private String openId; } \ No newline at end of file From 4373ba356e788cc31ca649eeb6108f3ad49c88a0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 14 Oct 2021 10:24:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20bug=2040541=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E7=A0=94=E8=AE=A8=E4=BC=9A--=E4=BC=9A=E8=AE=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85--=E7=94=A8=E6=9D=A5=E6=AC=BE=E5=B9=B4=E4=BB=BD?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommitteeMeetingSituationController.java | 6 +++++- .../controller/InternalMeetingSituationController.java | 6 +++++- .../controller/OtherMeetingSituationController.java | 6 +++++- .../meeting/controller/PayMeetingSituationController.java | 6 +++++- .../controller/StandardsMeetingSituationController.java | 6 +++++- .../controller/WorkGroupMeetingSituationController.java | 6 +++++- .../com/jero/meeting/mapper/PayMeetingSituationMapper.java | 7 +++++++ .../jero/meeting/mapper/xml/PayMeetingSituationMapper.xml | 7 +++++++ .../jero/meeting/service/IPayMeetingSituationService.java | 4 ++++ .../service/impl/PayMeetingSituationServiceImpl.java | 7 +++++++ 10 files changed, 55 insertions(+), 6 deletions(-) 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 b6dbefbb..9a4e4083 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 @@ -73,8 +73,12 @@ public class CommitteeMeetingSituationController extends JeroController 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 page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingSituationService.page(page, queryWrapper); + IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); 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 131bca5a..2ed3ea75 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 @@ -73,8 +73,12 @@ public class InternalMeetingSituationController extends JeroController 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 page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingSituationService.page(page, queryWrapper); + IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); 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 1b867682..27ebcef9 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 @@ -73,8 +73,12 @@ public class OtherMeetingSituationController extends JeroController 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 page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingSituationService.page(page, queryWrapper); + IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); 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 b9e93dff..a98cdb76 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 @@ -74,8 +74,12 @@ public class PayMeetingSituationController extends JeroController 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 page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingSituationService.page(page, queryWrapper); + IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); 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 3f0b3ccf..daf31a43 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 @@ -73,8 +73,12 @@ public class StandardsMeetingSituationController extends JeroController 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 page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingSituationService.page(page, queryWrapper); + IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); 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 56d60986..7f3941d7 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 @@ -73,8 +73,12 @@ public class WorkGroupMeetingSituationController extends JeroController 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 page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingSituationService.page(page, queryWrapper); + IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); 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 17dbade1..23984217 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 @@ -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 { Page contractPage(Page page, @Param("param") MeetingSituationContractVO vo); + + IPage pageListContract(Page page, + @Param(Constants.WRAPPER) QueryWrapper 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 8cc89771..c4b35aba 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 @@ -151,4 +151,11 @@ and pica.id is null + + \ No newline at end of file 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 4e487143..c394bb31 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 @@ -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 pageListContract(Page page, QueryWrapper queryWrapper); } 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 f83dc140..cf2e804d 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 @@ -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 pageListContract(Page page, QueryWrapper queryWrapper) { + return baseMapper.pageListContract(page,queryWrapper); + } + /** * 更新 */ From 7d6ce6fefa1ca262cb2f5ec831dade28905a4037 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 14 Oct 2021 10:27:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20bug=2040603=20=E5=88=86=E6=A0=87?= =?UTF-8?q?=E5=A7=94-=E4=BC=9A=E8=AE=AE=E7=BB=B4=E6=8A=A4-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=90=8E=EF=BC=8C=E5=88=97=E5=90=8D=E7=A7=B0=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/meeting/vo/excel/CommitteeMeetingExcel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeMeetingExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeMeetingExcel.java index 85c37cd6..3f1dc12f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeMeetingExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeMeetingExcel.java @@ -12,8 +12,8 @@ import java.math.BigDecimal; @Data public class CommitteeMeetingExcel { - /**分标委名称项目名称*/ - @Excel(name = "分标委名称项目名称", width = 15) + /**分标委名称*/ + @Excel(name = "分标委名称", width = 15) private String caseCommitteeName; /**会议名称*/