diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index 54896d6f..f6fe7f44 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -115,7 +115,7 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1807708679419334658', '1438394322899558402', '会员信息统计', '/incomePayments/memberManage/MemberStatisticList', 'incomePayments/memberManage/MemberStatisticList', NULL, NULL, 1, NULL, '1', 8.11, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2024-07-01 17:31:49', NULL, NULL, 0, 0, '1', 0, 1); -- 20240703 工作组-成员单位维护-确认凭证 工作组-全部文件导出 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808440661174550530', '1431167539278086146', '确认凭证', NULL, NULL, NULL, NULL, 2, 'workingGroupMember:confirmVoucher', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 18:00:27', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808439808279609346', '1430718058514440194', '全部文件导出', NULL, NULL, NULL, NULL, 2, 'workingGroupMember:exportAllFile', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 17:57:04', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808439808279609346', '1430718058514440194', '全部文件导出', NULL, NULL, NULL, NULL, 2, 'workingGroupProject:exportAllFile', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 17:57:04', NULL, NULL, 0, 0, '1', 0, 1); -- 20240703 工作组、起草组-会议参会情况-批量审核报名信息 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808458564737335298', '1742070808427126785', '批量审核报名信息', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:batchAuditSignUp', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 19:11:36', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808458432167968769', '1443462660843458561', '批量审核报名信息', NULL, NULL, NULL, NULL, 2, 'workGroupMeetingSituation:batchAuditSignUp', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 19:11:04', NULL, NULL, 0, 0, '1', 0, 1); @@ -162,4 +162,25 @@ ALTER TABLE `tb_member_project_subitem` -- 20240708 工作组表新增自定义排序字段 ALTER TABLE `pay_working_group` - add column sort_no int comment '自定义排序顺序' \ No newline at end of file + add column sort_no int comment '自定义排序顺序'; + +-- 20240710 新增会议酒店推荐表 +DROP TABLE IF EXISTS `pay_meeting_hotel_recommend`; +CREATE TABLE `pay_meeting_hotel_recommend` ( + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `recommend_people` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '推荐人', + `hotel_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '酒店名称', + `hotel_province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所在省份', + `hotel_city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所在城市', + `is_hold` tinyint(1) NULL DEFAULT NULL COMMENT '是否举办过标准院会议 1-是 0-否', + `meeting_type` tinyint(1) NULL DEFAULT NULL COMMENT '曾举办的会议类型', + `contact` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '酒店联系方式', + `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会议酒店推荐表' ROW_FORMAT = Dynamic; +SET FOREIGN_KEY_CHECKS = 1; + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingHotelRecommendController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingHotelRecommendController.java new file mode 100644 index 00000000..a7238494 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingHotelRecommendController.java @@ -0,0 +1,85 @@ +package com.jero.meeting.controller; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.drafting.entity.PayDraftingGroup; +import com.jero.meeting.entity.PayMeeting; +import com.jero.meeting.entity.PayMeetingHotelRecommend; +import com.jero.meeting.service.IPayMeetingHotelRecommendService; +import com.jero.meeting.vo.excel.PayMeetingHotelRecommendExcel; +import com.jero.member.entity.TbMemberProjectSubitem; +import com.jero.member.service.ITbMemberProjectSubitemService; +import com.jero.member.vo.TbMemberProjectSubitemExcel; +import com.jero.member.vo.TbMemberProjectSubitemExcelImport; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + *

+ * 会议酒店推荐表 前端控制器 + *

