chenc 3 anni fa
parent
commit
ab807291cc

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

@@ -0,0 +1,167 @@
+package org.jeecg.modules.oa.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+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.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.oa.entity.CdEnterpriseEnnouncement;
+import org.jeecg.modules.oa.service.ICdEnterpriseEnnouncementService;
+import java.util.Date;
+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.common.system.base.controller.JeecgController;
+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.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;
+
+ /**
+ * @Description: 企业公告
+ * @Author: jeecg-boot
+ * @Date:   2021-10-21
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="企业公告")
+@RestController
+@RequestMapping("/oa/cdEnterpriseEnnouncement")
+public class CdEnterpriseEnnouncementController extends JeecgController<CdEnterpriseEnnouncement, ICdEnterpriseEnnouncementService> {
+	@Autowired
+	private ICdEnterpriseEnnouncementService cdEnterpriseEnnouncementService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cdEnterpriseEnnouncement
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "企业公告-分页列表查询")
+	@ApiOperation(value="企业公告-分页列表查询", notes="企业公告-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(CdEnterpriseEnnouncement cdEnterpriseEnnouncement,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CdEnterpriseEnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(cdEnterpriseEnnouncement, req.getParameterMap());
+		Page<CdEnterpriseEnnouncement> page = new Page<CdEnterpriseEnnouncement>(pageNo, pageSize);
+		IPage<CdEnterpriseEnnouncement> pageList = cdEnterpriseEnnouncementService.page(page, queryWrapper);
+		return Result.ok(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param cdEnterpriseEnnouncement
+	 * @return
+	 */
+	@AutoLog(value = "企业公告-添加")
+	@ApiOperation(value="企业公告-添加", notes="企业公告-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody CdEnterpriseEnnouncement cdEnterpriseEnnouncement) {
+		cdEnterpriseEnnouncementService.save(cdEnterpriseEnnouncement);
+		return Result.ok("添加成功!");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param cdEnterpriseEnnouncement
+	 * @return
+	 */
+	@AutoLog(value = "企业公告-编辑")
+	@ApiOperation(value="企业公告-编辑", notes="企业公告-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody CdEnterpriseEnnouncement cdEnterpriseEnnouncement) {
+		cdEnterpriseEnnouncementService.updateById(cdEnterpriseEnnouncement);
+		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) {
+		cdEnterpriseEnnouncementService.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.cdEnterpriseEnnouncementService.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) {
+		CdEnterpriseEnnouncement cdEnterpriseEnnouncement = cdEnterpriseEnnouncementService.getById(id);
+		return Result.ok(cdEnterpriseEnnouncement);
+	}
+
+  /**
+   * 导出excel
+   *
+   * @param request
+   * @param cdEnterpriseEnnouncement
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, CdEnterpriseEnnouncement cdEnterpriseEnnouncement) {
+      return super.exportXls(request, cdEnterpriseEnnouncement, CdEnterpriseEnnouncement.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, CdEnterpriseEnnouncement.class);
+  }
+
+}

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

@@ -0,0 +1,75 @@
+package org.jeecg.modules.oa.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 企业公告
+ * @Author: jeecg-boot
+ * @Date:   2021-10-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("cd_enterprise_announcement")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="cd_enterprise_announcement对象", description="企业公告")
+public class CdEnterpriseEnnouncement {
+    
+	/**主键*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+	private String id;
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+	private String type;
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+    @ApiModelProperty(value = "标题")
+	private String title;
+	/**内容*/
+	@Excel(name = "内容", width = 15)
+    @ApiModelProperty(value = "内容")
+	private Object content;
+	/**创建人*/
+	@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 pkOrg;
+	/**删除标记(0正常1删除)*/
+	@Excel(name = "删除标记(0正常1删除)", width = 15)
+    @ApiModelProperty(value = "删除标记(0正常1删除)")
+	private String delFlag;
+}

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

@@ -96,6 +96,9 @@ public class CdSchedule {
 	//删除标记
 	private String delFlag;
 
+	//颜色
+	private String backgroundColor;
+
 	//查询计划数量的条件 (0无时间筛选1查询上月的2本月)
 	@TableField(exist = false)
 	private String whereTimeType;

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.oa.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.oa.entity.CdEnterpriseEnnouncement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 企业公告
+ * @Author: jeecg-boot
+ * @Date:   2021-10-21
+ * @Version: V1.0
+ */
+public interface CdEnterpriseEnnouncementMapper extends BaseMapper<CdEnterpriseEnnouncement> {
+
+}

+ 5 - 0
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/mapper/xml/CdEnterpriseEnnouncementMapper.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.CdEnterpriseEnnouncementMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.oa.service;
+
+import org.jeecg.modules.oa.entity.CdEnterpriseEnnouncement;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 企业公告
+ * @Author: jeecg-boot
+ * @Date:   2021-10-21
+ * @Version: V1.0
+ */
+public interface ICdEnterpriseEnnouncementService extends IService<CdEnterpriseEnnouncement> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.oa.service.impl;
+
+import org.jeecg.modules.oa.entity.CdEnterpriseEnnouncement;
+import org.jeecg.modules.oa.mapper.CdEnterpriseEnnouncementMapper;
+import org.jeecg.modules.oa.service.ICdEnterpriseEnnouncementService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 企业公告
+ * @Author: jeecg-boot
+ * @Date:   2021-10-21
+ * @Version: V1.0
+ */
+@Service
+public class CdEnterpriseEnnouncementServiceImpl extends ServiceImpl<CdEnterpriseEnnouncementMapper, CdEnterpriseEnnouncement> implements ICdEnterpriseEnnouncementService {
+
+}