From e224d8a24c90f10b388b5afc18717928b2c794b5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 26 Oct 2021 17:43:59 +0800 Subject: [PATCH 01/28] =?UTF-8?q?fix=20bug=2041435=20=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF--=E5=88=86=E6=A0=87=E5=A7=94=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BC=9A=E8=AE=AE--=E6=94=B6=E5=88=B0=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=98=AF=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8A=A5=E5=90=8D=E5=B7=B2=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/SendMessageServiceImpl.java | 6 ++++-- .../controller/CommitteeMeetingController.java | 3 ++- .../meeting/controller/PayMeetingController.java | 12 ------------ .../controller/WorkGroupMeetingController.java | 3 ++- .../com/jero/meeting/service/IPayMeetingService.java | 4 ++-- .../meeting/service/impl/PayMeetingServiceImpl.java | 6 +++--- 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 1132f415..931c7d32 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -77,12 +77,14 @@ public class SendMessageServiceImpl implements SendMessageService { if(!Objects.isNull(map)) { // 替换企业端系统url与小程序名称 // todo 替换系统地址，小程序名称 - if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) + if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode()) + ||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) - || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG13.getCode())){ map.put("systemAddress",env.getProperty("message.systemUrl")); map.put("wxName",env.getProperty("message.wxName")); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index e5234433..18afad05 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -9,6 +9,7 @@ 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.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; @@ -331,7 +332,7 @@ public class CommitteeMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); + payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13"); return Result.OK(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 790c0d03..c0426799 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -426,18 +426,6 @@ public class PayMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); - return Result.OK(); - } - @ApiOperation(value = "生成base64") @GetMapping(value = "/createBase64") @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index d04c169d..e59941c0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -9,6 +9,7 @@ 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.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; @@ -332,7 +333,7 @@ public class WorkGroupMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); + payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1,"C_OPEN_TYPE1"); return Result.OK(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 6f2abb5c..9b05b720 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -3,6 +3,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.common.enums.CompanyMessageEnums; import com.jero.meeting.entity.PayMeeting; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.meeting.vo.PayMeetingVO; @@ -61,9 +62,8 @@ public interface IPayMeetingService extends IService { * @param publishReminderVO * @author lijiarao * @date 2021/9/27 - * @return void */ - void publishReminder(PublishReminderVO publishReminderVO); + void publishReminder(PublishReminderVO publishReminderVO, CompanyMessageEnums companyMessageEnums, String busType); IPage pageListContract(Page page, QueryWrapper queryWrapper, String now); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index bca796ec..778bd0e3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -441,7 +441,7 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingIds = publishReminderVO.getMeetingIds(); List subitemIds = publishReminderVO.getSubitemIds(); Integer projectType = publishReminderVO.getProjectType(); @@ -532,9 +532,9 @@ public class PayMeetingServiceImpl extends ServiceImpl Date: Tue, 26 Oct 2021 18:02:29 +0800 Subject: [PATCH 02/28] =?UTF-8?q?fix=20bug=2041442=20=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF--=E6=B0=B4=E5=B9=B3=E8=B6=8A=E6=9D=83--=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=B4=BB=E5=8A=A8--=E6=88=91=E7=9A=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E5=8F=AF=E6=8A=A5=E5=90=8D--=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=8E=A5=E5=8F=A3=E6=9C=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingSituationServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 ed4ff19f..7d22d84a 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 @@ -674,7 +674,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Tue, 26 Oct 2021 18:50:54 +0800 Subject: [PATCH 03/28] =?UTF-8?q?fix=20bug=2041393=2041379=20=E6=A0=87?= =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E8=AE=AE=E5=88=A0=E9=99=A4=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/util/AuthenticationUtils.java | 20 ++++++++- .../controller/PayMeetingController.java | 45 ++++++++++--------- .../StandardsMeetingController.java | 27 +++++++++++ .../service/impl/PayMeetingServiceImpl.java | 10 ----- 4 files changed, 69 insertions(+), 33 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java index e7ef8bbd..d0ac3e59 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java @@ -96,8 +96,9 @@ public class AuthenticationUtils { public static void checkResult(String response) { JSONObject jsonObject = JSONObject.parseObject(response); String code = jsonObject.getString("code"); + String message = jsonObject.getString("message"); if (!"200".equals(code)){ - throw new JeroBootException("数据同步失败！"); + throw new JeroBootException("数据同步失败！"+message); } } @@ -136,4 +137,21 @@ public class AuthenticationUtils { String post = HttpUtil.post(urlBuilder.toString(), paramMap); checkResult(post); } + + /** + * 调用会员系统get接口 + * @param methodName + */ + public static void get(String methodName, HashMap paramMap) { + Map stringStringMap = encryptByRsaPriKey(); + paramMap.put("pushToken", stringStringMap.get("token")); + paramMap.put("publicKey", stringStringMap.get("publicKey")); + //拼接url路径 + StringBuilder urlBuilder = new StringBuilder(AuthenticationUtils.URL); + urlBuilder.append(methodName); + urlBuilder.append("?"); + paramMap.forEach((k,v) -> urlBuilder.append(k).append("=").append(v).append("&")); + String get = HttpUtil.get(urlBuilder.toString()); + checkResult(get); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index c0426799..9c464a52 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -246,29 +246,30 @@ public class PayMeetingController extends JeroController delete(@RequestParam(name = "id") String id) { - payMeetingService.deleteById(id); - return Result.OK("删除成功!"); - } + ///** + // * 通过id删除 + //@RequiresPermissions("meeting:delete") + //@AutoLog(value = "会议管理-通过id删除") + //@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除") + //@GetMapping(value = "/delete") + //public Result delete(@RequestParam(name = "id") String id) { + // payMeetingService.deleteById(id); + // return Result.OK("删除成功!"); + //}*/ - /** - * 批量删除 - */ - @RequiresPermissions("meeting:batchDel") - @AutoLog(value = "会议管理-批量删除") - @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除") - @GetMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids") String ids) { - this.payMeetingService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } + + + ///** + // * 批量删除 + // */ + //@RequiresPermissions("meeting:batchDel") + //@AutoLog(value = "会议管理-批量删除") + //@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除") + //@GetMapping(value = "/deleteBatch") + //public Result deleteBatch(@RequestParam(name = "ids") String ids) { + // this.payMeetingService.deleteByIds(Arrays.asList(ids.split(","))); + // return Result.OK("批量删除成功!"); + //} /** * 通过id查询 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index c53b140e..a1720918 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -45,6 +45,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -145,8 +146,21 @@ public class StandardsMeetingController extends JeroController delete(@RequestParam(name = "id") String id) { extracted(id); + payMeetingService.deleteById(id); + HashMap paramMap = new HashMap<>(); + paramMap.put("id",id); + AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteIncome",paramMap); + return Result.OK("删除成功!"); + } + + /** + * 会员系统删除会议 + */ + @GetMapping(value = "/deleteStandard") + public Result deleteStandard(@RequestParam(name = "id") String id) { payMeetingService.deleteById(id); return Result.OK("删除成功!"); } @@ -158,12 +172,25 @@ public class StandardsMeetingController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { List idList = Arrays.asList(ids.split(",")); for (String id : idList) { extracted(id); } this.payMeetingService.deleteByIds(idList); + HashMap paramMap = new HashMap<>(); + paramMap.put("ids",ids); + AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteBatchIncome",paramMap); + return Result.OK("批量删除成功!"); + } + + /** + * 会员系统删除会议 + */ + @GetMapping(value = "/deleteBatchStandard") + public Result deleteBatchStandard(@RequestParam(name = "ids") String ids) { + this.payMeetingService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 778bd0e3..f0c68529 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -385,10 +385,6 @@ public class PayMeetingServiceImpl extends ServiceImpl 0) { throw new JeroBootException("该会议有参会人无法删除"); } - PayMeeting payMeeting = getById(id); - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - stableCrossTrainingService.delete(id); - } removeById(id); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayMeetingHotelContacts::getMeetingId, id); @@ -411,12 +407,6 @@ public class PayMeetingServiceImpl extends ServiceImpl 0) { throw new JeroBootException(meetingList + "会议下有参会人，无法删除"); } - for (String id : ids) { - PayMeeting payMeeting = getById(id); - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - stableCrossTrainingService.delete(id); - } - } removeByIds(ids); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(PayMeetingHotelContacts::getMeetingId, ids); From 002d61c5f0ff11fb3e112c18ab2a7aca3325e07f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 27 Oct 2021 09:12:04 +0800 Subject: [PATCH 04/28] =?UTF-8?q?fix=20=E5=8D=87=E7=BA=A7tomcat=E4=B8=BA?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC9.0.54?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9cc21e7f..efd3a5be 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 1.3.4 1.6.1 7.4.0 - 9.0.48 + 9.0.54 From 6b6c910ecf5dd410e6d6bc58a77af97371653cd5 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 27 Oct 2021 09:14:36 +0800 Subject: [PATCH 05/28] fixbug:41485,41439 --- .../PayContactsManagementController.java | 27 ++++++++++++------- .../entity/PayMemberProjectSubitem.java | 4 +-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 0a7f16f4..41f96251 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -17,6 +17,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; @@ -42,6 +43,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -634,17 +636,22 @@ public class PayContactsManagementController extends JeroController queryByIdMeeting(@RequestParam(name="id") String id) { - PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); - if(payContactsManagement == null) { - return Result.error("未找到对应数据"); + LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(sysUser.getId().equals(id)) { + PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); + if (payContactsManagement == null) { + return Result.error("未找到对应数据"); + } + if (!StringUtils.isBlank(payContactsManagement.getPhone())) { + payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); + } + if (!StringUtils.isBlank(payContactsManagement.getEmail())) { + payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); + } + return Result.OK(payContactsManagement); + }else { + return Result.OK("权限异常"); } - if (!StringUtils.isBlank(payContactsManagement.getPhone())){ - payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); - } - if (!StringUtils.isBlank(payContactsManagement.getEmail())){ - payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); - } - return Result.OK(payContactsManagement); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 49d8ae02..edcac9ee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -115,7 +115,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 企业联系人临时id */ - @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2") + @Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2") private String companyContactTemporaryId; /** @@ -134,7 +134,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 邮寄联系人临时id */ - @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3") + @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3") private String postContactTemporaryId; /** From 8764d9ef97368ff4cc873b2c3c9842d00bec48b7 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 27 Oct 2021 11:59:43 +0800 Subject: [PATCH 06/28] =?UTF-8?q?fix=20bug=2040291=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E5=AF=BC=E5=85=A5=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDepartController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 9a619e85..efcaf10e 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -404,7 +404,7 @@ public class SysDepartController { //导入Excel格式校验，看匹配的字段文本概率 Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysDepartExcel.class, params,1.0); if(!t){ - return Result.error("文件格式有误,请下载模板后上传 ！"); + return Result.error("文件格式有误！"); } try { // orgCode编码长度 From 2d1d3623a8bd7244a3d8903916941b49ae63ea8f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 27 Oct 2021 16:14:57 +0800 Subject: [PATCH 07/28] =?UTF-8?q?fix=20bug=20=E4=BF=AE=E6=94=B9=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/util/ValidUtil.java | 16 +++++ .../impl/PayMeetingSituationServiceImpl.java | 2 +- .../PayMemberProjectSubitemController.java | 42 ++++++------- ...PayPayMemberProjectSubitemServiceImpl.java | 60 +++++++++++-------- .../vo/PayMemberProjectSubitemExcel.java | 10 ++-- .../controller/SysDepartController.java | 2 +- .../system/controller/SysUserController.java | 2 +- 7 files changed, 82 insertions(+), 52 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java index 6dd11713..b8fae457 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java @@ -66,6 +66,22 @@ public class ValidUtil { return list; } + /** + * 手动校验@Vaild并抛出异常信息list + * + * @param object 待校验对象 + * @param groups 待校验的组 + * @return errorList + */ + public static List validateReturnListWithNum(Object object, int errorRowNum, Class... groups){ + List list = new ArrayList<>(); + Set> set = validator.validate(object, groups); + for (ConstraintViolation constraintViolation : set) { + list.add("第" + errorRowNum + "行："+constraintViolation.getMessage()); + } + return list; + } + /** * @Description 校验全部数据格式 * @Author lqt 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 7d22d84a..a1a6bf28 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 @@ -870,7 +870,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl errorMessage = new ArrayList<>(); + //来款方式 + List paymentType = sysBaseAPI.queryDictItemsByCode("payment_type"); + Map paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); + //需要发票 + List invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type"); + Map invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); for (Object obj : excelData) { errorRowNum += 1; //复制属性 PayMemberProjectSubitemExcel projectSubitemExcel = (PayMemberProjectSubitemExcel) obj; projectSubitemExcel.setProjectId(projectId); PayMemberProjectSubitem projectSubitem = new PayMemberProjectSubitem(); - + errorMessage.addAll(ValidUtil.validateReturnListWithNum(projectSubitemExcel,errorRowNum)); //应收金额 String amountReceivable = projectSubitemExcel.getAmountReceivable(); - if (!NumberUtil.isNumber(amountReceivable)) { - errorMessage.add("第" + errorRowNum + "行：应收金额格式错误"); - } else { + if (errorMessage.isEmpty()) { projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable)); } //来款方式 - List paymentType = sysBaseAPI.queryDictItemsByCode("payment_type"); - Map paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); String paymentMethod = projectSubitemExcel.getPaymentMethod(); - if (StringUtils.isBlank(paymentMethod)){ - errorMessage.add("第" + errorRowNum + "行：来款方式不能为空"); - }else if (paymentTypeMap.containsKey(paymentMethod)) { - projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod))); - } else { - errorMessage.add("第" + errorRowNum + "行：来款方式不符合规范"); + if (errorMessage.isEmpty()) { + if (paymentTypeMap.containsKey(paymentMethod)) { + projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod))); + } else { + errorMessage.add("第" + errorRowNum + "行：来款方式格式错误"); + } } //需要发票 - List invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type"); - Map invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue)); String needInvoice = projectSubitemExcel.getNeedInvoice(); - if (StringUtils.isBlank(needInvoice)){ - errorMessage.add("第" + errorRowNum + "行：需要发票不能为空"); - }else if (invoiceTypeMap.containsKey(needInvoice)) { - projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice))); - } else { - errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范"); + if (errorMessage.isEmpty()) { + if (invoiceTypeMap.containsKey(needInvoice)) { + projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice))); + } else { + errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范"); + } } //复制属性 BeanUtils.copyProperties(projectSubitemExcel, projectSubitem); try { - ValidUtil.validate(projectSubitem); + //ValidUtil.validate(projectSubitem); memberProjectSubitemService.add(projectSubitem); } catch (JeroBootException e) { errorMessage.add("第" + errorRowNum + "行：" + e.getMessage()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index 279029cf..1c831d2b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -29,14 +29,12 @@ import com.jero.member.service.IPayMemberProjectService; import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.valid.group.ChargeNotice; import com.jero.valid.group.Contract; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Objects; +import java.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; @@ -212,38 +210,52 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl errors = new ArrayList<>(); // 企业 - PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId()); - if(Objects.isNull(chargeCompanyName)){ - throw new JeroBootException("企业名称为空！"); + try { + PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId()); + if (Objects.isNull(chargeCompanyName)) { + throw new JeroBootException("企业名称为空！"); + } + payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId()); + payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName()); + } catch (JeroBootException e) { + errors.add("会员单位不存在"); } - payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId()); - payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName()); - // 联系人 - PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId()); - if(Objects.isNull(contactsName)){ - throw new JeroBootException("联系人名称为空！"); + try { + PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId()); + if (Objects.isNull(contactsName)) { + throw new JeroBootException("联系人名称为空！"); + } + payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId()); + payMemberProjectSubitem.setCompanyContactName(contactsName.getName()); + } catch (JeroBootException e) { + errors.add("企业联系人不存在"); } - payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId()); - payMemberProjectSubitem.setCompanyContactName(contactsName.getName()); - - // 联系人 - PayContactsManagementTemporary postContactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId()); - if(Objects.isNull(postContactsName)){ - throw new JeroBootException("邮寄联系人为空！"); + try { + // 联系人 + PayContactsManagementTemporary postContactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId()); + if (Objects.isNull(postContactsName)) { + throw new JeroBootException("邮寄联系人为空！"); + } + payMemberProjectSubitem.setPostContactTemporaryId(postContactsName.getId()); + payMemberProjectSubitem.setPostContactName(postContactsName.getName()); + } catch (JeroBootException e) { + errors.add("邮寄联系人不存在"); } - payMemberProjectSubitem.setPostContactTemporaryId(postContactsName.getId()); - payMemberProjectSubitem.setPostContactName(postContactsName.getName()); + if (!errors.isEmpty()) { + throw new JeroBootException(StringUtils.join(errors, "，")); + } //校验来款方式 Integer paymentMethod = payMemberProjectSubitem.getPaymentMethod(); //合同 - if (Objects.equals(paymentMethod,2)){ + if (Objects.equals(paymentMethod, 2)) { ValidUtil.validate(payMemberProjectSubitem, Contract.class); } //收费通知 - if (Objects.equals(paymentMethod,3)){ + if (Objects.equals(paymentMethod, 3)) { ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java index 9344a050..5f4a9f69 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java @@ -40,7 +40,7 @@ public class PayMemberProjectSubitemExcel { /** * 企业联系人id */ - @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "2") + @Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "2") @ApiModelProperty(value = "企业联系人id") @NotBlank(message = "企业联系人不能为空") @Size(max = 50, message = "企业联系人最大为50字符") @@ -49,7 +49,7 @@ public class PayMemberProjectSubitemExcel { /** * 邮寄联系人id */ - @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "3") + @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "3") @ApiModelProperty(value = "邮寄联系人id") @NotBlank(message = "邮寄联系人不能为空") private String postContactId; @@ -59,8 +59,8 @@ public class PayMemberProjectSubitemExcel { */ @Excel(name = "应收金额", width = 15,orderNum = "4") @ApiModelProperty(value = "应收金额") - @NotNull(message = "应收金额不能为空") - @DecimalMax(value = "9999999999.99", message = "应收金额格式错误") + @NotBlank(message = "应收金额不能为空") + @Pattern(regexp = "^[0-9]{1,10}(\\.[0-9]{1,2})?$",message = "应收金额格式错误") private String amountReceivable; @@ -69,6 +69,7 @@ public class PayMemberProjectSubitemExcel { */ @Excel(name = "来款方式", width = 15, orderNum = "7") @ApiModelProperty(value = "来款方式(2:合同，3:收费通知)") + @NotBlank(message = "来款方式不能为空") private String paymentMethod; /** @@ -109,6 +110,7 @@ public class PayMemberProjectSubitemExcel { */ @Excel(name = "需要发票", width = 15, orderNum = "6") @ApiModelProperty(value = "需要发票") + @NotBlank(message = "需要发票不能为空") private String needInvoice; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index efcaf10e..7e7a03e5 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -443,7 +443,7 @@ public class SysDepartController { try { List errorList = ValidUtil.validateReturnList(sysDepart); if (!errorList.isEmpty()){ - errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.strip(errorList.toString(),"[]")); + errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，")); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDepart::getDepartName,sysDepart.getDepartName()); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index af22bd65..610173ef 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -773,7 +773,7 @@ public class SysUserController { List errorList = ValidUtil.validateReturnList(sysUser); if (!errorList.isEmpty()){ errorLines++; - errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.strip(errorList.toString(),"[]")); + errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，")); } //处理邮箱和手机号的加密 UserUtil.encryptUser(sysUser); From e9eb5dba8eb68718536db99e7b5e83cbe4a0c946 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 27 Oct 2021 16:26:30 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayContactsManagementController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 41f96251..f5daf185 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -637,7 +637,7 @@ public class PayContactsManagementController extends JeroController queryByIdMeeting(@RequestParam(name="id") String id) { LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(sysUser.getId().equals(id)) { +// if(sysUser.getId().equals(id)) { PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); if (payContactsManagement == null) { return Result.error("未找到对应数据"); @@ -649,9 +649,9 @@ public class PayContactsManagementController extends JeroController Date: Wed, 27 Oct 2021 17:04:37 +0800 Subject: [PATCH 09/28] =?UTF-8?q?fixbug=EF=BC=9A=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF=E8=81=94=E7=B3=BB=E4=BA=BA=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayContactsManagementController.java | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index f5daf185..2eceecb9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -636,8 +636,6 @@ public class PayContactsManagementController extends JeroController queryByIdMeeting(@RequestParam(name="id") String id) { - LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); -// if(sysUser.getId().equals(id)) { PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); if (payContactsManagement == null) { return Result.error("未找到对应数据"); @@ -649,9 +647,34 @@ public class PayContactsManagementController extends JeroController queryByIdGetContract(@RequestParam(name="id") String id) { + LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(sysUser.getId().equals(id)) { + PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); + if (payContactsManagement == null) { + return Result.error("未找到对应数据"); + } + if (!StringUtils.isBlank(payContactsManagement.getPhone())) { + payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); + } + if (!StringUtils.isBlank(payContactsManagement.getEmail())) { + payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); + } + return Result.OK(payContactsManagement); + }else{ + return Result.OK("权限异常"); + } } /** From 7ad01a43456c8196b08729a8a0b82cb1c37b8217 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 27 Oct 2021 17:13:54 +0800 Subject: [PATCH 10/28] =?UTF-8?q?fixbug=EF=BC=9A=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF=E8=81=94=E7=B3=BB=E4=BA=BA=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayContactsManagementController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 2eceecb9..f6847f8a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -634,8 +634,8 @@ public class PayContactsManagementController extends JeroController queryByIdMeeting(@RequestParam(name="id") String id) { + @GetMapping(value = "/queryByIdGetContract") + public Result queryByIdGetContract(@RequestParam(name="id") String id) { PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); if (payContactsManagement == null) { return Result.error("未找到对应数据"); @@ -657,8 +657,8 @@ public class PayContactsManagementController extends JeroController queryByIdGetContract(@RequestParam(name="id") String id) { + @GetMapping(value = "/queryByIdMeeting") + public Result queryByIdMeeting(@RequestParam(name="id") String id) { LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); if(sysUser.getId().equals(id)) { PayContactsManagement payContactsManagement = payContactsManagementService.getById(id); From 1c1f3d0acac14d29fb05c9b7119716b7a5828b5b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 27 Oct 2021 17:41:18 +0800 Subject: [PATCH 11/28] =?UTF-8?q?fix=20=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/mapper/SysUserRoleMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserRoleMapper.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserRoleMapper.java index 91e0e272..a99328a9 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserRoleMapper.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserRoleMapper.java @@ -16,10 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SysUserRoleMapper extends BaseMapper { - @Select("select role_code from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username}))") + @Select("select role_code from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username} and del_flag = 0))") List getRoleByUserName(@Param("username") String username); - @Select("select id from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username}))") + @Select("select id from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username} and del_flag = 0))") List getRoleIdByUserName(@Param("username") String username); } From b489ebb49d94997be5eede98e3dd9d5d8d9948f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 27 Oct 2021 18:22:52 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayContactsManagementController.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index f6847f8a..9a20613a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -724,6 +724,44 @@ public class PayContactsManagementController extends JeroController queryWXByCompany(@RequestParam(name="companyId") String companyId, + @RequestParam(name="name",required = false) String name, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + if(!StringUtils.isBlank(name)){ + name = oConvertUtils.replaceAllPercent(name); + } + Page page = new Page<>(pageNo, pageSize); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getCompanyId,companyId); + queryWrapper.eq(PayContactsManagement::getName,name); + if(!StringUtils.isEmpty(name)){ + queryWrapper.like(PayContactsManagement::getName,name); + } + IPage listPayContactsManagement = payContactsManagementService.page(page,queryWrapper); + if(!CollectionUtils.isEmpty(listPayContactsManagement.getRecords())){ + List list = listPayContactsManagement.getRecords(); + list.forEach(p->{ + if(!StringUtils.isBlank(p.getPhone())){ + p.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + if(!StringUtils.isBlank(p.getEmail())){ + p.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + }); + listPayContactsManagement.setRecords(list); + } + return Result.OK(listPayContactsManagement); + } + /** * 通过企业id查询用户 * From 3a245288f914aaee62703bb2deeacc94786650fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 27 Oct 2021 18:32:19 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41556?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayIncomeContractController.java | 5 +++++ .../controller/PaySpendingContractController.java | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index c661872d..06c8db93 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -551,6 +551,10 @@ public class PayIncomeContractController extends JeroController pageList = payIncomeContractService.queryList( payIncomeContract,chargeStatus,projectName,startTime,endTime); List exportList = null; @@ -562,6 +566,7 @@ public class PayIncomeContractController extends JeroController> list = new ArrayList<>(); // excel字段长度 Map mapCount = new HashMap<>(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index e6b91b42..3a83699e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -3,15 +3,12 @@ package com.jero.contract.controller; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; - import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson.JSON; 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.api.vo.Result; @@ -20,11 +17,9 @@ import com.jero.common.common.RoleCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oConvertUtils; -import com.jero.contract.common.PayIncomeContractCommon; import com.jero.contract.entity.*; import com.jero.contract.service.IPaySpendingContractInstallmentService; import com.jero.contract.service.IPaySpendingContractService; @@ -39,9 +34,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; import org.jeecgframework.poi.excel.view.JeecgMapExcelView; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; @@ -261,8 +254,11 @@ public class PaySpendingContractController extends JeroController pageList = paySpendingContractService.queryList( paySpendingContract.getContractNum(), + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){ + paySpendingContract.setPrincipalId(sysUser.getId()); + } + List pageList = paySpendingContractService.queryList(paySpendingContract.getPrincipalId(), paySpendingContract.getContractNum(), paySpendingContract.getContractName(),startTime,endTime); List exportList = null; From e239b4d3cce7c075ad36c50f2ae37a5b7252296a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 27 Oct 2021 18:32:50 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41556?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/contract/mapper/PaySpendingContractMapper.java | 2 +- .../com/jero/contract/mapper/xml/PayIncomeContractMapper.xml | 3 +++ .../jero/contract/mapper/xml/PaySpendingContractMapper.xml | 3 +++ .../jero/contract/service/IPaySpendingContractService.java | 2 +- .../contract/service/impl/PaySpendingContractServiceImpl.java | 4 ++-- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java index d5d2244c..c2f06047 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java @@ -36,7 +36,7 @@ public interface PaySpendingContractMapper extends BaseMapper queryList(@Param("contractNum") String contractNum, + List queryList(@Param("principalId") String principalId, @Param("contractNum") String contractNum, @Param("contractName") String contractName,@Param("startTime") String startTime, @Param("endTime") String endTime); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 2e9272cb..521bdff2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -295,6 +295,9 @@ AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%')) + + AND aa.principalId = #{payIncomeContract.principalId} + ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml index a8085638..e6e3c365 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -109,6 +109,9 @@ AND DATE_FORMAT(create_time,'%Y-%m-%d') <= #{endTime} + + AND principal_id = #{principalId} + ORDER BY chargeStatus desc,create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java index dec52bb5..3c1acc02 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java @@ -79,5 +79,5 @@ public interface IPaySpendingContractService extends IService queryList(String contractNum,String contractName,String startTime,String endTime); + List queryList(String principalId, String contractNum,String contractName,String startTime,String endTime); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index c421eff5..9b99b4c8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -520,8 +520,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl queryList(String contractNum, String contractName, String startTime, String endTime) { - return paySpendingContractMapper.queryList( contractNum, contractName, startTime, endTime); + public List queryList(String principalId,String contractNum, String contractName, String startTime, String endTime) { + return paySpendingContractMapper.queryList(principalId, contractNum, contractName, startTime, endTime); } From b8b1d30dae39efc9e00032173c24236ec0873c83 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 27 Oct 2021 18:49:16 +0800 Subject: [PATCH 15/28] =?UTF-8?q?fix=20=E5=88=86=E6=A0=87=E5=A7=94?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=8F=82=E4=BC=9A=E4=BA=BA=E6=B0=B4=E5=B9=B3?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingSituationController.java | 57 ++++++++++++++++--- .../mapper/xml/PayMeetingSituationMapper.xml | 1 + .../service/IPayMeetingSituationService.java | 3 + .../impl/PayMeetingSituationServiceImpl.java | 26 ++++++++- 4 files changed, 77 insertions(+), 10 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 9a4e4083..3fd89d39 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 @@ -8,8 +8,10 @@ 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.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; @@ -19,7 +21,9 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingCommon; +import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.*; import com.jero.meeting.vo.excel.*; @@ -28,6 +32,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; @@ -56,11 +61,15 @@ 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); + if (StringUtils.isNotBlank(particularYear)) { + queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )", particularYear); } + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("committeeMeetingSituation:search")) { + queryWrapper.eq("pm.director_id", loginUser.getId()); + } + queryWrapper.eq("pm.meeting_type",MEETING_TYPE); Page page = new Page<>(pageNo, pageSize); IPage pageList = payMeetingSituationService.pageListContract(page, queryWrapper); List situationList = pageList.getRecords(); for (PayMeetingSituation meetingSituation : situationList) { Integer payMode = meetingSituation.getPayMode(); //汇款并且缴费凭证为空 - if (Objects.equals(payMode,1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())){ + if (Objects.equals(payMode, 1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())) { meetingSituation.setIdentification(PayProjectCommon.YES); - }else { + } else { meetingSituation.setIdentification(PayProjectCommon.NO); } } @@ -100,6 +118,11 @@ public class CommitteeMeetingSituationController extends JeroController add(@RequestBody PayMeetingSituation payMeetingSituation) { + String meetingId = payMeetingSituation.getMeetingId(); + PayMeeting payMeeting = meetingService.getById(meetingId); + if (!Objects.equals(payMeeting.getMeetingType(),MEETING_TYPE)){ + throw new JeroBootException("数据权限不足"); + } payMeetingSituationService.add(payMeetingSituation); return Result.OK("添加成功！"); } @@ -124,6 +147,7 @@ public class CommitteeMeetingSituationController extends JeroController edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) { + payMeetingSituationService.checkCan(payMeetingSituationVO.getId(),MEETING_TYPE); payMeetingSituationService.editById(payMeetingSituationVO); return Result.OK("编辑成功!"); } @@ -136,6 +160,7 @@ public class CommitteeMeetingSituationController extends JeroController delete(@RequestParam(name = "id") String id) { + payMeetingSituationService.checkCan(id,MEETING_TYPE); payMeetingSituationService.deleteById(id); return Result.OK("删除成功!"); } @@ -148,7 +173,11 @@ public class CommitteeMeetingSituationController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { - this.payMeetingSituationService.deleteByIds(Arrays.asList(ids.split(","))); + List stringList = Arrays.asList(ids.split(",")); + for (String id : stringList) { + payMeetingSituationService.checkCan(id,MEETING_TYPE); + } + this.payMeetingSituationService.deleteByIds(stringList); return Result.OK("批量删除成功!"); } @@ -160,6 +189,7 @@ public class CommitteeMeetingSituationController extends JeroController queryById(@RequestParam(name = "id") String id) { + payMeetingSituationService.checkCan(id,MEETING_TYPE); PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryById(id); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); @@ -188,6 +218,11 @@ public class CommitteeMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); List pageList = payMeetingSituationService.list(queryWrapper); // 过滤选中数据 @@ -277,6 +312,10 @@ public class CommitteeMeetingSituationController extends JeroController addDock(@RequestBody AddDockVO addDockVO) { + List meetingSituationIds = addDockVO.getMeetingSituationIds(); + for (String id : meetingSituationIds) { + payMeetingSituationService.checkCan(id,MEETING_TYPE); + } payMeetingSituationService.addDock(addDockVO); return Result.OK("设置对接人成功!"); } @@ -289,6 +328,7 @@ public class CommitteeMeetingSituationController extends JeroController check(@RequestBody CheckVO checkVO) { + payMeetingSituationService.checkCan(checkVO.getId(),MEETING_TYPE); payMeetingSituationService.check(checkVO); return Result.OK("审核成功!"); } @@ -301,6 +341,7 @@ public class CommitteeMeetingSituationController extends JeroController checkRegister(@RequestBody CheckVO checkVO) { + payMeetingSituationService.checkCan(checkVO.getId(),MEETING_TYPE); payMeetingSituationService.checkRegister(checkVO); return Result.OK("审核成功!"); } @@ -316,6 +357,4 @@ public class CommitteeMeetingSituationController extends JeroController select distinct pms.* 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} 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 423fadb8..5d437106 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 @@ -4,6 +4,7 @@ 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.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.meeting.vo.*; @@ -77,4 +78,6 @@ public interface IPayMeetingSituationService extends IService pageListContract(Page page, QueryWrapper queryWrapper); + + void checkCan(String situationId, Integer meetingCommon); } 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 a1a6bf28..410a11ad 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 @@ -15,6 +15,7 @@ import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; import com.jero.common.service.SendMessageService; import com.jero.common.service.ContractCreateProjectSendMessageService; import com.jero.common.system.api.ISysBaseAPI; @@ -113,6 +114,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl meetingSituationIds = addDockVO.getMeetingSituationIds(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String sysUserId = sysUser.getId(); for (String meetingSituationId : meetingSituationIds) { PayMeetingSituation payMeetingSituation = getById(meetingSituationId); String meetingId = payMeetingSituation.getMeetingId(); PayMeeting payMeeting = meetingService.getById(meetingId); Integer meetingType = payMeeting.getMeetingType(); + //只有会议负责人可以设置对接人 + if (!payMeeting.getDirectorId().equals(sysUserId)) { + throw new JeroBootException("只有会议负责人可以设置对接人"); + } //只有国际研讨会议可以设置对接人 if (!meetingType.equals(Integer.parseInt(MeetingCommon.INTERNATIONAL_MEETING))) { throw new JeroBootException("只有国际研讨会议可以设置对接人"); @@ -1161,4 +1176,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Thu, 28 Oct 2021 09:59:42 +0800 Subject: [PATCH 16/28] =?UTF-8?q?fixbug=EF=BC=9A=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF=E4=B8=8B=E8=BD=BD=E5=92=8C=E8=B4=A2=E5=8A=A1=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/controller/PayCaseCommitteeController.java | 2 +- ...PayWorkingGroupDistributionRecordController.java | 2 +- .../controller/AllProjectStatisticsController.java | 13 ++++++++----- .../CompanyComeMoneyStatisticsController.java | 10 ++++++---- .../PayWorkingGroupStatisticsController.java | 9 ++++++--- .../PrincipalPeopleStatisticsController.java | 6 ++++-- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 23cae957..45d50dc8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -132,7 +132,7 @@ public class PayCaseCommitteeController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList ); @@ -167,7 +167,7 @@ public class AllProjectStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList); @@ -236,7 +236,8 @@ public class AllProjectStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计"); } if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); @@ -275,7 +276,8 @@ public class AllProjectStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计"); } if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { @@ -325,7 +327,8 @@ public class AllProjectStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "企业来款统计"); } List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList); if (pageList != null) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 9904ef68..c3b29bc8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -84,7 +84,7 @@ public class CompanyComeMoneyStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList); @@ -148,7 +148,7 @@ public class CompanyComeMoneyStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList); @@ -210,7 +210,8 @@ public class CompanyComeMoneyStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计"); } List pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList); @@ -244,7 +245,8 @@ public class CompanyComeMoneyStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计"); } List pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList); for (CompanyComeMoneyDetail s : pageList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java index 64e1005b..e3e33877 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java @@ -22,6 +22,7 @@ import com.jero.project.entity.PayWorkingGroupStatistics; import com.jero.project.entity.PayWorkingGroupSubletSearch; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.statistics.entity.CompanyComeMoneyDetail; import com.jero.util.AmountUtil; import com.jero.util.SearchUtil; import io.swagger.annotations.Api; @@ -95,7 +96,7 @@ public class PayWorkingGroupStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } IPage pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList); List records = pageList.getRecords(); @@ -161,7 +162,8 @@ public class PayWorkingGroupStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计"); } List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList); //处理为空数据为0 @@ -198,7 +200,8 @@ public class PayWorkingGroupStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计"); } List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings); //处理为空数据为0 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index 0a13ef5a..6fad3094 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java @@ -18,6 +18,7 @@ import com.jero.mail.entity.PayMailBillProject; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.project.entity.PayWorkGroupSubletStatistics; +import com.jero.project.entity.PayWorkingGroupStatistics; import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.*; import com.jero.util.AmountUtil; @@ -92,7 +93,7 @@ public class PrincipalPeopleStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } Page page = new Page<>(pageNo, pageSize); @@ -205,7 +206,8 @@ public class PrincipalPeopleStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, PrincipalPeopleList.class, "个人来款"); } List pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch, idList); From 59ff173699d95f3c7bc9b7d798cb75827dbf01fa Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 28 Oct 2021 10:07:00 +0800 Subject: [PATCH 17/28] =?UTF-8?q?fix=20bug=20=E7=BB=84=E7=BB=87=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDepartController.java | 2 +- .../main/java/com/jero/modules/system/model/SysDepartExcel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 7e7a03e5..af68e94c 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -453,7 +453,7 @@ public class SysDepartController { LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(SysDepart::getOrgCode,sysDepart.getOrgCode()); if (sysDepartService.count(wrapper1) > 0) { - errorMessage.add("第 " + lineNumber + " 行：部门编码已经存在"); + errorMessage.add("第 " + lineNumber + " 行：机构编码已经存在"); } if (errorMessage.isEmpty()){ SysDepart sysDepart1 = new SysDepart(); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java index e02b7495..4a83c47f 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java @@ -37,7 +37,7 @@ public class SysDepartExcel { private String orgCode; /**手机号*/ @Excel(name="手机号",width=15,orderNum = "5") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误") private String mobile; /**传真*/ private String fax; From 74db8ab27be702b2b91924b5eb8265e60b08378a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 28 Oct 2021 10:14:28 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41590?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/service/impl/ProjectPackServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java index ce402bec..ce8d186e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java @@ -99,7 +99,7 @@ public class ProjectPackServiceImpl implements ProjectPackService { throw new JeroBootException("企业不匹配！"); } //审核不通过不允许打包 - if (!Objects.equals(payMeetingSituationOld.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)) { + if (!Objects.equals(payMeetingSituationOld.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)) { throw new JeroBootException("项目未审核通过！"); } LambdaUpdateWrapper payMeetingSituation = new LambdaUpdateWrapper<>(); From 8f5bc2f104bd1a0512ed035ca7b294e103ab2b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 28 Oct 2021 10:17:19 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41566?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupDataFileController.java | 43 +++++++++++-------- .../xml/PayWorkingGroupDataFileMapper.xml | 3 ++ .../impl/PayCommonProjectServiceImpl.java | 3 ++ .../impl/PayWorkingGroupServiceImpl.java | 9 ++-- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index 4084b714..dd5c2477 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -8,29 +8,19 @@ import java.util.zip.ZipOutputStream; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.exception.JeroBootException; -import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.service.RolePermissionService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; -import com.jero.company.entity.PayContactsManagement; -import com.jero.company.service.IPayContactsManagementService; -import com.jero.data.entity.PayFileDownloadRecord; -import com.jero.data.service.IPayFileDownloadRecordService; -import com.jero.meeting.entity.PayMeeting; -import com.jero.meeting.service.IPayMeetingService; -import com.jero.modules.message.handle.impl.EmailSendMsgHandle; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; @@ -41,16 +31,10 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -69,6 +53,9 @@ public class PayWorkingGroupDataFileController extends JeroController AND osf.file_name LIKE CONCAT('%',CONCAT(#{payWorkingGroupDataFile.fileName},'%')) + + AND pwgdf.create_by = #{payWorkingGroupDataFile.createBy} + ORDER BY pwgdf.create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 93c4e6a5..f32b8c8c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -274,6 +274,9 @@ public class PayCommonProjectServiceImpl extends ServiceImpl{ PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(p); + if(Objects.isNull(payWorkingGroupOld)){ + throw new JeroBootException("工作组不存在！"); + } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(!rolePermissionService.getRolePermission("workingGroupProject:edit") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){ + if(!rolePermissionService.getRolePermission("workingGroupProject:batchDel") && !Objects.equals(payWorkingGroupOld.getPrincipalIdA(),sysUser.getId())){ sb.append(payWorkingGroupOld.getWorkingGroupProject() + "工作组项目不可操作！
"); } LambdaQueryWrapper query = new LambdaQueryWrapper<>(); @@ -158,7 +161,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryPayWorkingGroup = new LambdaQueryWrapper<>(); From 90a2585224b51ded5f1581c7fe38880903d675ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 28 Oct 2021 10:55:13 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41582?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupDataFileController.java | 20 ++++++++-- .../PayWorkingGroupSubItemController.java | 32 +++++++++++++++- .../xml/PayWorkingGroupDataFileMapper.xml | 3 -- .../PayWorkingGroupSubItemServiceImpl.java | 38 +++++++++++++++---- 4 files changed, 78 insertions(+), 15 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index dd5c2477..e1d53ac3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -24,8 +24,10 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupDataFile; import com.jero.project.service.IPayWorkingGroupDataFileService; +import com.jero.project.service.IPayWorkingGroupService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -56,6 +58,8 @@ public class PayWorkingGroupDataFileController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate); if(!CollectionUtils.isEmpty(pageList.getRecords())){ @@ -302,6 +315,7 @@ public class PayWorkingGroupSubItemController extends JeroController listContacts = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getContactsTemporaryIdOne).collect(Collectors.toList()); List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listContacts); if(CollectionUtils.isEmpty(listPayContactsManagementTemporary)){ return Result.error("联系人不存在!"); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); listPayWorkingGroupSubItem.forEach(p->{ List listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdOne(),item.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listContactsInfo)){ @@ -469,6 +489,16 @@ public class PayWorkingGroupSubItemController extends JeroController AND osf.file_name LIKE CONCAT('%',CONCAT(#{payWorkingGroupDataFile.fileName},'%')) - - AND pwgdf.create_by = #{payWorkingGroupDataFile.createBy} - ORDER BY pwgdf.create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 81a0b4c9..2f897c10 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.common.ProjectCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.service.ContractCreateProjectSendMessageService; import com.jero.common.service.ProjectDetailService; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.ValidUtil; import com.jero.common.vo.ProjectStatusVO; @@ -33,6 +36,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; @@ -43,7 +47,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -81,6 +84,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); @@ -566,7 +578,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl Date: Thu, 28 Oct 2021 11:08:09 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41582?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupDataFileController.java | 39 ++++++++++++++++--- ...ingGroupDistributionRecordServiceImpl.java | 33 +++++++++++----- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index e1d53ac3..6f78c00f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -182,9 +182,18 @@ public class PayWorkingGroupDataFileController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupDataFile, request.getParameterMap()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 9654aef0..89d44861 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; import com.jero.common.service.SendMessageService; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; @@ -75,6 +76,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listPayWorkingGroupDistributionRecord = new ArrayList<>(); if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); + if(Objects.isNull(payWorkingGroup)){ + throw new JeroBootException("工作组不存在!"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("fileMaintenance:distribute") + && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId()) + && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){ + throw new JeroBootException("资料不可操作！"); + } setRecord( payWorkingGroupDistributionRecord,s,listPayWorkingGroupDistributionRecord, byId); LambdaQueryWrapper queryPayContactsManagementTemporary = new LambdaQueryWrapper<>(); queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s)); @@ -115,10 +128,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); @@ -228,6 +237,16 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); List listPayWorkingGroupDistributionRecord = new ArrayList<>(); if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); + if(Objects.isNull(payWorkingGroup)){ + throw new JeroBootException("工作组不存在!"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("fileMaintenance:distribute") + && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId()) + && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){ + throw new JeroBootException("资料不可操作！"); + } listPayWorkingGroupDataFile.forEach(p->{ OSSFile byId = iossFileService.getById(p.getFileId()); if(Objects.isNull(byId)){ @@ -245,10 +264,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl Date: Thu, 28 Oct 2021 11:08:30 +0800 Subject: [PATCH 22/28] =?UTF-8?q?fix=20bug=20=E7=BB=84=E7=BB=87=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDepartController.java | 54 ++++++++++--------- .../modules/system/model/SysDepartExcel.java | 1 + 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index af68e94c..0f81098f 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -421,30 +421,32 @@ public class SysDepartController { List errorMessage = new ArrayList<>(); int num = 0; for (SysDepartExcel sysDepart : listSysDeparts) { - String orgCode = sysDepart.getOrgCode(); - if(orgCode.length() > codeLength) { - String parentCode = orgCode.substring(0, orgCode.length()-codeLength); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("org_code", parentCode); - SysDepart parentDept = sysDepartService.getOne(queryWrapper); - if(parentDept != null) { - sysDepart.setParentId(parentDept.getId()); - } else { + int lineNumber = num +1; + List errorList = ValidUtil.validateReturnList(sysDepart); + if (!errorList.isEmpty()){ + errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，")); + } + if (errorMessage.isEmpty()){ + String orgCode = sysDepart.getOrgCode(); + if(orgCode.length() > codeLength) { + String parentCode = orgCode.substring(0, orgCode.length()-codeLength); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("org_code", parentCode); + SysDepart parentDept = sysDepartService.getOne(queryWrapper); + if(parentDept != null) { + sysDepart.setParentId(parentDept.getId()); + } else { + sysDepart.setParentId(""); + } + }else{ sysDepart.setParentId(""); } - }else{ - sysDepart.setParentId(""); + //update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------ + sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+""); + //update-end---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------ + sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); } - //update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------ - sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+""); - //update-end---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------ - sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - int lineNumber = num +1; try { - List errorList = ValidUtil.validateReturnList(sysDepart); - if (!errorList.isEmpty()){ - errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，")); - } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDepart::getDepartName,sysDepart.getDepartName()); if (sysDepartService.count(wrapper) > 0) { @@ -467,11 +469,13 @@ public class SysDepartController { } num++; } - //清空部门缓存 - Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*"); - Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*"); - redisTemplate.delete(keys3); - redisTemplate.delete(keys4); + if (errorMessage.isEmpty()){ + //清空部门缓存 + Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*"); + Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*"); + redisTemplate.delete(keys3); + redisTemplate.delete(keys4); + } return ImportExcelUtil.importReturnRes(errorMessage.size(), errorMessage); } catch (Exception e) { log.error(e.getMessage(),e); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java index 4a83c47f..ddf9a719 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/SysDepartExcel.java @@ -34,6 +34,7 @@ public class SysDepartExcel { /**机构编码*/ @Excel(name="机构编码",width=15,orderNum = "2") + @NotBlank(message = "机构编码不能为空") private String orgCode; /**手机号*/ @Excel(name="手机号",width=15,orderNum = "5") From 8e3f0f8de5a83b40d894b69299cff5d3579e77fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 28 Oct 2021 11:44:28 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41540?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMailBillServiceImpl.java | 26 ++++++++++++++++--- 1 file changed, 22 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 4a540232..f7f5088b 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 @@ -41,6 +41,8 @@ import com.jero.member.mapper.PayMemberProjectMapper; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.mapper.TbMemberProjectMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.entity.PayCommonProject; @@ -109,6 +111,8 @@ public class PayMailBillServiceImpl extends ServiceImpl queryPayMeetingSysUser = new LambdaQueryWrapper<>(); + queryPayMeetingSysUser.eq(SysUser::getId,payMeeting.getDirectorId()); + List sysPayMeetingUser = sysUserService.list(queryPayMeetingSysUser); //逗号拼接邮寄信息 if(i==0){ projectName.append(payMeeting.getMeetingName()); chargeCompanyName.append(meeting.getCompanyName()); - principalName.append(payMeeting.getDirectorName()); + if(!CollectionUtils.isEmpty(sysPayMeetingUser)) { + principalName.append(sysPayMeetingUser.get(0).getRealname()); + } principalId.append(payMeeting.getDirectorId()); }else{ projectName.append(",").append(payMeeting.getMeetingName()); chargeCompanyName.append(",").append(meeting.getCompanyName()); - principalName.append(",").append(payMeeting.getDirectorName()); + if(!CollectionUtils.isEmpty(sysPayMeetingUser)) { + principalName.append(",").append(sysPayMeetingUser.get(0).getRealname()); + } principalId.append(",").append(payMeeting.getDirectorId()); } break; @@ -572,16 +583,23 @@ public class PayMailBillServiceImpl extends ServiceImpl queryPayMemberProjectSysUser = new LambdaQueryWrapper<>(); + queryPayMemberProjectSysUser.eq(SysUser::getId,payMemberProject.getDirectorId()); + List sysPayMemberProjectUser = sysUserService.list(queryPayMemberProjectSysUser); //逗号拼接邮寄信息 if(i==0){ projectName.append(payMemberProject.getProjectName()); chargeCompanyName.append(memberProject.getCompanyName()); - principalName.append(payMemberProject.getDirectorName()); + if(!CollectionUtils.isEmpty(sysPayMemberProjectUser)) { + principalName.append(sysPayMemberProjectUser.get(0).getRealname()); + } principalId.append(payMemberProject.getDirectorId()); }else{ projectName.append(",").append(payMemberProject.getProjectName()); chargeCompanyName.append(",").append(memberProject.getCompanyName()); - principalName.append(",").append(payMemberProject.getDirectorName()); + if(!CollectionUtils.isEmpty(sysPayMemberProjectUser)) { + principalName.append(",").append(sysPayMemberProjectUser.get(0).getRealname()); + } principalId.append(",").append(payMemberProject.getDirectorId()); } break; From 0aa1abd5af44dcf10c63d6f64e0c632968d36f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 28 Oct 2021 13:50:29 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41520?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/PayIncomeContractCommon.java | 4 +-- .../PaySpendingContractController.java | 3 -- .../contract/entity/PaySpendingContract.java | 28 ++++++++--------- .../PaySpendingContractInstallment.java | 30 +++++++++---------- .../impl/PaySpendingContractServiceImpl.java | 25 +--------------- .../vo/PaySpendingContractExcelModel.java | 6 ---- 6 files changed, 32 insertions(+), 64 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java index 304f197d..ed9f433b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java @@ -80,11 +80,11 @@ public class PayIncomeContractCommon { */ public final static List LIST_SPENDING_CONTRACT = Arrays.asList("合同编号","合同名称","签订单位","签订联系人","是否开口","负责人", "部门名称","签订合同总金额","税率","未税金额","合同签订日期","合同终止日期","合同约定主要时点", - "应付金额","已付金额","未付金额","账款状态","合同约定付款次数","是否打包","打包年份"); + "应收金额","已收金额","未收金额","账款状态","合同约定付款次数"); /** * 支出合同分期信息excel 表头 */ - public final static List LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应付","阶段应付时间","阶段实付","阶段实付时间"); + public final static List LIST_SPENDING_CONTRACT_INSTALLMENT = Arrays.asList("阶段","阶段应收","阶段应收时间","阶段实收","阶段实收时间"); /** * 来源（1:收入合同,2:打包管理） diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index 3a83699e..af6ec595 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -287,7 +287,6 @@ public class PaySpendingContractController extends JeroController listSub = listPaySpendingContractInstallment.stream().filter(item-> Objects.equals(p.getId(),item.getContractId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listSub)){ @@ -330,8 +329,6 @@ public class PaySpendingContractController extends JeroController 0){ for (int i = 1; i <= count; i++){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index 252817fc..9cef8f7f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -134,25 +134,25 @@ public class PaySpendingContract implements Serializable { @ApiModelProperty(value = "合同约定主要时点") @Size(max = 200, message = "合同约定主要时点不能大于200个字符") private String contractTimePoints; - /**应付金额*/ - @Excel(name = "应付金额", width = 15) - @ApiModelProperty(value = "应付金额") - @NotNull(message = "应付金额不能为空") + /**应收金额*/ + @Excel(name = "应收金额", width = 15) + @ApiModelProperty(value = "应收金额") + @NotNull(message = "应收金额不能为空") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "应付金额格式错误") + @DecimalMax(value = "9999999999.99",message = "应收金额格式错误") private BigDecimal accountsReceivableAmount; - /**已付金额*/ - @Excel(name = "已付金额", width = 15) - @ApiModelProperty(value = "已付金额") - @NotNull(message = "已付金额不能为空") + /**已收金额*/ + @Excel(name = "已收金额", width = 15) + @ApiModelProperty(value = "已收金额") + @NotNull(message = "已收金额不能为空") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "已付金额格式错误") + @DecimalMax(value = "9999999999.99",message = "已收金额格式错误") private BigDecimal amountReceived; - /**未付金额*/ - @Excel(name = "未付金额", width = 15) - @ApiModelProperty(value = "未付金额") + /**未收金额*/ + @Excel(name = "未收金额", width = 15) + @ApiModelProperty(value = "未收金额") @JsonFormat(shape = JsonFormat.Shape.STRING) - @DecimalMax(value = "9999999999.99",message = "未付金额格式错误") + @DecimalMax(value = "9999999999.99",message = "未收金额格式错误") private BigDecimal outstandingAmount; /**账款状态（1：未支付，2：部分支付，3：已付全款）*/ @Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java index e3ec4ae0..eb3d8d60 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java @@ -47,30 +47,30 @@ public class PaySpendingContractInstallment implements Serializable { @NotEmpty(message = "阶段不能为空") @Size(max = 50, message = "阶段长度不能大于50个字符") private String phaseName; - /**应付金额*/ - @Excel(name = "阶段应付金额", width = 15) - @ApiModelProperty(value = "应付金额") - @NotNull(message = "阶段应付不能为空") - @DecimalMax(value = "9999999999.99",message = "阶段应付格式错误") + /**应收金额*/ + @Excel(name = "阶段应收金额", width = 15) + @ApiModelProperty(value = "应收金额") + @NotNull(message = "阶段应收不能为空") + @DecimalMax(value = "9999999999.99",message = "阶段应收格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal accountsReceivableAmount; - /**应付时间*/ - @Excel(name = "阶段应付时间", width = 15, format = "yyyy-MM-dd") + /**应收时间*/ + @Excel(name = "阶段应收时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "应付时间") + @ApiModelProperty(value = "应收时间") private Date accountsReceivableTime; - /**实付金额*/ - @Excel(name = "阶段实付金额", width = 15) - @ApiModelProperty(value = "阶段实付金额") - @DecimalMax(value = "9999999999.99",message = "阶段实付格式错误") + /**实收金额*/ + @Excel(name = "阶段实收金额", width = 15) + @ApiModelProperty(value = "阶段实收金额") + @DecimalMax(value = "9999999999.99",message = "阶段实收格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; - /**实付时间*/ - @Excel(name = "实付时间", width = 15, format = "yyyy-MM-dd") + /**实收时间*/ + @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "实付时间") + @ApiModelProperty(value = "实收时间") private Date paidTime; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index 9b99b4c8..6fdcc50b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -294,9 +294,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); - }else{ - mapPack.forEach((k,v)->{ - if(Objects.equals(map.get(18),k)){ - paySpendingContract.setPack(Integer.parseInt(v)); - } - }); - if(Objects.isNull(paySpendingContract.getPack())){ - sb.append("第").append(n).append("行:是否打包格式错误，请修改。
"); - paySpendingContract.setPack(2); - } - // 打包获取打包年份 - if(Objects.equals(paySpendingContract.getPack(),PayIncomeContractCommon.PACK1)){ - if(StringUtils.isEmpty(map.get(19))){ - sb.append("第").append(n).append("行:打包年份不能为空，请修改。
"); - }else{ - paySpendingContract.setPackYear(map.get(19)); - } - } - } return paySpendingContract; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java index 2d266d84..d8565538 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PaySpendingContractExcelModel.java @@ -62,12 +62,6 @@ public class PaySpendingContractExcelModel implements Serializable { /**合同约定付款次数*/ @Excel(name = "合同约定付款次数", width = 15) private String contractPaymentTimes; - /**是否打包（1：是，0：否）*/ - @Excel(name = "是否打包", width = 15) - private Integer pack; - /**打包年份*/ - @Excel(name = "打包年份", width = 15) - private String packYear; /**阶段名称*/ @Excel(name = "1阶段", width = 15) private String phaseName1; From 51b89b9227c68a91b0da214c37ccb9f10218f7f7 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 28 Oct 2021 14:00:30 +0800 Subject: [PATCH 25/28] =?UTF-8?q?fix=20bug=2041581=20=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=93=BE=E6=8E=A5--=E6=96=B0=E5=A2=9E=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=A6=96=E6=AC=A1=E7=99=BB=E5=BD=95--=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=BC=BA=E5=88=B6=E8=AE=BE=E7=BD=AE=E5=AF=86=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=BF=9B=E5=85=A5=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayContactsManagementController.java | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 9a20613a..1dc0e8d5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -203,10 +203,6 @@ public class PayContactsManagementController extends JeroController queryWXByCompany(@RequestParam(name="companyId") String companyId, - @RequestParam(name="name",required = false) String name, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - if(!StringUtils.isBlank(name)){ - name = oConvertUtils.replaceAllPercent(name); - } - Page page = new Page<>(pageNo, pageSize); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayContactsManagement::getCompanyId,companyId); - queryWrapper.eq(PayContactsManagement::getName,name); - if(!StringUtils.isEmpty(name)){ - queryWrapper.like(PayContactsManagement::getName,name); - } - IPage listPayContactsManagement = payContactsManagementService.page(page,queryWrapper); - if(!CollectionUtils.isEmpty(listPayContactsManagement.getRecords())){ - List list = listPayContactsManagement.getRecords(); - list.forEach(p->{ - if(!StringUtils.isBlank(p.getPhone())){ - p.setPhone(PasswordUtil.decrypt(p.getPhone())); - } - if(!StringUtils.isBlank(p.getEmail())){ - p.setEmail(PasswordUtil.decrypt(p.getEmail())); - } - }); - listPayContactsManagement.setRecords(list); - } - return Result.OK(listPayContactsManagement); - } - /** * 通过企业id查询用户 * From 8f442d309b96dac89d2112a29990312901171ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 28 Oct 2021 14:29:12 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40985?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayPackCompanyProjectMapper.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index 561b9f9a..5abf6657 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -30,7 +30,8 @@ from ( - select c.id,c.charge_project,c.invoice_amount, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email + select c.id,c.charge_project,c.invoice_amount, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount, + if(c.paid_amount is null or c.paid_amount = '','0.00',c.paid_amount) as paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email from pay_common_project c @@ -45,7 +46,8 @@ UNION ALL - select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','' + select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount, + if(gsub.paid_amount is null or gsub.paid_amount = '','0.00',gsub.paid_amount) as paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','' from pay_working_group g inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id @@ -61,7 +63,8 @@ UNION ALL - select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.phone,'' + select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable, + if(sit.paid_amount is null or sit.paid_amount = '','0.00',sit.paid_amount) as paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.phone,'' from pay_meeting meeting inner join pay_meeting_situation sit on meeting.id = sit.meeting_id @@ -78,7 +81,8 @@ UNION ALL - select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','' + select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable, + if(msub.paid_amount is null or msub.paid_amount = '','0.00',msub.paid_amount) as paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','' from pay_member_project pmp inner join pay_member_project_subitem msub on pmp.id = msub.project_id @@ -94,7 +98,8 @@ UNION ALL - select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email + select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable, + if(tmsub.paid_amount is null or tmsub.paid_amount = '','0.00',tmsub.paid_amount) as paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email from tb_member_project tmember inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id @@ -120,7 +125,7 @@ AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate} - GROUP BY ppcp.project_id ORDER BY project.paid_amount asc,ppcp.create_time desc + GROUP BY ppcp.project_id ORDER BY project.paid_amount asc,project.create_time desc