From ebc9a8e4db596dedf8510e2312da331641ffdee6 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 29 Oct 2021 09:44:33 +0800 Subject: [PATCH 01/14] =?UTF-8?q?fix=20=E6=8A=A5=E5=90=8D=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4=E7=B2=BE=E7=A1=AE=E5=88=B0=E6=97=B6?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/meeting/entity/PayMeeting.java | 6 +++--- .../service/impl/PayMeetingSituationServiceImpl.java | 6 ++++-- .../src/main/java/com/jero/meeting/vo/PayMeetingVO.java | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 0b30b4d2..65e19a1b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -163,9 +163,9 @@ public class PayMeeting implements Serializable { private String meetingContent; /**报名截止时间*/ - @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty(value = "报名截止时间") private java.util.Date registerDeadline; 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 c46a29f8..e2dae9cb 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 @@ -1,5 +1,6 @@ package com.jero.meeting.service.impl; +import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -272,10 +273,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 0)) { - throw new JeroBootException("报名截止时间为：" + DateUtil.formatDate(registerDeadline)); + throw new JeroBootException("报名截止时间为：" + DateUtil.format(registerDeadline,"yyyy-MM-dd HH:mm")); } //会议类型 Integer meetingType = payMeeting.getMeetingType(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java index 052acf85..bef7faa3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java @@ -148,9 +148,9 @@ public class PayMeetingVO implements Serializable { private String meetingContent; /**报名截止时间*/ - @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty(value = "报名截止时间") @NotNull(message = "报名截止时间不能为空") private java.util.Date registerDeadline; From 33b962037fe3429c69fb08f3b4cee2236371fe52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Fri, 29 Oct 2021 09:48:20 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40897?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml index 7c9015ca..9f6c8322 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml @@ -80,7 +80,6 @@ LEFT JOIN pay_pack_company ppc ON ppc.id = ppcp.pack_id LEFT JOIN pay_income_contract_associated pica ON pica.project_id = pcp.id ${ew.customSqlSegment} - AND ( ppc.id IS NULL OR ppc.id = '' ) AND ( pica.id IS NULL OR pica.id = '' ) AND (ppc.pack_year=#{packYear} or ppc.pack_year is null or ppc.pack_year = '') From a77b5cd0e8d4897463e811d11e962a31ed07f997 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 29 Oct 2021 10:01:05 +0800 Subject: [PATCH 03/14] =?UTF-8?q?fix=20bug=2041161=20=E3=80=90ie=E3=80=91?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/CommonController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index d7ad456a..3903d437 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.system.api.ISysBaseAPI; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -170,7 +171,10 @@ public class CommonController { response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1")); response.setContentType("application/force-download");// 设置强制下载不打开 if (type == null) { - if (fileName.contains(".jpg") || fileName.contains(".png") || fileName.contains(".gif") || fileName.contains(".jpeg")) { + fileName = StringUtils.lowerCase(fileName); + if (fileName.contains(".jpg") || fileName.contains(".gif") || fileName.contains(".jpeg")) { + response.setContentType("image/jpeg;image/jpg;image/gif;image/png"); + } else if (fileName.contains(".png")) { response.setContentType("image/png;image/jpg;image/gif;image/jpeg"); } } @@ -279,7 +283,10 @@ public class CommonController { response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1")); response.setContentType("application/force-download");// 设置强制下载不打开 if (type == null) { - if (fileName.contains(".jpg") || fileName.contains(".png") || fileName.contains(".gif") || fileName.contains(".jpeg")) { + fileName = StringUtils.lowerCase(fileName); + if (fileName.contains(".jpg") || fileName.contains(".gif") || fileName.contains(".jpeg")) { + response.setContentType("image/jpeg;image/jpg;image/gif;image/png"); + } else if (fileName.contains(".png")) { response.setContentType("image/png;image/jpg;image/gif;image/jpeg"); } } From 5ed77e5d18f3a364f77b2e1d644d88e7f3f9645b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 29 Oct 2021 10:33:33 +0800 Subject: [PATCH 04/14] =?UTF-8?q?fix=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 +- 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 0f81098f..0e3b3937 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 2eb5d83e0d0ba1542d57f4c9f9f332f9da5ace91 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 29 Oct 2021 11:53:26 +0800 Subject: [PATCH 05/14] =?UTF-8?q?fix=20bug=2041649=20=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=AF=86=E7=A0=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/company/controller/CompanyLoginController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index c82a81e3..cbdcf77d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -109,8 +109,7 @@ public class CompanyLoginController { throw new JeroBootException("手机号或密码错误"); }else { if (StringUtils.isBlank(contactsManagement.getPassword())){ - result.setMessage("请先用手机验证码登录"); - return result; + throw new JeroBootException("请先用手机验证码登录"); } } From e3ac24b7d0bcbf8ae73861bf261f3aed5b174fd9 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 29 Oct 2021 13:54:25 +0800 Subject: [PATCH 06/14] =?UTF-8?q?fix=20=E6=8A=A5=E5=90=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E5=AE=A1=E6=A0=B8=E4=BB=98=E6=AC=BE=E5=87=AD?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 4 ++-- 1 file changed, 2 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 e2dae9cb..4689ef8f 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 @@ -420,8 +420,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Fri, 29 Oct 2021 14:46:06 +0800 Subject: [PATCH 07/14] =?UTF-8?q?fix=20bug=2041705,41704=20=E8=B5=84?= =?UTF-8?q?=E6=96=99=E7=BD=91=E5=85=83=E9=A1=B9=E7=9B=AE=E6=B0=B4=E5=B9=B3?= =?UTF-8?q?=E8=B6=8A=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayMemberProjectController.java | 7 +++ .../PayMemberProjectSubitemController.java | 43 +++++++++++++++++-- .../mapper/PayMemberProjectSubitemMapper.java | 2 + .../xml/PayMemberProjectSubitemMapper.xml | 5 +++ .../service/IPayMemberProjectService.java | 2 + .../IPayMemberProjectSubitemService.java | 4 ++ .../impl/PayPayMemberProjectServiceImpl.java | 16 +++++++ ...PayPayMemberProjectSubitemServiceImpl.java | 24 +++++++++++ 8 files changed, 100 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java index 4af63b3b..ca18a8db 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java @@ -209,6 +209,7 @@ public class PayMemberProjectController extends JeroController edit(@Validated @RequestBody PayMemberProject payMemberProject) { + memberProjectService.check(payMemberProject.getId(),"memberProject:edit"); memberProjectService.editById(payMemberProject); return Result.OK("编辑成功!"); } @@ -221,6 +222,7 @@ public class PayMemberProjectController extends JeroController delete(@RequestParam(name = "id") String id) { + memberProjectService.check(id,"memberProject:delete"); memberProjectService.deleteById(id); return Result.OK("删除成功!"); } @@ -233,6 +235,10 @@ public class PayMemberProjectController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { + List idList = Arrays.asList(ids.split(",")); + for (String id : idList) { + memberProjectService.check(id,"memberProject:batchDel"); + } this.memberProjectService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -244,6 +250,7 @@ public class PayMemberProjectController extends JeroController queryById(@RequestParam(name = "id") String id) { + memberProjectService.check(id,"memberProject:search"); PayMemberProject payMemberProject = memberProjectService.queryById(id); if (payMemberProject == null) { return Result.error("未找到对应数据"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 2a9e9d16..aabaaef5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.util.NumberUtil; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; @@ -19,7 +20,9 @@ import com.jero.common.util.oConvertUtils; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; +import com.jero.member.entity.PayMemberProject; import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.service.IPayMemberProjectService; import com.jero.member.service.IPayMemberProjectSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -52,9 +55,13 @@ public class PayMemberProjectSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("safeguardMember:search")) { + queryWrapper.eq("pmp.director_id",sysUser.getId()); + } Page page = new Page<>(pageNo, pageSize); - IPage pageList = memberProjectSubitemService.page(page, queryWrapper); + IPage pageList = memberProjectSubitemService.getPage(page, queryWrapper); return Result.OK(pageList); } @@ -123,6 +134,7 @@ public class PayMemberProjectSubitemController extends JeroController add(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) { + memberProjectService.check(payMemberProjectSubitem.getProjectId(),"safeguardMember:add"); ValidUtil.validate(payMemberProjectSubitem); memberProjectSubitemService.add(payMemberProjectSubitem); return Result.OK("添加成功！"); @@ -136,6 +148,7 @@ public class PayMemberProjectSubitemController extends JeroController edit(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) { + memberProjectSubitemService.check(payMemberProjectSubitem.getId(),"safeguardMember:edit"); ValidUtil.validate(payMemberProjectSubitem); memberProjectSubitemService.editById(payMemberProjectSubitem); return Result.OK("编辑成功!"); @@ -149,6 +162,7 @@ public class PayMemberProjectSubitemController extends JeroController delete(@RequestParam(name = "id") String id) { + memberProjectSubitemService.check(id,"safeguardMember:delete"); memberProjectSubitemService.deleteById(id); return Result.OK("删除成功!"); } @@ -161,7 +175,11 @@ public class PayMemberProjectSubitemController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { - this.memberProjectSubitemService.deleteByIds(Arrays.asList(ids.split(","))); + List idList = Arrays.asList(ids.split(",")); + for (String id : idList) { + memberProjectSubitemService.check(id,"safeguardMember:batchDel"); + } + this.memberProjectSubitemService.deleteByIds(idList); return Result.OK("批量删除成功!"); } @@ -172,6 +190,7 @@ public class PayMemberProjectSubitemController extends JeroController queryById(@RequestParam(name = "id") String id) { + memberProjectSubitemService.check(id,"safeguardMember:search"); PayMemberProjectSubitem payMemberProjectSubitem = memberProjectSubitemService.queryById(id); if (payMemberProjectSubitem == null) { return Result.error("未找到对应数据"); @@ -186,7 +205,24 @@ public class PayMemberProjectSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("safeguardMember:export")) { + queryWrapper.eq("pmp.director_id",sysUser.getId()); + } + Page page = new Page<>(-1, -1); + IPage getPage = memberProjectSubitemService.getPage(page, queryWrapper); + List pageList = getPage.getRecords(); + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + } + if (pageList.isEmpty()) { + throw new JeroBootException("没有数据"); + } + return super.exportListXls(pageList, PayMemberProjectSubitem.class, "会员项目成员表"); } /** @@ -211,6 +247,7 @@ public class PayMemberProjectSubitemController extends JeroController excelData = super.getExcelData(request, PayMemberProjectSubitemExcel.class); if (excelData.isEmpty()) { throw new JeroBootException("导入数据为空，请填写数据之后重新导入！"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java index a24092ad..e1db65e8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java @@ -17,4 +17,6 @@ import org.apache.ibatis.annotations.Param; public interface PayMemberProjectSubitemMapper extends BaseMapper { IPage queryPageListCompany(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage getPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml index 40fbac66..a175efac 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml @@ -39,4 +39,9 @@ left join pay_member_project pmp on pmps.project_id = pmp.id ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java index ccdd2b24..3a2091f9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java @@ -83,4 +83,6 @@ public interface IPayMemberProjectService extends IService { * @Exception */ IPage queryListByCompany(Page page, String companyId, String projectName, String projectType, Integer pack, String packYear); + + void check(String projectId, String permission); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index af90036b..06e34c8d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -69,4 +69,8 @@ public interface IPayMemberProjectSubitemService extends IService queryList(); IPage queryPageListCompany(Page page, QueryWrapper queryWrapper); + + IPage getPage(Page page, QueryWrapper queryWrapper); + + void check(String subitemId, String permission); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java index 1281c286..30fbb184 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java @@ -5,6 +5,8 @@ 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.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.vo.LoginUser; import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; import com.jero.member.entity.PayMemberProject; @@ -15,9 +17,11 @@ import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import org.apache.commons.collections.CollectionUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; @@ -43,6 +47,8 @@ public class PayPayMemberProjectServiceImpl extends ServiceImpl queryListByCompany(Page page, String companyId, String projectName, String projectType, Integer pack, String packYear) { return payMemberProjectMapper.queryListByCompany(page,companyId, projectName,projectType, pack, packYear); } + @Override + public void check(String projectId,String permission){ + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission(permission)) { + PayMemberProject payMemberProject = payMemberProjectMapper.selectById(projectId); + if (!Objects.equals(payMemberProject.getDirectorId(),sysUser.getId())){ + throw new JeroBootException("权限不足"); + } + } + } } 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 1c831d2b..0948ebe4 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 @@ -9,12 +9,15 @@ 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.ValidUtil; import com.jero.common.vo.ProjectStatusVO; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.member.mapper.PayMemberProjectMapper; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.project.common.PayProjectCommon; @@ -30,6 +33,7 @@ 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.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -69,6 +73,10 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl queryPageListCompany(Page page, QueryWrapper queryWrapper) { return baseMapper.queryPageListCompany(page,queryWrapper); } + + @Override + public IPage getPage(Page page, QueryWrapper queryWrapper) { + return baseMapper.getPage(page, queryWrapper); + } + @Override + public void check(String subitemId,String permission){ + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission(permission)) { + PayMemberProjectSubitem payMemberProjectSubitem = baseMapper.selectById(subitemId); + PayMemberProject payMemberProject = payMemberProjectMapper.selectById(payMemberProjectSubitem.getProjectId()); + if (!Objects.equals(payMemberProject.getDirectorId(),sysUser.getId())){ + throw new JeroBootException("权限不足"); + } + } + } } From e29fc1a80fbcf33bbea2b5bd24a82d639027c387 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 29 Oct 2021 15:55:56 +0800 Subject: [PATCH 08/14] =?UTF-8?q?fix=20bug=2041662=20=E6=A0=87=E5=8D=8F?= =?UTF-8?q?=E4=BC=9A=E5=91=98-=E5=9C=A8=E6=9D=A5=E6=AC=BE=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=AD=E4=BF=AE=E6=94=B9=E9=82=AE=E5=AF=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=9C=A8=E4=BC=9A=E5=91=98=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/mail/controller/PayMailBillController.java | 1 + .../com/jero/mail/service/IPayMailBillService.java | 4 ++++ .../mail/service/impl/PayMailBillServiceImpl.java | 11 +++++++++++ 3 files changed, 16 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index 8ed8d3af..0bc5af58 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -155,6 +155,7 @@ public class PayMailBillController extends JeroController { */ void pushSendToStandards(PayMailBill payMailBill, String id); + void pushBillEditToStandards(PayMailBill payMailBill); + /** * 接收会员系统开票邮寄信息 * @param payMailBill @@ -88,4 +90,6 @@ public interface IPayMailBillService extends IService { IPage pageLists(Page page, PayMailBillSearch payMailBillSearch); PayMailBill print(String id); + + } 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 f7f5088b..821a086d 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 @@ -242,6 +242,17 @@ public class PayMailBillServiceImpl extends ServiceImpl Date: Fri, 29 Oct 2021 16:38:47 +0800 Subject: [PATCH 09/14] =?UTF-8?q?fix=20bug=2041739=20=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4--=E5=AF=BC=E5=87=BA--=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=90=8E=E6=8F=90=E7=A4=BA=E2=80=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingController.java | 27 +----- .../CommitteeMeetingSituationController.java | 85 +------------------ .../controller/InternalMeetingController.java | 27 +----- .../controller/OtherMeetingController.java | 27 +----- .../OtherMeetingSituationController.java | 81 +----------------- .../StandardsMeetingController.java | 27 +----- .../StandardsMeetingSituationController.java | 81 +----------------- .../WorkGroupMeetingController.java | 27 +----- .../WorkGroupMeetingSituationController.java | 81 +----------------- .../meeting/service/IPayMeetingService.java | 2 + .../service/impl/PayMeetingServiceImpl.java | 17 ++++ .../impl/PayMeetingSituationServiceImpl.java | 9 +- .../PayMemberProjectController.java | 3 - .../PayMemberProjectSubitemController.java | 3 - 14 files changed, 51 insertions(+), 446 deletions(-) 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 4eae05fd..7b4da6d9 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 @@ -226,10 +226,6 @@ public class CommitteeMeetingController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = pageList.get(0).getMeetingType().toString(); for (PayMeeting meeting : pageList) { //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); @@ -238,7 +234,7 @@ public class CommitteeMeetingController extends JeroController()); @@ -291,25 +287,8 @@ public class CommitteeMeetingController extends JeroController classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupMeetingExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsMeetingExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalMeetingExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = OtherMeetingExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeMeetingExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "会议管理"); + Class aClass = payMeetingService.getaClass(MeetingCommon.COMMITTEE_MEETING_INT); + return super.exportListXls(exportList, aClass, "会议管理"); } /** 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 fb2746fe..60c37b62 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 @@ -192,89 +192,10 @@ public class CommitteeMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); - List pageList = payMeetingSituationService.list(queryWrapper); - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); - } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = payMeetingSituationService.getMeetingType(payMeetingSituation); - List exportList = new ArrayList<>(); - for (PayMeetingSituation meetingSituation : pageList) { - String companyContactId = meetingSituation.getCompanyContactId(); - PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId); - meetingSituation.setCompanyContactName(contactsManagement.getName()); - meetingSituation.setPost(contactsManagement.getPost()); - meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone())); - meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail())); - PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId()); - meetingSituation.setCompanyName(companyManagement.getCompanyName()); - switch (meetingType) { - case MeetingCommon.STANDARD_MEETING: - //保存数据 - StandardsSituationExcel standardsSituationExcel = new StandardsSituationExcel(); - BeanUtils.copyProperties(meetingSituation, standardsSituationExcel); - exportList.add(standardsSituationExcel); - // 工作组项目查询工作组项目名 - break; - case MeetingCommon.WORKING_GROUP_MEETING: - //保存数据 - WorkingGroupSituationExcel workingGroupSituationExcel = new WorkingGroupSituationExcel(); - BeanUtils.copyProperties(meetingSituation, workingGroupSituationExcel); - exportList.add(workingGroupSituationExcel); - break; - case MeetingCommon.INTERNATIONAL_MEETING: - //保存数据 - InternationalSituationExcel internationalSituationExcel = new InternationalSituationExcel(); - BeanUtils.copyProperties(meetingSituation, internationalSituationExcel); - exportList.add(internationalSituationExcel); - break; - case MeetingCommon.OTHER_MEETING: - //保存数据 - SituationExcel situationExcel = new SituationExcel(); - BeanUtils.copyProperties(meetingSituation, situationExcel); - exportList.add(situationExcel); - break; - case MeetingCommon.COMMITTEE_MEETING: - //保存数据 - CommitteeSituationExcel committeeSituationExcel = new CommitteeSituationExcel(); - BeanUtils.copyProperties(meetingSituation, committeeSituationExcel); - exportList.add(committeeSituationExcel); - break; - } - } - - - Class classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupSituationExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsSituationExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalSituationExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = SituationExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeSituationExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "参会人员信息"); + List objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE); + Class aClass = payMeetingSituationService.getaClass(MEETING_TYPE); + return super.exportListXls(objects, aClass, "参会人员信息"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index 247dd5d8..9c3f9a65 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -225,10 +225,6 @@ public class InternalMeetingController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = pageList.get(0).getMeetingType().toString(); for (PayMeeting meeting : pageList) { //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); @@ -237,7 +233,7 @@ public class InternalMeetingController extends JeroController()); @@ -290,25 +286,8 @@ public class InternalMeetingController extends JeroController classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupMeetingExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsMeetingExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalMeetingExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = OtherMeetingExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeMeetingExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "会议管理"); + Class aClass = payMeetingService.getaClass(MeetingCommon.INTERNATIONAL_MEETING_INT); + return super.exportListXls(exportList, aClass, "会议管理"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index 8ce52b56..96c868ed 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -225,10 +225,6 @@ public class OtherMeetingController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = pageList.get(0).getMeetingType().toString(); for (PayMeeting meeting : pageList) { //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); @@ -237,7 +233,7 @@ public class OtherMeetingController extends JeroController()); @@ -290,25 +286,8 @@ public class OtherMeetingController extends JeroController classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupMeetingExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsMeetingExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalMeetingExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = OtherMeetingExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeMeetingExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "会议管理"); + Class aClass = payMeetingService.getaClass(MeetingCommon.OTHER_MEETING_INT); + return super.exportListXls(exportList, aClass, "会议管理"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index 9c217660..2c4ec397 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -178,84 +178,9 @@ public class OtherMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); - List pageList = payMeetingSituationService.list(queryWrapper); - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); - } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = payMeetingSituationService.getMeetingType(payMeetingSituation); - List exportList = new ArrayList<>(); - for (PayMeetingSituation meetingSituation : pageList) { - - String companyContactId = meetingSituation.getCompanyContactId(); - PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId); - meetingSituation.setCompanyContactName(contactsManagement.getName()); - meetingSituation.setPost(contactsManagement.getPost()); - meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone())); - meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail())); - PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId()); - meetingSituation.setCompanyName(companyManagement.getCompanyName()); - switch (meetingType) { - case MeetingCommon.STANDARD_MEETING: - //保存数据 - StandardsSituationExcel standardsSituationExcel = new StandardsSituationExcel(); - BeanUtils.copyProperties(meetingSituation, standardsSituationExcel); - exportList.add(standardsSituationExcel); - // 工作组项目查询工作组项目名 - break; - case MeetingCommon.WORKING_GROUP_MEETING: - //保存数据 - WorkingGroupSituationExcel workingGroupSituationExcel = new WorkingGroupSituationExcel(); - BeanUtils.copyProperties(meetingSituation, workingGroupSituationExcel); - exportList.add(workingGroupSituationExcel); - break; - case MeetingCommon.INTERNATIONAL_MEETING: - //保存数据 - InternationalSituationExcel internationalSituationExcel = new InternationalSituationExcel(); - BeanUtils.copyProperties(meetingSituation, internationalSituationExcel); - exportList.add(internationalSituationExcel); - break; - case MeetingCommon.OTHER_MEETING: - //保存数据 - SituationExcel situationExcel = new SituationExcel(); - BeanUtils.copyProperties(meetingSituation, situationExcel); - exportList.add(situationExcel); - break; - case MeetingCommon.COMMITTEE_MEETING: - //保存数据 - CommitteeSituationExcel committeeSituationExcel = new CommitteeSituationExcel(); - BeanUtils.copyProperties(meetingSituation, committeeSituationExcel); - exportList.add(committeeSituationExcel); - break; - } - } - - - Class classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupSituationExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsSituationExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalSituationExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = SituationExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeSituationExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "参会人员信息"); + List objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE); + Class aClass = payMeetingSituationService.getaClass(MEETING_TYPE); + return super.exportListXls(objects, aClass, "参会人员信息"); } 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 c75a9cc8..4e8ddba9 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 @@ -252,10 +252,6 @@ public class StandardsMeetingController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = pageList.get(0).getMeetingType().toString(); for (PayMeeting meeting : pageList) { //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); @@ -264,7 +260,7 @@ public class StandardsMeetingController extends JeroController()); @@ -317,25 +313,8 @@ public class StandardsMeetingController extends JeroController classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupMeetingExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsMeetingExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalMeetingExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = OtherMeetingExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeMeetingExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "会议管理"); + Class aClass = payMeetingService.getaClass(MeetingCommon.STANDARD_MEETING_INT); + return super.exportListXls(exportList, aClass, "会议管理"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index f2a04e73..49a1b0f7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -178,84 +178,9 @@ public class StandardsMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); - List pageList = payMeetingSituationService.list(queryWrapper); - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); - } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = payMeetingSituationService.getMeetingType(payMeetingSituation); - List exportList = new ArrayList<>(); - for (PayMeetingSituation meetingSituation : pageList) { - - String companyContactId = meetingSituation.getCompanyContactId(); - PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId); - meetingSituation.setCompanyContactName(contactsManagement.getName()); - meetingSituation.setPost(contactsManagement.getPost()); - meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone())); - meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail())); - PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId()); - meetingSituation.setCompanyName(companyManagement.getCompanyName()); - switch (meetingType) { - case MeetingCommon.STANDARD_MEETING: - //保存数据 - StandardsSituationExcel standardsSituationExcel = new StandardsSituationExcel(); - BeanUtils.copyProperties(meetingSituation, standardsSituationExcel); - exportList.add(standardsSituationExcel); - // 工作组项目查询工作组项目名 - break; - case MeetingCommon.WORKING_GROUP_MEETING: - //保存数据 - WorkingGroupSituationExcel workingGroupSituationExcel = new WorkingGroupSituationExcel(); - BeanUtils.copyProperties(meetingSituation, workingGroupSituationExcel); - exportList.add(workingGroupSituationExcel); - break; - case MeetingCommon.INTERNATIONAL_MEETING: - //保存数据 - InternationalSituationExcel internationalSituationExcel = new InternationalSituationExcel(); - BeanUtils.copyProperties(meetingSituation, internationalSituationExcel); - exportList.add(internationalSituationExcel); - break; - case MeetingCommon.OTHER_MEETING: - //保存数据 - SituationExcel situationExcel = new SituationExcel(); - BeanUtils.copyProperties(meetingSituation, situationExcel); - exportList.add(situationExcel); - break; - case MeetingCommon.COMMITTEE_MEETING: - //保存数据 - CommitteeSituationExcel committeeSituationExcel = new CommitteeSituationExcel(); - BeanUtils.copyProperties(meetingSituation, committeeSituationExcel); - exportList.add(committeeSituationExcel); - break; - } - } - - - Class classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupSituationExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsSituationExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalSituationExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = SituationExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeSituationExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "参会人员信息"); + List objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE); + Class aClass = payMeetingSituationService.getaClass(MEETING_TYPE); + return super.exportListXls(objects, aClass, "参会人员信息"); } 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 ad2614b2..7b764e5f 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 @@ -227,10 +227,6 @@ public class WorkGroupMeetingController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = pageList.get(0).getMeetingType().toString(); for (PayMeeting meeting : pageList) { //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); @@ -239,7 +235,7 @@ public class WorkGroupMeetingController extends JeroController()); @@ -292,25 +288,8 @@ public class WorkGroupMeetingController extends JeroController classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupMeetingExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsMeetingExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalMeetingExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = OtherMeetingExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeMeetingExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "会议管理"); + Class aClass = payMeetingService.getaClass(MeetingCommon.WORKING_GROUP_MEETING_INT); + return super.exportListXls(exportList, aClass, "会议管理"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index 6e630bf5..167da37f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -178,84 +178,9 @@ public class WorkGroupMeetingSituationController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); - List pageList = payMeetingSituationService.list(queryWrapper); - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); - } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } - String meetingType = payMeetingSituationService.getMeetingType(payMeetingSituation); - List exportList = new ArrayList<>(); - for (PayMeetingSituation meetingSituation : pageList) { - - String companyContactId = meetingSituation.getCompanyContactId(); - PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId); - meetingSituation.setCompanyContactName(contactsManagement.getName()); - meetingSituation.setPost(contactsManagement.getPost()); - meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone())); - meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail())); - PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId()); - meetingSituation.setCompanyName(companyManagement.getCompanyName()); - switch (meetingType) { - case MeetingCommon.STANDARD_MEETING: - //保存数据 - StandardsSituationExcel standardsSituationExcel = new StandardsSituationExcel(); - BeanUtils.copyProperties(meetingSituation, standardsSituationExcel); - exportList.add(standardsSituationExcel); - // 工作组项目查询工作组项目名 - break; - case MeetingCommon.WORKING_GROUP_MEETING: - //保存数据 - WorkingGroupSituationExcel workingGroupSituationExcel = new WorkingGroupSituationExcel(); - BeanUtils.copyProperties(meetingSituation, workingGroupSituationExcel); - exportList.add(workingGroupSituationExcel); - break; - case MeetingCommon.INTERNATIONAL_MEETING: - //保存数据 - InternationalSituationExcel internationalSituationExcel = new InternationalSituationExcel(); - BeanUtils.copyProperties(meetingSituation, internationalSituationExcel); - exportList.add(internationalSituationExcel); - break; - case MeetingCommon.OTHER_MEETING: - //保存数据 - SituationExcel situationExcel = new SituationExcel(); - BeanUtils.copyProperties(meetingSituation, situationExcel); - exportList.add(situationExcel); - break; - case MeetingCommon.COMMITTEE_MEETING: - //保存数据 - CommitteeSituationExcel committeeSituationExcel = new CommitteeSituationExcel(); - BeanUtils.copyProperties(meetingSituation, committeeSituationExcel); - exportList.add(committeeSituationExcel); - break; - } - } - - - Class classToExport = null; - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - classToExport = WorkingGroupSituationExcel.class; - break; - case MeetingCommon.STANDARD_MEETING: - classToExport = StandardsSituationExcel.class; - break; - case MeetingCommon.INTERNATIONAL_MEETING: - classToExport = InternationalSituationExcel.class; - break; - case MeetingCommon.OTHER_MEETING: - classToExport = SituationExcel.class; - break; - case MeetingCommon.COMMITTEE_MEETING: - classToExport = CommitteeSituationExcel.class; - break; - } - return super.exportListXls(exportList, classToExport, "参会人员信息"); + List objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE); + Class aClass = payMeetingSituationService.getaClass(MEETING_TYPE); + return super.exportListXls(objects, aClass, "参会人员信息"); } 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 9b05b720..6f125667 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 @@ -71,4 +71,6 @@ public interface IPayMeetingService extends IService { IPage queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req); void uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon); + + Class getaClass(Integer meetingType); } 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 720decd9..94c663f5 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 @@ -692,4 +692,21 @@ public class PayMeetingServiceImpl extends ServiceImpl getaClass(Integer meetingType) { + Class classToExport = null; + if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){ + classToExport = WorkingGroupMeetingExcel.class; + }else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)){ + classToExport = StandardsMeetingExcel.class; + }else if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)){ + classToExport = InternationalMeetingExcel.class; + }else if (meetingType.equals(MeetingCommon.OTHER_MEETING_INT)){ + classToExport = OtherMeetingExcel.class; + }else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){ + classToExport = CommitteeMeetingExcel.class; + } + return classToExport; + } } 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 4689ef8f..44d3c806 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 @@ -1209,6 +1209,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl MeetingSituationGetModelAndView(HttpServletRequest request, PayMeetingSituation payMeetingSituation, Integer meetingType) { + String meetingId = payMeetingSituation.getMeetingId(); + PayMeeting payMeeting = meetingService.getById(meetingId); + if (!Objects.equals(payMeeting.getMeetingType(),meetingType)){ + throw new JeroBootException("数据权限不足"); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap()); String particularYear = request.getParameter("particularYear"); if (StringUtils.isNotBlank(particularYear)){ @@ -1223,9 +1228,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } String meetingType1 = getMeetingType(payMeetingSituation); List exportList = new ArrayList<>(); for (PayMeetingSituation meetingSituation : pageList) { @@ -1276,7 +1278,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl getaClass(Integer meetingType) { Class classToExport = null; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java index ca18a8db..498f40d9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java @@ -276,9 +276,6 @@ public class PayMemberProjectController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } for (PayMemberProject memberProject : pageList) { LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId()); memberProject.setDirectorName(user.getRealname()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index aabaaef5..936724dd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -219,9 +219,6 @@ public class PayMemberProjectSubitemController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } - if (pageList.isEmpty()) { - throw new JeroBootException("没有数据"); - } return super.exportListXls(pageList, PayMemberProjectSubitem.class, "会员项目成员表"); } From b2ed99b4f9663c560cc012426ccc5fbad08c03b8 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 29 Oct 2021 17:11:03 +0800 Subject: [PATCH 10/14] =?UTF-8?q?fix=20bug=20=E9=99=A4=E4=BA=86=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=B9=8B=E5=A4=96=E7=9A=84?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B9=9F=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayMeetingSituationServiceImpl.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 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 44d3c806..87920ade 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 @@ -138,9 +138,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Fri, 29 Oct 2021 19:03:04 +0800 Subject: [PATCH 11/14] =?UTF-8?q?fix=20bug=2041748=20=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF--=E5=B7=A5=E4=BD=9C=E7=BB=84/=E5=88=86?= =?UTF-8?q?=E6=A0=87=E5=A7=94=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E6=B1=87?= =?UTF-8?q?=E6=AC=BE=E6=88=96=E7=BA=BF=E4=B8=8A=E7=BC=B4=E8=B4=B9=E6=94=B6?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=B6=88=E6=81=AF=20fix=20bug=2041754=20?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BA=BA=E4=BF=AE=E6=94=B9=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E6=B2=A1=E5=81=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E7=A1=AE=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E6=8A=A5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingSituationServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 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 87920ade..a1787950 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 @@ -352,6 +352,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Mon, 1 Nov 2021 09:02:26 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41722?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/service/impl/PaySpendingContractServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 6fdcc50b..56f0f4ee 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 @@ -536,7 +536,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl{ if(Objects.equals(map.get(4),k)){ paySpendingContract.setOpening(Integer.parseInt(v)); @@ -545,6 +545,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl"); } + }else{ + sb.append("第").append(n).append("行:是否开口不能为空，请修改。
"); } paySpendingContract.setPrincipalName(map.get(5)); From 834ad746d891778be6b9d419602dd5cdb2c69d05 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Mon, 1 Nov 2021 09:14:36 +0800 Subject: [PATCH 13/14] fixbug:41716 --- .../jero/common/system/api/ISysBaseAPI.java | 2 +- jero-boot-incoming-payment/pom.xml | 6 + .../java/com/jero/mail/commont/BatOrder.java | 20 + .../mail/commont/HospitalInformation.java | 17 + .../java/com/jero/mail/commont/Print.java | 481 ++++++++++++++++++ .../mail/commont/SFBarCodeGenerateUtil.java | 51 ++ .../controller/PayMailBillController.java | 35 +- .../controller/PayMailContractController.java | 59 ++- ...BillList.java => PayMailContracrList.java} | 2 +- .../jero/mail/mapper/PayMailBillMapper.java | 1 - .../mail/mapper/PayMailContractMapper.java | 13 +- .../mail/mapper/xml/PayMailBillMapper.xml | 3 +- .../mail/mapper/xml/PayMailContractMapper.xml | 26 +- .../mail/service/IPayMailBillService.java | 6 - .../mail/service/IPayMailContractService.java | 16 +- .../service/impl/PayMailBillServiceImpl.java | 15 - .../impl/PayMailContractServiceImpl.java | 18 +- .../AllProjectStatisticsController.java | 29 +- .../CompanyComeMoneyStatisticsController.java | 24 +- .../PayWorkingGroupStatisticsController.java | 20 +- .../PrincipalPeopleStatisticsController.java | 17 +- .../system/service/impl/SysBaseApiImpl.java | 24 +- 22 files changed, 737 insertions(+), 148 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/BatOrder.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/HospitalInformation.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/Print.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/SFBarCodeGenerateUtil.java rename jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/{PayMailBillList.java => PayMailContracrList.java} (98%) diff --git a/jero-boot-base/jero-boot-base-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java b/jero-boot-base/jero-boot-base-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java index 21c6a562..30e4f612 100644 --- a/jero-boot-base/jero-boot-base-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java +++ b/jero-boot-base/jero-boot-base-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java @@ -329,7 +329,7 @@ public interface ISysBaseAPI extends CommonAPI { * @param departId 部门id * @return JSONObject */ - List getAllDepartIds(String departId); + List getAllDepartIds(String departId,String orgCode,List idList); /** * 发送短信验证码 */ diff --git a/jero-boot-incoming-payment/pom.xml b/jero-boot-incoming-payment/pom.xml index a8b99383..96171d8c 100644 --- a/jero-boot-incoming-payment/pom.xml +++ b/jero-boot-incoming-payment/pom.xml @@ -43,6 +43,12 @@ javase 3.3.0 + + com.google.zxing + core + 3.3.0 + compile +