LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:bug

Browse Source
This commit is contained in:
zhangqinlin
2022-07-15 10:03:50 +08:00
parent 61aefebcaf
commit 54e5738df8
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/22年7月变更.sql
+16 -4
View File
@@ -1,7 +1,7 @@
-- 7月变更 2022-7-4 征集问题
ALTER TABLE `pay_meeting` add COLUMN `is_add_question` tinyint(1) NULL DEFAULT NULL COMMENT '是否需要问题征集（0：否，1：是）' ;
ALTER TABLE `pay_meeting` add COLUMN `end_time_add_question` datetime NULL DEFAULT NULL COMMENT '征集截止日期' ;
ALTER TABLE `pay_meeting` add COLUMN `questions` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '征集问题text' ;
ALTER TABLE `pay_meeting` add COLUMN `add_question_statue` tinyint(1) NULL DEFAULT NULL COMMENT '征集问题状态(0：已结束，1：征集中）' ;
CREATE TABLE `pay_meeting_question` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id',
@@ -9,9 +9,7 @@ CREATE TABLE `pay_meeting_question` (
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
`meeting_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会议id',
`standard_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准号',
`standard_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称',
`standard_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准号id',
`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 '邮箱',
@@ -20,6 +18,20 @@ CREATE TABLE `pay_meeting_question` (
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `id`(`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会议征集问题' ROW_FORMAT = Dynamic;
CREATE TABLE `pay_meeting_standerd` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id',
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期',
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期',
`meeting_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会议id',
`standard_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准号',
`standard_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `id`(`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会议征集问题' ROW_FORMAT = Dynamic;
-- 分标委
ALTER TABLE `pay_case_committee` add COLUMN `principal_id_a` varchar (50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人Aid' ;
ALTER TABLE `pay_case_committee` add COLUMN `principal_name_a` varchar (50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人名称A' ;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingQuestionController.java
+8 -8
View File
@@ -76,15 +76,15 @@ public class PayMeetingQuestionController extends JeroController<PayMeetingQuest
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());
// }
// }
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) )) {
lambdaQueryWrapper.eq(PayMeetingQuestion::getCreaterId, sysUser.getId());
}
}
lambdaQueryWrapper.like(StringUtils.isNotBlank(payMeetingQuestion.getQuestionName()), PayMeetingQuestion::getQuestionName, payMeetingQuestion.getQuestionName());
lambdaQueryWrapper.eq(StringUtils.isNotBlank(payMeetingQuestion.getStandardId()), PayMeetingQuestion::getStandardId, payMeetingQuestion.getStandardId());
lambdaQueryWrapper.eq(PayMeetingQuestion::getStandardId, payMeetingQuestion.getStandardId());
lambdaQueryWrapper.like(StringUtils.isNotBlank(payMeetingQuestion.getNumber()), PayMeetingQuestion::getNumber, payMeetingQuestion.getNumber());
lambdaQueryWrapper.orderByDesc(PayMeetingQuestion::getCreateTime);
Page<PayMeetingQuestion> page = new Page<>(pageNo, pageSize);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingStandardController.java
+1 -1
View File
@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiOperation;
@Slf4j
@Api(tags="标准问题")
@RestController
@RequestMapping("/payMeetingStanderd/payMeetingStanderd")
@RequestMapping("/payMeetingStandard/payMeetingStandard")
public class PayMeetingStandardController extends JeroController<PayMeetingStandard, IPayMeetingStandardService> {
@Autowired
private IPayMeetingStandardService payMeetingStandardService;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingStandard.java
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
* @Version: V1.0
*/
@Data
@TableName("pay_meeting_standerd")
@TableName("pay_meeting_standard")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="pay_meeting_standerd对象", description="标准问题")