Browse Source

加班信息

EDZ 3 năm trước cách đây
mục cha
commit
b7f310c940
18 tập tin đã thay đổi với 913 bổ sung0 xóa
  1. 167 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/scheduling/controller/BdSchedulingController.java
  2. 81 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/scheduling/entity/BdScheduling.java
  3. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/scheduling/mapper/BdSchedulingMapper.java
  4. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/scheduling/mapper/xml/BdSchedulingMapper.xml
  5. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/scheduling/service/IBdSchedulingService.java
  6. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/scheduling/service/impl/BdSchedulingServiceImpl.java
  7. 167 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/controller/BdShiftController.java
  8. 87 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/entity/BdShift.java
  9. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/mapper/BdShiftMapper.java
  10. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/mapper/xml/BdShiftMapper.xml
  11. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/service/IBdShiftService.java
  12. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/service/impl/BdShiftServiceImpl.java
  13. 167 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/controller/workOvertimeController.java
  14. 79 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/entity/workOvertime.java
  15. 17 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/mapper/workOvertimeMapper.java
  16. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/mapper/xml/workOvertimeMapper.xml
  17. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/service/IworkOvertimeService.java
  18. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/service/impl/workOvertimeServiceImpl.java

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

@@ -0,0 +1,167 @@
+package org.jeecg.modules.scheduling.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.scheduling.entity.BdScheduling;
+import org.jeecg.modules.scheduling.service.IBdSchedulingService;
+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-12-14
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="排班表")
+@RestController
+@RequestMapping("/scheduling/bdScheduling")
+public class BdSchedulingController extends JeecgController<BdScheduling, IBdSchedulingService> {
+	@Autowired
+	private IBdSchedulingService bdSchedulingService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param bdScheduling
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "排班表-分页列表查询")
+	@ApiOperation(value="排班表-分页列表查询", notes="排班表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(BdScheduling bdScheduling,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BdScheduling> queryWrapper = QueryGenerator.initQueryWrapper(bdScheduling, req.getParameterMap());
+		Page<BdScheduling> page = new Page<BdScheduling>(pageNo, pageSize);
+		IPage<BdScheduling> pageList = bdSchedulingService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param bdScheduling
+	 * @return
+	 */
+	@AutoLog(value = "排班表-添加")
+	@ApiOperation(value="排班表-添加", notes="排班表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody BdScheduling bdScheduling) {
+		bdSchedulingService.save(bdScheduling);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param bdScheduling
+	 * @return
+	 */
+	@AutoLog(value = "排班表-编辑")
+	@ApiOperation(value="排班表-编辑", notes="排班表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody BdScheduling bdScheduling) {
+		bdSchedulingService.updateById(bdScheduling);
+		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) {
+		bdSchedulingService.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.bdSchedulingService.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) {
+		BdScheduling bdScheduling = bdSchedulingService.getById(id);
+		return Result.OK(bdScheduling);
+	}
+
+  /**
+   * 导出excel
+   *
+   * @param request
+   * @param bdScheduling
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, BdScheduling bdScheduling) {
+      return super.exportXls(request, bdScheduling, BdScheduling.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, BdScheduling.class);
+  }
+
+}

+ 81 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/scheduling/entity/BdScheduling.java

@@ -0,0 +1,81 @@
+package org.jeecg.modules.scheduling.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-12-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("bd_scheduling")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="bd_scheduling对象", description="排班表")
+public class BdScheduling {
+    
+	/**主键id排班信息表*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键id排班信息表")
+	private String id;
+	/**人员档案主键*/
+	@Excel(name = "人员档案主键", width = 15)
+    @ApiModelProperty(value = "人员档案主键")
+	private String pkPerson;
+	/**排班日期*/
+	@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 dateClass;
+	/**排班-年月*/
+	@Excel(name = "排班-年月", width = 15)
+    @ApiModelProperty(value = "排班-年月")
+	private String dateNy;
+	/**排班-日*/
+	@Excel(name = "排班-日", width = 15)
+    @ApiModelProperty(value = "排班-日")
+	private String dateR;
+	/**班次档案*/
+	@Excel(name = "班次档案", width = 15)
+    @ApiModelProperty(value = "班次档案")
+	private String pkShift;
+	/**状态 1正常,0关闭*/
+	@Excel(name = "状态 1正常,0关闭", width = 15)
+    @ApiModelProperty(value = "状态 1正常,0关闭")
+	private Integer state;
+	/**创建人*/
+	@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;
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.scheduling.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.scheduling.entity.BdScheduling;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 排班表
+ * @Author: jeecg-boot
+ * @Date:   2021-12-14
+ * @Version: V1.0
+ */
+public interface BdSchedulingMapper extends BaseMapper<BdScheduling> {
+
+}

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

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.scheduling.service;
+
+import org.jeecg.modules.scheduling.entity.BdScheduling;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 排班表
+ * @Author: jeecg-boot
+ * @Date:   2021-12-14
+ * @Version: V1.0
+ */
+public interface IBdSchedulingService extends IService<BdScheduling> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.scheduling.service.impl;
+
+import org.jeecg.modules.scheduling.entity.BdScheduling;
+import org.jeecg.modules.scheduling.mapper.BdSchedulingMapper;
+import org.jeecg.modules.scheduling.service.IBdSchedulingService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 排班表
+ * @Author: jeecg-boot
+ * @Date:   2021-12-14
+ * @Version: V1.0
+ */
+@Service
+public class BdSchedulingServiceImpl extends ServiceImpl<BdSchedulingMapper, BdScheduling> implements IBdSchedulingService {
+
+}

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

@@ -0,0 +1,167 @@
+package org.jeecg.modules.schedulingInformation.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 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.jeecg.modules.schedulingInformation.entity.BdShift;
+import org.jeecg.modules.schedulingInformation.service.IBdShiftService;
+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-11-26
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="班次档案")
+@RestController
+@RequestMapping("/schedulingInformation/bdShift")
+public class BdShiftController extends JeecgController<BdShift, IBdShiftService> {
+	@Autowired
+	private IBdShiftService bdShiftService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param bdShift
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "班次档案-分页列表查询")
+	@ApiOperation(value="班次档案-分页列表查询", notes="班次档案-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(BdShift bdShift,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BdShift> queryWrapper = QueryGenerator.initQueryWrapper(bdShift, req.getParameterMap());
+		Page<BdShift> page = new Page<BdShift>(pageNo, pageSize);
+		IPage<BdShift> pageList = bdShiftService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param bdShift
+	 * @return
+	 */
+	@AutoLog(value = "班次档案-添加")
+	@ApiOperation(value="班次档案-添加", notes="班次档案-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody BdShift bdShift) {
+		bdShiftService.save(bdShift);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param bdShift
+	 * @return
+	 */
+	@AutoLog(value = "班次档案-编辑")
+	@ApiOperation(value="班次档案-编辑", notes="班次档案-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody BdShift bdShift) {
+		bdShiftService.updateById(bdShift);
+		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) {
+		bdShiftService.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.bdShiftService.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) {
+		BdShift bdShift = bdShiftService.getById(id);
+		return Result.OK(bdShift);
+	}
+
+  /**
+   * 导出excel
+   *
+   * @param request
+   * @param bdShift
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, BdShift bdShift) {
+      return super.exportXls(request, bdShift, BdShift.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, BdShift.class);
+  }
+
+}

+ 87 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/schedulingInformation/entity/BdShift.java

@@ -0,0 +1,87 @@
+package org.jeecg.modules.schedulingInformation.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.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 班次档案
+ * @Author: jeecg-boot
+ * @Date:   2021-11-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("bd_shift")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="bd_shift对象", description="班次档案")
+public class BdShift {
+    
+	/**主键id班次表*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键id班次表")
+	private String id;
+	/**班次编码*/
+	@Excel(name = "班次编码", width = 15)
+    @ApiModelProperty(value = "班次编码")
+	private String code;
+	/**班次名称*/
+	@Excel(name = "班次名称", width = 15)
+    @ApiModelProperty(value = "班次名称")
+	private String name;
+	/**开始时间*/
+	@Excel(name = "开始时间", width = 20)
+    @ApiModelProperty(value = "开始时间")
+	private String beginTime;
+	/**结束时间*/
+	@Excel(name = "结束时间", width = 20)
+	@ApiModelProperty(value = "结束时间")
+	private String endTime;
+	/**0正常,1关闭*/
+	@Excel(name = "1正常,0关闭", width = 15)
+    @ApiModelProperty(value = "1正常,0关闭")
+	@Dict(dicCode = "valid_status")
+	private Integer state;
+	/**创建人*/
+	@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 deleteBy;
+	/**删除时间*/
+	@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 deleteTime;
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.schedulingInformation.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.schedulingInformation.entity.BdShift;
+
+/**
+ * @Description: 班次档案
+ * @Author: jeecg-boot
+ * @Date:   2021-11-26
+ * @Version: V1.0
+ */
+public interface BdShiftMapper extends BaseMapper<BdShift> {
+
+}

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

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.schedulingInformation.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.schedulingInformation.entity.BdShift;
+
+/**
+ * @Description: 班次档案
+ * @Author: jeecg-boot
+ * @Date:   2021-11-26
+ * @Version: V1.0
+ */
+public interface IBdShiftService extends IService<BdShift> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.schedulingInformation.service.impl;
+
+import org.jeecg.modules.schedulingInformation.entity.BdShift;
+import org.jeecg.modules.schedulingInformation.mapper.BdShiftMapper;
+import org.jeecg.modules.schedulingInformation.service.IBdShiftService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 班次档案
+ * @Author: jeecg-boot
+ * @Date:   2021-11-26
+ * @Version: V1.0
+ */
+@Service
+public class BdShiftServiceImpl extends ServiceImpl<BdShiftMapper, BdShift> implements IBdShiftService {
+
+}

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

@@ -0,0 +1,167 @@
+package org.jeecg.modules.workOvertime.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.workOvertime.entity.workOvertime;
+import org.jeecg.modules.workOvertime.service.IworkOvertimeService;
+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-12-21
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="加班表")
+@RestController
+@RequestMapping("/workOvertime/workOvertime")
+public class workOvertimeController extends JeecgController<workOvertime, IworkOvertimeService> {
+	@Autowired
+	private IworkOvertimeService workOvertimeService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param workOvertime
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "加班表-分页列表查询")
+	@ApiOperation(value="加班表-分页列表查询", notes="加班表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(workOvertime workOvertime,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<workOvertime> queryWrapper = QueryGenerator.initQueryWrapper(workOvertime, req.getParameterMap());
+		Page<workOvertime> page = new Page<workOvertime>(pageNo, pageSize);
+		IPage<workOvertime> pageList = workOvertimeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param workOvertime
+	 * @return
+	 */
+	@AutoLog(value = "加班表-添加")
+	@ApiOperation(value="加班表-添加", notes="加班表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody workOvertime workOvertime) {
+		workOvertimeService.save(workOvertime);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param workOvertime
+	 * @return
+	 */
+	@AutoLog(value = "加班表-编辑")
+	@ApiOperation(value="加班表-编辑", notes="加班表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody workOvertime workOvertime) {
+		workOvertimeService.updateById(workOvertime);
+		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) {
+		workOvertimeService.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.workOvertimeService.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) {
+		workOvertime workOvertime = workOvertimeService.getById(id);
+		return Result.OK(workOvertime);
+	}
+
+  /**
+   * 导出excel
+   *
+   * @param request
+   * @param workOvertime
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, workOvertime workOvertime) {
+      return super.exportXls(request, workOvertime, workOvertime.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, workOvertime.class);
+  }
+
+}

+ 79 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/entity/workOvertime.java

@@ -0,0 +1,79 @@
+package org.jeecg.modules.workOvertime.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-12-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("bd_work_overtime")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="bd_work_overtime对象", description="加班表")
+public class workOvertime {
+    
+	/**主键id加班信息表*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键id加班信息表")
+	private String id;
+	/**加班人员*/
+	@Excel(name = "加班人员", width = 15)
+    @ApiModelProperty(value = "加班人员")
+	private String person;
+	/**审批编号*/
+	@Excel(name = "审批编号", width = 15)
+    @ApiModelProperty(value = "审批编号")
+	private String code;
+	/**提交时间*/
+	@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 commitDate;
+	/**申请人部门*/
+	@Excel(name = "申请人部门", width = 15)
+    @ApiModelProperty(value = "申请人部门")
+	private String dept;
+	/**加班事由*/
+	@Excel(name = "加班事由", width = 15)
+    @ApiModelProperty(value = "加班事由")
+	private String demo;
+	/**开始时间*/
+	@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 beginDate;
+	/**结束时间*/
+	@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 endDate;
+	/**加班时长*/
+	@Excel(name = "加班时长", width = 15)
+    @ApiModelProperty(value = "加班时长")
+	private String duration;
+	/**创建时间*/
+	@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;
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.workOvertime.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.workOvertime.entity.workOvertime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 加班表
+ * @Author: jeecg-boot
+ * @Date:   2021-12-21
+ * @Version: V1.0
+ */
+public interface workOvertimeMapper extends BaseMapper<workOvertime> {
+
+}

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

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.workOvertime.service;
+
+import org.jeecg.modules.workOvertime.entity.workOvertime;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 加班表
+ * @Author: jeecg-boot
+ * @Date:   2021-12-21
+ * @Version: V1.0
+ */
+public interface IworkOvertimeService extends IService<workOvertime> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.workOvertime.service.impl;
+
+import org.jeecg.modules.workOvertime.entity.workOvertime;
+import org.jeecg.modules.workOvertime.mapper.workOvertimeMapper;
+import org.jeecg.modules.workOvertime.service.IworkOvertimeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 加班表
+ * @Author: jeecg-boot
+ * @Date:   2021-12-21
+ * @Version: V1.0
+ */
+@Service
+public class workOvertimeServiceImpl extends ServiceImpl<workOvertimeMapper, workOvertime> implements IworkOvertimeService {
+
+}