add:分标委及补充

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;

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java

@@ -91,7 +91,6 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
 
 		}else if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getEndTime())){
 			queryWrapper.le("create_time", calendar.getTime());
-
 		}
 		if (ObjectUtil.isNotEmpty(payFileDownloadRecord.getFileName())){
 			queryWrapper.like("file_name",payFileDownloadRecord.getFileName());

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeDTO.java

@@ -23,4 +23,16 @@ public class PayCaseCommitteeDTO {
     @Size(max = 200,message = "目标简述长度不得超过200")
     @ApiModelProperty(value = "目标简述")
     private java.lang.String remarks;
+    /**负责人Aid*/
+    @ApiModelProperty(value = "负责人Aid")
+    private String principalIdA;
+    /**负责人名称A*/
+    @ApiModelProperty(value = "负责人名称A")
+    private String principalNameA;
+    /**负责人Bid*/
+    @ApiModelProperty(value = "负责人Bid")
+    private String principalIdB;
+    /**负责人名称B*/
+    @ApiModelProperty(value = "负责人名称B")
+    private String principalNameB;
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java

@@ -61,4 +61,19 @@ public class PayCaseCommittee implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
+
+    /**负责人Aid*/
+    @ApiModelProperty(value = "负责人Aid")
+    private String principalIdA;
+    /**负责人名称A*/
+    @Excel(name = "负责人名称A", width = 15)
+    @ApiModelProperty(value = "负责人名称A")
+    private String principalNameA;
+    /**负责人Bid*/
+    @ApiModelProperty(value = "负责人Bid")
+    private String principalIdB;
+    /**负责人名称B*/
+    @Excel(name = "负责人名称B", width = 15)
+    @ApiModelProperty(value = "负责人名称B")
+    private String principalNameB;
 }

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml

@@ -38,6 +38,8 @@
                 AND (pe.create_by_id = #{userId}
                     or pme.director_id = #{userId}
                     OR pmc.meeting_contacts_id = #{userId}
+                    OR pe.principal_id_a = #{userId}
+                    OR pe.principal_id_b = #{userId}
                     )
             </if>
         </where>

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.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
 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<PayMeetingQuest
         if (StringUtils.isBlank(payMeetingQuestion.getMeetingId())) {
             throw new JeroBootException("会议id不能为空！");
         }
+        PayMeeting payMeeting = payMeetingService.getById(payMeetingQuestion.getMeetingId());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(StringUtils.isNotBlank(sysUser.getRoleCode())){
+            List<String> 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<PayMeetingQuestion> page = new Page<>(pageNo, pageSize);
         IPage<PayMeetingQuestion> pageList = payMeetingQuestionService.page(page, lambdaQueryWrapper);
@@ -103,7 +105,8 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
             }
         });
         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<PayMeetingQuest
      */
     @AutoLog(value = "征集问题-通过id删除")
     @ApiOperation(value = "征集问题-通过id删除", notes = "征集问题-通过id删除")
-    @DeleteMapping(value = "/delete")
+    @PostMapping(value = "/delete")
     public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
         payMeetingQuestionService.removeById(id);
         return Result.ok("删除成功!");
@@ -149,7 +152,7 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
             }
             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);
             List<PayMeetingQuestion> pageList = payMeetingQuestionService.list(lambdaQueryWrapper);
             Map<String, List<PayMeetingQuestion>> map = pageList.stream().collect(Collectors.groupingBy(PayMeetingQuestion::getStandardNumber));
@@ -194,7 +197,7 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
                     HSSFCell cell43 = row4.createCell(2);
                     cell43.setCellValue(payMeetingQuestion1.getQuestionName());
                     HSSFCell cell44 = row4.createCell(3);
-                    cell44.setCellValue(payMeetingQuestion1.getName());
+                    cell44.setCellValue(payMeetingQuestion1.getCreater());
                     HSSFCell cell45 = row4.createCell(4);
                     cell45.setCellValue(PasswordUtil.decrypt(payMeetingQuestion1.getEmail()));
                     j++;

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingQuestion.java

@@ -76,8 +76,10 @@ public class PayMeetingQuestion {
 	/**创建人名称*/
 	@Excel(name = "提问人", width = 15)
     @ApiModelProperty(value = "创建人名称")
-	private java.lang.String name;
+	private java.lang.String creater;
 
+	@ApiModelProperty(value = "创建人id")
+	private java.lang.String createrId;
 	/**邮箱*/
 	@Excel(name = "提问人邮箱", width = 15)
 	@ApiModelProperty(value = "邮箱")