Ver código fonte

会务申请和管理页面后端

xieyn 1 ano atrás
pai
commit
15b99bc598
12 arquivos alterados com 673 adições e 0 exclusões
  1. 171 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/ConferenceApplyController.java
  2. 172 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/ConferenceMinutesController.java
  3. 122 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ConferenceApply.java
  4. 92 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ConferenceMinutes.java
  5. 17 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/ConferenceApplyMapper.java
  6. 17 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/ConferenceMinutesMapper.java
  7. 5 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/ConferenceApplyMapper.xml
  8. 5 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/ConferenceMinutesMapper.xml
  9. 14 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IConferenceApplyService.java
  10. 15 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IConferenceMinutesService.java
  11. 19 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/ConferenceApplyServiceImpl.java
  12. 24 0
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/ConferenceMinutesServiceImpl.java

+ 171 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/ConferenceApplyController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.oa.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.oa.entity.ConferenceApply;
+import org.jeecg.modules.oa.service.IConferenceApplyService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 会务安排申请
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+@Api(tags="会务安排申请")
+@RestController
+@RequestMapping("/conferenceApply/conferenceApply")
+@Slf4j
+public class ConferenceApplyController extends JeecgController<ConferenceApply, IConferenceApplyService> {
+	@Autowired
+	private IConferenceApplyService conferenceApplyService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param conferenceApply
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "会务安排申请-分页列表查询")
+	@ApiOperation(value="会务安排申请-分页列表查询", notes="会务安排申请-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(ConferenceApply conferenceApply,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ConferenceApply> queryWrapper = QueryGenerator.initQueryWrapper(conferenceApply, req.getParameterMap());
+		Page<ConferenceApply> page = new Page<ConferenceApply>(pageNo, pageSize);
+		IPage<ConferenceApply> pageList = conferenceApplyService.page(page, queryWrapper);
+		return Result.ok(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param conferenceApply
+	 * @return
+	 */
+	@AutoLog(value = "会务安排申请-添加")
+	@ApiOperation(value="会务安排申请-添加", notes="会务安排申请-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody ConferenceApply conferenceApply) {
+		conferenceApplyService.save(conferenceApply);
+		return Result.ok("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param conferenceApply
+	 * @return
+	 */
+	@AutoLog(value = "会务安排申请-编辑")
+	@ApiOperation(value="会务安排申请-编辑", notes="会务安排申请-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody ConferenceApply conferenceApply) {
+		conferenceApplyService.updateById(conferenceApply);
+		return Result.ok("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "会务安排申请-通过id删除")
+	@ApiOperation(value="会务安排申请-通过id删除", notes="会务安排申请-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		conferenceApplyService.removeById(id);
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "会务安排申请-批量删除")
+	@ApiOperation(value="会务安排申请-批量删除", notes="会务安排申请-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.conferenceApplyService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.ok("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "会务安排申请-通过id查询")
+	@ApiOperation(value="会务安排申请-通过id查询", notes="会务安排申请-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ConferenceApply conferenceApply = conferenceApplyService.getById(id);
+		if(conferenceApply==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.ok(conferenceApply);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param conferenceApply
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ConferenceApply conferenceApply) {
+        return super.exportXls(request, conferenceApply, ConferenceApply.class, "会务安排申请");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ConferenceApply.class);
+    }
+
+}

+ 172 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/ConferenceMinutesController.java

@@ -0,0 +1,172 @@
+package org.jeecg.modules.oa.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.oa.entity.ConferenceMinutes;
+import org.jeecg.modules.oa.service.IConferenceMinutesService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 会议纪要管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+@Api(tags="会议纪要管理")
+@RestController
+@RequestMapping("/conferenceMinutes/conferenceMinutes")
+@Slf4j
+public class ConferenceMinutesController extends JeecgController<ConferenceMinutes, IConferenceMinutesService> {
+	@Autowired
+	private IConferenceMinutesService conferenceMinutesService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param conferenceMinutes
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "会议纪要管理-分页列表查询")
+	@ApiOperation(value="会议纪要管理-分页列表查询", notes="会议纪要管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(ConferenceMinutes conferenceMinutes,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ConferenceMinutes> queryWrapper = QueryGenerator.initQueryWrapper(conferenceMinutes, req.getParameterMap());
+		Page<ConferenceMinutes> page = new Page<ConferenceMinutes>(pageNo, pageSize);
+		IPage<ConferenceMinutes> pageList = conferenceMinutesService.page(page, queryWrapper);
+		return Result.ok(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param conferenceMinutes
+	 * @return
+	 */
+	@AutoLog(value = "会议纪要管理-添加")
+	@ApiOperation(value="会议纪要管理-添加", notes="会议纪要管理-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody ConferenceMinutes conferenceMinutes) {
+		conferenceMinutesService.save(conferenceMinutes);
+		return Result.ok("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param conferenceMinutes
+	 * @return
+	 */
+	@AutoLog(value = "会议纪要管理-编辑")
+	@ApiOperation(value="会议纪要管理-编辑", notes="会议纪要管理-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody ConferenceMinutes conferenceMinutes) {
+		conferenceMinutesService.updateById(conferenceMinutes);
+		return Result.ok("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "会议纪要管理-通过id删除")
+	@ApiOperation(value="会议纪要管理-通过id删除", notes="会议纪要管理-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		conferenceMinutesService.removeById(id);
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "会议纪要管理-批量删除")
+	@ApiOperation(value="会议纪要管理-批量删除", notes="会议纪要管理-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.conferenceMinutesService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.ok("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "会议纪要管理-通过id查询")
+	@ApiOperation(value="会议纪要管理-通过id查询", notes="会议纪要管理-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ConferenceMinutes conferenceMinutes = conferenceMinutesService.getById(id);
+		if(conferenceMinutes==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.ok(conferenceMinutes);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param conferenceMinutes
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ConferenceMinutes conferenceMinutes) {
+        return super.exportXls(request, conferenceMinutes, ConferenceMinutes.class, "会议纪要管理");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ConferenceMinutes.class);
+    }
+
+}

+ 122 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ConferenceApply.java

@@ -0,0 +1,122 @@
+package org.jeecg.modules.oa.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 会务安排申请
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+@Data
+@TableName("conference_apply")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="conference_apply对象", description="会务安排申请")
+public class ConferenceApply implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@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")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+	@Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@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")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+	@Excel(name = "所属部门", width = 15)
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**会议议题*/
+	@Excel(name = "会议议题", width = 15)
+    @ApiModelProperty(value = "会议议题")
+    private String conferenceTitle;
+	/**会议信息发布人*/
+	@Excel(name = "会议信息发布人", width = 15)
+    @ApiModelProperty(value = "会议信息发布人")
+    private String postedPerson;
+	/**发布部门*/
+	@Excel(name = "发布部门", width = 15)
+    @ApiModelProperty(value = "发布部门")
+    private String postedDept;
+	/**发布日期*/
+	@Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "发布日期")
+    private Date postedDate;
+	/**会议日期*/
+	@Excel(name = "会议日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "会议日期")
+    private Date conferenceDate;
+	/**开始时间*/
+	@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")
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+	/**结束时间*/
+	@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")
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+	/**会议地点*/
+	@Excel(name = "会议地点", width = 15)
+    @ApiModelProperty(value = "会议地点")
+    private String conferenceAddress;
+	/**出席人员*/
+	@Excel(name = "出席人员", width = 15)
+    @ApiModelProperty(value = "出席人员")
+    private String attendPerson;
+	/**出席部门*/
+	@Excel(name = "出席部门", width = 15)
+    @ApiModelProperty(value = "出席部门")
+    private String attendDept;
+	/**其他参会人*/
+	@Excel(name = "其他参会人", width = 15)
+    @ApiModelProperty(value = "其他参会人")
+    private String otherPerson;
+	/**会议内容*/
+	@Excel(name = "会议内容", width = 15)
+    @ApiModelProperty(value = "会议内容")
+    private String conferenceContent;
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+    private String file;
+}

+ 92 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/ConferenceMinutes.java

@@ -0,0 +1,92 @@
+package org.jeecg.modules.oa.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 会议纪要管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+@Data
+@TableName("conference_minutes")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="conference_minutes对象", description="会议纪要管理")
+public class ConferenceMinutes implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@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")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+	@Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@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")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+	@Excel(name = "所属部门", width = 15)
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**会议纪要编号*/
+	@Excel(name = "会议纪要编号", width = 15)
+    @ApiModelProperty(value = "会议纪要编号")
+    private String minutesId;
+	/**会议议题*/
+	@Excel(name = "会议议题", width = 15)
+    @ApiModelProperty(value = "会议议题")
+    private String conferenceTitle;
+	/**上传人*/
+	@Excel(name = "上传人", width = 15)
+    @ApiModelProperty(value = "上传人")
+    private String uploadPerson;
+	/**上传部门*/
+	@Excel(name = "上传部门", width = 15)
+    @ApiModelProperty(value = "上传部门")
+    private String uploadDept;
+	/**上传时间*/
+	@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")
+    @ApiModelProperty(value = "上传时间")
+    private Date uploadDate;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+    private String file;
+}

+ 17 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/ConferenceApplyMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.oa.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.oa.entity.ConferenceApply;
+
+/**
+ * @Description: 会务安排申请
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+public interface ConferenceApplyMapper extends BaseMapper<ConferenceApply> {
+
+}

+ 17 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/ConferenceMinutesMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.oa.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.oa.entity.ConferenceMinutes;
+
+/**
+ * @Description: 会议纪要管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+public interface ConferenceMinutesMapper extends BaseMapper<ConferenceMinutes> {
+
+}

+ 5 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/ConferenceApplyMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.oa.mapper.ConferenceApplyMapper">
+
+</mapper>

+ 5 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/ConferenceMinutesMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.oa.mapper.ConferenceMinutesMapper">
+
+</mapper>

+ 14 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IConferenceApplyService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.oa.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.oa.entity.ConferenceApply;
+
+/**
+ * @Description: 会务安排申请
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+public interface IConferenceApplyService extends IService<ConferenceApply> {
+
+}

+ 15 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/IConferenceMinutesService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.oa.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.oa.entity.ConferenceMinutes;
+import org.jeecg.modules.oa.entity.SealArchives;
+
+/**
+ * @Description: 会议纪要管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+public interface IConferenceMinutesService extends IService<ConferenceMinutes> {
+
+}

+ 19 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/ConferenceApplyServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.oa.service.impl;
+
+import org.jeecg.modules.oa.entity.ConferenceApply;
+import org.jeecg.modules.oa.mapper.ConferenceApplyMapper;
+import org.jeecg.modules.oa.service.IConferenceApplyService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 会务安排申请
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+@Service
+public class ConferenceApplyServiceImpl extends ServiceImpl<ConferenceApplyMapper, ConferenceApply> implements IConferenceApplyService {
+
+}

+ 24 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/ConferenceMinutesServiceImpl.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.oa.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.oa.entity.ConferenceMinutes;
+import org.jeecg.modules.oa.entity.SealArchives;
+import org.jeecg.modules.oa.mapper.ConferenceMinutesMapper;
+import org.jeecg.modules.oa.service.IConferenceMinutesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 会议纪要管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-23
+ * @Version: V1.0
+ */
+@Service
+public class ConferenceMinutesServiceImpl extends ServiceImpl<ConferenceMinutesMapper, ConferenceMinutes> implements IConferenceMinutesService {
+
+}