+ * + * @author sz + * @since 2024-07-10 + */ +@Api(tags = "会议酒店推荐") +@RestController +@RequestMapping("/meeting/payMeetingHotelRecommend") +@Slf4j +public class PayMeetingHotelRecommendController extends JeroController { + + @Resource + private IPayMeetingHotelRecommendService payMeetingHotelRecommendService; + + /** + * 分页列表查询 + * + * @param meetingHotelRecommend 会议酒店推荐 + * @param pageNo 页数 + * @param pageSize 条数 + */ +// @RequiresPermissions("") + @ApiOperation(value = "会议酒店推荐-分页列表查询", notes = "会议酒店推荐-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(PayMeetingHotelRecommend meetingHotelRecommend, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = payMeetingHotelRecommendService.queryHotelRecommendS(meetingHotelRecommend, pageNo, pageSize, req); + return Result.OK(pageList); + } + + /** + * 导出excel模板 + */ +// @RequiresPermissions("") + @ApiOperation(value = "导出模板") + @GetMapping(value = "/exportTemplate") + public ModelAndView exportTemplate() { + return super.exportTemplate(PayMeetingHotelRecommendExcel.class, "会议酒店推荐表"); + } + + /** + * 导入excel + */ + // @RequiresPermissions("") + @ApiOperation(value = "导入") + @PostMapping(value = "/importXls") + public Result importXls(HttpServletRequest request) { + List excelData = super.getExcelData(request, PayMeetingHotelRecommendExcel.class); + payMeetingHotelRecommendService.addExcel(excelData); + return Result.OK("文件导入成功！"); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java new file mode 100644 index 00000000..614ddd81 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java @@ -0,0 +1,75 @@ +package com.jero.meeting.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; +import java.util.Date; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 会议酒店推荐表 + *

+ * + * @author sz + * @since 2024-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("pay_meeting_hotel_recommend") +@ApiModel(value="PayMeetingHotelRecommend对象", description="会议酒店推荐表") +public class PayMeetingHotelRecommend implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.ASSIGN_ID) + private String id; + + @ApiModelProperty(value = "推荐人") + private String recommendPeople; + + @ApiModelProperty(value = "酒店名称") + private String hotelName; + + @ApiModelProperty(value = "所在省份") + private String hotelProvince; + + @ApiModelProperty(value = "所在城市") + private String hotelCity; + + @ApiModelProperty(value = "是否举办过标准院会议 1-是 0-否") + @Dict(dicCode = "yn") + private Integer isHold; + + @ApiModelProperty(value = "曾举办的会议类型") + @Dict(dicCode = "meeting_type") + private Integer meetingType; + + @ApiModelProperty(value = "酒店联系方式") + private String contact; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "创建人") + private String createBy; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新人") + private String updateBy; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingHotelRecommendMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingHotelRecommendMapper.java new file mode 100644 index 00000000..113dc665 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingHotelRecommendMapper.java @@ -0,0 +1,20 @@ +package com.jero.meeting.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.meeting.entity.PayMeetingHotelRecommend; +import org.apache.ibatis.annotations.Update; + +/** + *

+ * 会议酒店推荐表 Mapper 接口 + *

