From 761e43062ed8016ddd60f5a100be6c2f3fe4d5f8 Mon Sep 17 00:00:00 2001 From: syxy <> Date: Wed, 6 Jul 2022 17:18:43 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=88=86=E6=A0=87=E5=A7=94=E5=8F=8A?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/22年7月变更.sql | 3 +- .../PayFileDownloadRecordController.java | 3 +- .../data/entity/DTO/PayCaseCommitteeDTO.java | 12 ++++++ .../jero/data/entity/PayCaseCommittee.java | 15 +++++++ .../xml/PayCaseCommitteeSubitemMapper.xml | 2 + .../PayMeetingQuestionController.java | 43 ++++++++++--------- .../meeting/entity/PayMeetingQuestion.java | 4 +- 7 files changed, 58 insertions(+), 24 deletions(-) diff --git a/db/22年7月变更.sql b/db/22年7月变更.sql index 2017e2f9..b73b71cd 100644 --- a/db/22年7月变更.sql +++ b/db/22年7月变更.sql @@ -15,7 +15,8 @@ CREATE TABLE `pay_meeting_question` ( `number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章条编号', `question_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题名称', `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名称', + `creater` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名称', + `creater_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人id', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `id`(`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会议征集问题' ROW_FORMAT = Dynamic; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java index 14b2e9e4..ae4aad79 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java @@ -59,7 +59,7 @@ public class PayFileDownloadRecordController extends JeroController diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java index dc4a0c2f..4b966328 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java @@ -1,18 +1,12 @@ package com.jero.meeting.controller; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,6 +16,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; +import com.jero.mail.commont.constant; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingQuestion; import com.jero.meeting.service.IPayMeetingQuestionService; @@ -37,7 +32,6 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -77,9 +71,17 @@ public class PayMeetingQuestionController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(sysUser.getRoleCode().split(","))); + if (!(roleCodes.contains(constant.ADMIN) || sysUser.getId().equals(payMeeting.getDirectorId()))) { + lambdaQueryWrapper.eq(PayMeetingQuestion::getCreaterId, payMeetingQuestion.getMeetingId()); + } + } lambdaQueryWrapper.eq(StringUtils.isNotBlank(payMeetingQuestion.getMeetingId()), PayMeetingQuestion::getMeetingId, payMeetingQuestion.getMeetingId()); lambdaQueryWrapper.eq(StringUtils.isNotBlank(payMeetingQuestion.getStandardNumber()), PayMeetingQuestion::getStandardNumber, payMeetingQuestion.getStandardNumber()); - lambdaQueryWrapper.like(StringUtils.isNotBlank(payMeetingQuestion.getName()), PayMeetingQuestion::getName, payMeetingQuestion.getName()); + lambdaQueryWrapper.like(StringUtils.isNotBlank(payMeetingQuestion.getCreater()), PayMeetingQuestion::getCreater, payMeetingQuestion.getCreater()); lambdaQueryWrapper.orderByDesc(PayMeetingQuestion::getCreateTime); Page page = new Page<>(pageNo, pageSize); IPage pageList = payMeetingQuestionService.page(page, lambdaQueryWrapper); @@ -96,14 +98,15 @@ public class PayMeetingQuestionController extends JeroController add(@RequestBody PayMeetingQuestion payMeetingQuestion) { - Optional.ofNullable(payMeetingQuestion.getMeetingId()).ifPresent(id->{ + Optional.ofNullable(payMeetingQuestion.getMeetingId()).ifPresent(id -> { PayMeeting payMeeting = payMeetingService.getById(id); - if(ObjectUtils.isEmpty(payMeeting.getEndTimeAddQuestion())||payMeeting.getEndTimeAddQuestion().before(new Date())){ + if (ObjectUtils.isEmpty(payMeeting.getEndTimeAddQuestion()) || payMeeting.getEndTimeAddQuestion().before(new Date())) { throw new JeroBootException("征集问题截至时间以过，无法新增！"); } }); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - payMeetingQuestion.setName(sysUser.getRealname()); + payMeetingQuestion.setCreater(sysUser.getRealname()); + payMeetingQuestion.setCreaterId(sysUser.getId()); payMeetingQuestion.setEmail(PasswordUtil.decrypt(sysUser.getEmail())); payMeetingQuestionService.save(payMeetingQuestion); return Result.ok("添加成功！"); @@ -118,7 +121,7 @@ public class PayMeetingQuestionController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { payMeetingQuestionService.removeById(id); return Result.ok("删除成功!"); @@ -149,7 +152,7 @@ public class PayMeetingQuestionController extends JeroController pageList = payMeetingQuestionService.list(lambdaQueryWrapper); Map> map = pageList.stream().collect(Collectors.groupingBy(PayMeetingQuestion::getStandardNumber)); @@ -159,11 +162,11 @@ public class PayMeetingQuestionController extends JeroController { HSSFSheet sheet = workbook.createSheet(key); - sheet.setColumnWidth(0,300*15+323); - sheet.setColumnWidth(1,300*15+323); - sheet.setColumnWidth(2,300*15+323); - sheet.setColumnWidth(3,300*15+323); - sheet.setColumnWidth(4,300*15+323); + sheet.setColumnWidth(0, 300 * 15 + 323); + sheet.setColumnWidth(1, 300 * 15 + 323); + sheet.setColumnWidth(2, 300 * 15 + 323); + sheet.setColumnWidth(3, 300 * 15 + 323); + sheet.setColumnWidth(4, 300 * 15 + 323); HSSFRow row1 = sheet.createRow(0); HSSFCell cell1 = row1.createCell(0); cell1.setCellValue("标准号：" + key); @@ -194,7 +197,7 @@ public class PayMeetingQuestionController extends JeroController