+ * + * @author sz + * @since 2024-07-10 + */ +public interface PayMeetingHotelRecommendMapper extends BaseMapper { + + @Update("TRUNCATE TABLE pay_meeting_hotel_recommend") + void truncateTable(); + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingHotelRecommendMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingHotelRecommendMapper.xml new file mode 100644 index 00000000..8f8cb61c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingHotelRecommendMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingHotelRecommendService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingHotelRecommendService.java new file mode 100644 index 00000000..d715beb6 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingHotelRecommendService.java @@ -0,0 +1,32 @@ +package com.jero.meeting.service; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.meeting.entity.PayMeetingHotelRecommend; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + *

+ * 会议酒店推荐表 服务类 + *

+ * + * @author sz + * @since 2024-07-10 + */ +public interface IPayMeetingHotelRecommendService extends IService { + + /** + * 分页列表查询 + * @param meetingHotelRecommend + * @param pageNo + * @param pageSize + * @param req + * @return + */ + IPage queryHotelRecommendS(PayMeetingHotelRecommend meetingHotelRecommend, Integer pageNo, Integer pageSize, HttpServletRequest req); + + void addExcel(List excelData); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingHotelRecommendServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingHotelRecommendServiceImpl.java new file mode 100644 index 00000000..99fe952a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingHotelRecommendServiceImpl.java @@ -0,0 +1,167 @@ +package com.jero.meeting.service.impl; + +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.ValidUtil; +import com.jero.meeting.entity.PayMeetingHotelRecommend; +import com.jero.meeting.mapper.PayMeetingHotelRecommendMapper; +import com.jero.meeting.service.IPayMeetingHotelRecommendService; +import com.jero.meeting.vo.excel.PayMeetingHotelRecommendExcel; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + *

+ * 会议酒店推荐表 服务实现类 + *

+ * + * @author sz + * @since 2024-07-10 + */ +@Service +public class PayMeetingHotelRecommendServiceImpl extends ServiceImpl implements IPayMeetingHotelRecommendService { + + @Resource + private ISysBaseAPI sysBaseAPI; + @Resource + private PayMeetingHotelRecommendMapper payMeetingHotelRecommendMapper; + + /** + * 分页列表查询 + * + * @param meetingHotelRecommend + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @Override + public IPage queryHotelRecommendS(PayMeetingHotelRecommend meetingHotelRecommend, Integer pageNo, Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(meetingHotelRecommend, req.getParameterMap()); + String recommendPeople = req.getParameter("recommendPeople"); + String hotelName = req.getParameter("hotelName"); + String hotelProvince = req.getParameter("hotelProvince"); + String hotelCity = req.getParameter("hotelCity"); + String isHold = req.getParameter("isHold"); + String meetingType = req.getParameter("meetingType"); + String contact = req.getParameter("contact"); + String remark = req.getParameter("remark"); + if (StringUtils.isNotBlank(recommendPeople)) { + queryWrapper.lambda().like(PayMeetingHotelRecommend::getRecommendPeople,recommendPeople); + } + if (StringUtils.isNotBlank(hotelName)) { + queryWrapper.lambda().like(PayMeetingHotelRecommend::getHotelName,hotelName); + } + if (StringUtils.isNotBlank(hotelProvince)) { + queryWrapper.lambda().like(PayMeetingHotelRecommend::getHotelProvince,hotelProvince); + } + if (StringUtils.isNotBlank(hotelCity)) { + queryWrapper.lambda().like(PayMeetingHotelRecommend::getHotelCity,hotelCity); + } + if (StringUtils.isNotBlank(isHold)) { + queryWrapper.lambda().eq(PayMeetingHotelRecommend::getIsHold,isHold); + } + if (StringUtils.isNotBlank(meetingType)) { + queryWrapper.lambda().eq(PayMeetingHotelRecommend::getMeetingType,meetingType); + } + if (StringUtils.isNotBlank(contact)) { + queryWrapper.lambda().like(PayMeetingHotelRecommend::getContact,contact); + } + if (StringUtils.isNotBlank(remark)) { + queryWrapper.lambda().like(PayMeetingHotelRecommend::getRemark,remark); + } + Page page = new Page(pageNo, pageSize); + return page(page,queryWrapper); + } + + @Override + public void addExcel(List excelData) { + if (excelData.isEmpty()) { + throw new JeroBootException("导入数据为空，请填写数据之后重新导入！"); + } + // 是或否 + Map ynMap = sysBaseAPI.queryDictItemsMapByCode("yn"); + // 会议类型 + Map meetingTypeMap = sysBaseAPI.queryDictItemsMapByCode("meeting_type"); + int errorRowNum = 2; + List errorMessage = new ArrayList<>(); + List insertList = new ArrayList<>(); + for (Object obj : excelData) { + errorRowNum += 1; + PayMeetingHotelRecommendExcel submitExcel = (PayMeetingHotelRecommendExcel) obj; + PayMeetingHotelRecommend payMeetingHotelRecommend = new PayMeetingHotelRecommend(); + List errorList = ValidUtil.validateReturnListWithNum(submitExcel, errorRowNum); + errorMessage.addAll(errorList); + // 是否举办过标院会议 + String isHold = submitExcel.getIsHold(); + if (StringUtils.isBlank(isHold)){ + + }else if (!ynMap.containsKey(isHold)){ + errorMessage.add("第" + errorRowNum + "行：" + "是否举办过标院会议请填写是或否"); + }else { + int isHoldInt = Integer.parseInt(ynMap.get(isHold)); + payMeetingHotelRecommend.setIsHold(isHoldInt); + } + // 曾举办会议类型 + String meetingType = submitExcel.getMeetingType(); + if (StringUtils.isBlank(meetingType)){ + + }else if (!meetingTypeMap.containsKey(meetingType)){ + errorMessage.add("第" + errorRowNum + "行：" + "会议类型不存在"); + }else { + int meetingTypeInt = Integer.parseInt(meetingTypeMap.get(meetingType)); + payMeetingHotelRecommend.setMeetingType(meetingTypeInt); + } + // 推荐人 + if (ValidUtil.checkErrorList(errorList,"推荐人")) { + String amountReceivable = submitExcel.getRecommendPeople(); + payMeetingHotelRecommend.setRecommendPeople(amountReceivable); + } + // 酒店名称 + if (ValidUtil.checkErrorList(errorList,"酒店名称")) { + String hotelName = submitExcel.getHotelName(); + payMeetingHotelRecommend.setHotelName(hotelName); + } + // 所在省份 + if (ValidUtil.checkErrorList(errorList,"所在省份")) { + String hotelProvince = submitExcel.getHotelProvince(); + payMeetingHotelRecommend.setHotelProvince(hotelProvince); + } + // 所在省份 + if (ValidUtil.checkErrorList(errorList,"所在城市")) { + String hotelCity = submitExcel.getHotelCity(); + payMeetingHotelRecommend.setHotelCity(hotelCity); + } + // 所在省份 + if (ValidUtil.checkErrorList(errorList,"酒店联系方式")) { + String contact = submitExcel.getContact(); + payMeetingHotelRecommend.setContact(contact); + } + // 备注 + String remark = submitExcel.getRemark(); + payMeetingHotelRecommend.setRemark(remark); + insertList.add(payMeetingHotelRecommend); + } + if (!errorMessage.isEmpty()) { + StringBuilder msg = new StringBuilder(); + for (String s : errorMessage) { + msg.append(s).append("，请修改！
"); + } + throw new JeroBootException(msg.toString()); + } + // 先将酒店推荐表清空 + payMeetingHotelRecommendMapper.truncateTable(); + // 全量导入 + this.saveBatch(insertList); + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/PayMeetingHotelRecommendExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/PayMeetingHotelRecommendExcel.java new file mode 100644 index 00000000..6025ab33 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/PayMeetingHotelRecommendExcel.java @@ -0,0 +1,69 @@ +package com.jero.meeting.vo.excel; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + *

+ * 会议酒店推荐表 + *

+ * + * @author sz + * @since 2024-07-10 + */ +@Data +public class PayMeetingHotelRecommendExcel implements Serializable { + + @ApiModelProperty(value = "推荐人") + @Excel(name = "推荐人", width = 15) + @NotBlank(message = "推荐人不能为空") + @Size(max = 50, message = "推荐人最大为50字符") + private String recommendPeople; + + @ApiModelProperty(value = "酒店名称") + @Excel(name = "酒店名称", width = 20) + @NotBlank(message = "酒店名称不能为空") + @Size(max = 50, message = "酒店名称最大为50字符") + private String hotelName; + + @ApiModelProperty(value = "所在省份") + @Excel(name = "所在省份", width = 15) + @NotBlank(message = "所在省份不能为空") + @Size(max = 50, message = "所在省份最大为50字符") + private String hotelProvince; + + @ApiModelProperty(value = "所在城市") + @Excel(name = "所在城市", width = 15) + @NotBlank(message = "所在城市不能为空") + @Size(max = 50, message = "所在城市最大为50字符") + private String hotelCity; + + @ApiModelProperty(value = "是否举办过标准院会议 1-是 0-否") + @Excel(name = "是否举办过标准院会议", width = 25) + @NotBlank(message = "是否举办过标准院会议不能为空") + private String isHold; + + @ApiModelProperty(value = "曾举办的会议类型") + @Excel(name = "曾举办的会议类型", width = 25) + @NotBlank(message = "曾举办的会议类型不能为空") + private String meetingType; + + @ApiModelProperty(value = "酒店联系方式") + @Excel(name = "酒店联系方式", width = 15) + @NotBlank(message = "酒店联系方式不能为空") + @Size(max = 50, message = "酒店联系方式最大为50字符") + @Pattern(regexp = "^(1[3-9]\\d{9})$|^(0\\d{2,3}-\\d{7,8})$", message = "酒店联系方式格式错误") + private String contact; + + @ApiModelProperty(value = "备注") + @Excel(name = "备注", width = 15) + @Size(max = 200, message = "备注最大为50字符") + private String remark; + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java index 59e23b89..d9cc224f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java @@ -39,7 +39,7 @@ public class AnnualMemberProjectController extends JeroController> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem, @@ -55,7 +55,7 @@ public class AnnualMemberProjectController extends JeroController pageList = annualMemberProjectService.pageList(req, tbMemberProjectSubitem); 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 dd2376cc..707b19ca 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 @@ -275,6 +275,32 @@ public class PayMemberProjectSubitemController extends JeroController page = new Page<>(-1, -1); IPage getPage = memberProjectSubitemService.getPage(page, queryWrapper); List pageList = getPage.getRecords(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java index dfcc2a10..3269762a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java @@ -7,6 +7,8 @@ import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; @@ -15,7 +17,9 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.oConvertUtils; import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; +import com.jero.company.service.IPayContactsManagementService; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.ITbMemberProjectSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -53,6 +57,8 @@ public class TbMemberProjectSubitemController extends JeroController pageList = tbMemberProjectSubitemService.pageList(request,tbMemberProjectSubitem); List exportList; // 过滤选中数据 @@ -280,12 +297,19 @@ public class TbMemberProjectSubitemController extends JeroController lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(TbMemberProjectSubitem::getId,projectId); + lambdaUpdateWrapper.set(TbMemberProjectSubitem::getEffectiveDate, null); + lambdaUpdateWrapper.set(TbMemberProjectSubitem::getInvalidationDate, null); + lambdaUpdateWrapper.set(TbMemberProjectSubitem::getMemberNo, null); + lambdaUpdateWrapper.set(TbMemberProjectSubitem::getMemberStatus, MemberStatusEnum.UNPAID_FEES.getValue()); + tbMemberProjectSubitemService.update(lambdaUpdateWrapper); + } // 更新项目状态 projectPackService.updateProjectStatus(packCompanyProject.getProjectId(),String.valueOf(projectType),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId()); payPackCompanyProjectService.removeById(packCompanyProject.getId()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 63b81a0e..2ea30a50 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -466,11 +466,11 @@ public class PayWorkingGroupController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubItem, request.getParameterMap()); @@ -949,7 +960,7 @@ public class PayWorkingGroupSubItemController extends JeroController confirmVoucher(@RequestParam(name = "id") String id) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index 358f49c3..b59fe6ba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -255,5 +255,5 @@ public interface IPayWorkingGroupService extends IService { * @param request * @param response */ - void exportAllFile(HttpServletRequest request, HttpServletResponse response); + void exportAllFile(HttpServletRequest request, HttpServletResponse response, PayWorkingGroup payWorkingGroup); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 30468a55..f6a205f9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -15,11 +15,13 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.service.ContractCreateProjectSendMessageService; import com.jero.common.service.RolePermissionService; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.oConvertUtils; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; import com.jero.config.StaticConfig; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; +import com.jero.mail.commont.constant; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.service.IPayMeetingService; @@ -826,14 +828,41 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl roleCodes = new ArrayList<>(Arrays.asList(sysUser.getRoleCode().split(","))); + //管理员和财务查询全部，其余角色查询自己的 + if(!roleCodes.contains(constant.ADMIN)&&!roleCodes.contains(constant.CWRY)){ + payWorkingGroup.setPrincipalA(sysUser.getId()); + payWorkingGroup.setPrincipalB(sysUser.getId()); + } + } else { + throw new JeroBootException("登录用户角色为空！"); } - List selectionList = Arrays.asList(selections.split(",")); - Set addedEntries = new HashSet<>(); // 用于记录已添加的条目路径 + // 创建一个不分页的 Page 对象 + Page page = new Page<>(-1, -1); + // 处理 workingGroupProject 字段 + String workingGroupProject = payWorkingGroup.getWorkingGroupProject(); + if (StringUtils.isNotBlank(workingGroupProject)) { + payWorkingGroup.setWorkingGroupProject(oConvertUtils.replaceAllPercent(workingGroupProject)); + } + // 查询分页列表 + List pageList = payWorkingGroupService.queryPageList(page, payWorkingGroup).getRecords(); + // 获取前端传递的 selections 参数 + String selections = request.getParameter("selections"); + List ids = pageList.stream() + .map(PayWorkingGroupVO::getId) + .collect(Collectors.toList()); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + ids.retainAll(selectionList); // 仅保留在 selections 中的 id + } + if (oConvertUtils.isEmpty(ids)) { + throw new JeroBootException("没有工作组文件可以导出！"); + } + Set addedEntries = new HashSet<>(); // 用于记录已添加的条目路径 try (ZipOutputStream zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()))) { response.reset(); response.setCharacterEncoding("utf-8"); @@ -853,16 +882,16 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl fileList = payWorkingGroupDataFileService.queryListExport(payWorkingGroupDataFile); - PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(projectId); - if (payWorkingGroup == null) { + PayWorkingGroup payWorkingGroupDB = payWorkingGroupService.getById(projectId); + if (payWorkingGroupDB == null) { throw new JeroBootException("工作组不存在！"); } - String groupName = payWorkingGroup.getWorkingGroupProject(); // 获取工作组名称 + String groupName = payWorkingGroupDB.getWorkingGroupProject(); // 获取工作组名称 String groupFolderPath = "工作组资料/" + groupName + "/"; String researchProjectFolderPath = groupFolderPath + "在研项目/"; String otherFilesFolderPath = groupFolderPath + "其他分发资料/"; @@ -959,7 +988,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PayMeeting::getWorkingGroupId, projectId); lambdaQueryWrapper.eq(PayMeeting::getMeetingType, MeetingCommon.WORKING_GROUP_MEETING_INT);