值班排班接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/DutyEmpController.java

@@ -0,0 +1,115 @@
+package com.ruoyi.web.controller.zhdd;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zhdd.domain.DutyEmp;
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zhdd.domain.vo.DutyEmpVo;
+import com.ruoyi.zhdd.domain.bo.DutyEmpBo;
+import com.ruoyi.zhdd.service.IDutyEmpService;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 值班排班信息Controller
+ *
+ * @author xintong
+ * @date 2021-10-11
+ */
+@Validated
+@Api(value = "值班排班信息控制器", tags = {"值班排班信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/zhdd/dutyEmp")
+public class DutyEmpController extends BaseController {
+
+    private final IDutyEmpService iDutyEmpService;
+
+    /**
+     * 查询值班排班信息列表
+     */
+    @ApiOperation("查询值班排班信息列表")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:list')")
+    @GetMapping("/list")
+    public AjaxResult<List<DutyEmpVo>> list(@Validated(QueryGroup.class) DutyEmpBo bo) {
+        return AjaxResult.success(iDutyEmpService.listVo(Wrappers.<DutyEmp>lambdaQuery().orderByAsc(DutyEmp::getPeriod)));
+    }
+
+    /**
+     * 导出值班排班信息列表
+     */
+    @ApiOperation("导出值班排班信息列表")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:export')")
+    @Log(title = "值班排班信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated DutyEmpBo bo, HttpServletResponse response) {
+        List<DutyEmpVo> list = iDutyEmpService.queryList(bo);
+        ExcelUtil.exportExcel(list, "值班排班信息", DutyEmpVo.class, response);
+    }
+
+    /**
+     * 获取值班排班信息详细信息
+     */
+    @ApiOperation("获取值班排班信息详细信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<DutyEmpVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iDutyEmpService.queryById(id));
+    }
+
+    /**
+     * 新增值班排班信息
+     */
+    @ApiOperation("新增值班排班信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:add')")
+    @Log(title = "值班排班信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody DutyEmpBo bo) {
+        return toAjax(iDutyEmpService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改值班排班信息
+     */
+    @ApiOperation("修改值班排班信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:edit')")
+    @Log(title = "值班排班信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody DutyEmpBo bo) {
+        return toAjax(iDutyEmpService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除值班排班信息
+     */
+    @ApiOperation("删除值班排班信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:remove')")
+    @Log(title = "值班排班信息" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iDutyEmpService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/DutyReportController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.zhdd;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zhdd.domain.vo.DutyReportVo;
+import com.ruoyi.zhdd.domain.bo.DutyReportBo;
+import com.ruoyi.zhdd.service.IDutyReportService;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 值班报告信息Controller
+ *
+ * @author xintong
+ * @date 2021-10-11
+ */
+@Validated
+@Api(value = "值班报告信息控制器", tags = {"值班报告信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/zhdd/dutyReport")
+public class DutyReportController extends BaseController {
+
+    private final IDutyReportService iDutyReportService;
+
+    /**
+     * 查询值班报告信息列表
+     */
+    @ApiOperation("查询值班报告信息列表")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:list')")
+    @GetMapping("/list")
+    public TableDataInfo<DutyReportVo> list(@Validated(QueryGroup.class) DutyReportBo bo) {
+        return iDutyReportService.queryPageList(bo);
+    }
+
+    /**
+     * 导出值班报告信息列表
+     */
+    @ApiOperation("导出值班报告信息列表")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:export')")
+    @Log(title = "值班报告信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated DutyReportBo bo, HttpServletResponse response) {
+        List<DutyReportVo> list = iDutyReportService.queryList(bo);
+        ExcelUtil.exportExcel(list, "值班报告信息", DutyReportVo.class, response);
+    }
+
+    /**
+     * 获取值班报告信息详细信息
+     */
+    @ApiOperation("获取值班报告信息详细信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<DutyReportVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iDutyReportService.queryById(id));
+    }
+
+    /**
+     * 新增值班报告信息
+     */
+    @ApiOperation("新增值班报告信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:add')")
+    @Log(title = "值班报告信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody DutyReportBo bo) {
+        return toAjax(iDutyReportService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改值班报告信息
+     */
+    @ApiOperation("修改值班报告信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:edit')")
+    @Log(title = "值班报告信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody DutyReportBo bo) {
+        return toAjax(iDutyReportService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除值班报告信息
+     */
+    @ApiOperation("删除值班报告信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:remove')")
+    @Log(title = "值班报告信息" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iDutyReportService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/JgyDutyCommandContController.java

@@ -1,115 +0,0 @@
-package com.ruoyi.web.controller.zhdd;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zhdd.domain.vo.JgyDutyCommandContVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyCommandContBo;
-import com.ruoyi.zhdd.service.IJgyDutyCommandContService;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 日常值班登记Controller
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Validated
-@Api(value = "日常值班登记控制器", tags = {"日常值班登记管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/zhdd/dutyCommandCont")
-public class JgyDutyCommandContController extends BaseController {
-
-    private final IJgyDutyCommandContService iJgyDutyCommandContService;
-
-    /**
-     * 查询日常值班登记列表
-     */
-    @ApiOperation("查询日常值班登记列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyCommandCont:list')")
-    @GetMapping("/list")
-    public TableDataInfo<JgyDutyCommandContVo> list(@Validated(QueryGroup.class) JgyDutyCommandContBo bo) {
-        return iJgyDutyCommandContService.queryPageList(bo);
-    }
-
-    /**
-     * 导出日常值班登记列表
-     */
-    @ApiOperation("导出日常值班登记列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyCommandCont:export')")
-    @Log(title = "日常值班登记", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(@Validated JgyDutyCommandContBo bo, HttpServletResponse response) {
-        List<JgyDutyCommandContVo> list = iJgyDutyCommandContService.queryList(bo);
-        ExcelUtil.exportExcel(list, "日常值班登记", JgyDutyCommandContVo.class, response);
-    }
-
-    /**
-     * 获取日常值班登记详细信息
-     */
-    @ApiOperation("获取日常值班登记详细信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyCommandCont:query')")
-    @GetMapping("/{duId}")
-    public AjaxResult<JgyDutyCommandContVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("duId") Long duId) {
-        return AjaxResult.success(iJgyDutyCommandContService.queryById(duId));
-    }
-
-    /**
-     * 新增日常值班登记
-     */
-    @ApiOperation("新增日常值班登记")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyCommandCont:add')")
-    @Log(title = "日常值班登记", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody JgyDutyCommandContBo bo) {
-        return toAjax(iJgyDutyCommandContService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改日常值班登记
-     */
-    @ApiOperation("修改日常值班登记")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyCommandCont:edit')")
-    @Log(title = "日常值班登记", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody JgyDutyCommandContBo bo) {
-        return toAjax(iJgyDutyCommandContService.updateByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除日常值班登记
-     */
-    @ApiOperation("删除日常值班登记")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyCommandCont:remove')")
-    @Log(title = "日常值班登记" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{duIds}")
-    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] duIds) {
-        return toAjax(iJgyDutyCommandContService.deleteWithValidByIds(Arrays.asList(duIds), true) ? 1 : 0);
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/JgyDutyEmpController.java

@@ -1,113 +0,0 @@
-package com.ruoyi.web.controller.zhdd;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zhdd.domain.vo.JgyDutyEmpVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyEmpBo;
-import com.ruoyi.zhdd.service.IJgyDutyEmpService;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 值班人员Controller
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Validated
-@Api(value = "值班人员控制器", tags = {"值班人员管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/zhdd/dutyEmp")
-public class JgyDutyEmpController extends BaseController {
-
-    private final IJgyDutyEmpService iJgyDutyEmpService;
-
-    /**
-     * 查询值班人员列表
-     */
-    @ApiOperation("查询值班人员列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:list')")
-    @GetMapping("/list")
-    public TableDataInfo<JgyDutyEmpVo> list(@Validated(QueryGroup.class) JgyDutyEmpBo bo) {
-        return iJgyDutyEmpService.queryPageList(bo);
-    }
-
-    /**
-     * 导出值班人员列表
-     */
-    @ApiOperation("导出值班人员列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:export')")
-    @Log(title = "值班人员", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(@Validated JgyDutyEmpBo bo, HttpServletResponse response) {
-        List<JgyDutyEmpVo> list = iJgyDutyEmpService.queryList(bo);
-        ExcelUtil.exportExcel(list, "值班人员", JgyDutyEmpVo.class, response);
-    }
-
-    /**
-     * 获取值班人员详细信息
-     */
-    @ApiOperation("获取值班人员详细信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:query')")
-    @GetMapping("/{deId}")
-    public AjaxResult<JgyDutyEmpVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("deId") Long deId) {
-        return AjaxResult.success(iJgyDutyEmpService.queryById(deId));
-    }
-
-    /**
-     * 新增值班人员
-     */
-    @ApiOperation("新增值班人员")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:add')")
-    @Log(title = "值班人员", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody JgyDutyEmpBo bo) {
-        return toAjax(iJgyDutyEmpService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改值班人员
-     */
-    @ApiOperation("修改值班人员")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:edit')")
-    @Log(title = "值班人员", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody JgyDutyEmpBo bo) {
-        return toAjax(iJgyDutyEmpService.updateByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除值班人员
-     */
-    @ApiOperation("删除值班人员")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:remove')")
-    @Log(title = "值班人员" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{deIds}")
-    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] deIds) {
-        return toAjax(iJgyDutyEmpService.deleteWithValidByIds(Arrays.asList(deIds), true) ? 1 : 0);
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/JgyDutyGroupController.java

@@ -1,90 +0,0 @@
-package com.ruoyi.web.controller.zhdd;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zhdd.domain.vo.JgyDutyGroupVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyGroupBo;
-import com.ruoyi.zhdd.service.IJgyDutyGroupService;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 值班组信息Controller
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Validated
-@Api(value = "值班组信息控制器", tags = {"值班组信息管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/zhdd/dutyGroup")
-public class JgyDutyGroupController extends BaseController {
-
-    private final IJgyDutyGroupService iJgyDutyGroupService;
-
-    /**
-     * 查询值班组信息列表
-     */
-    @ApiOperation("查询值班组信息列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroup:list')")
-    @GetMapping("/list")
-    public AjaxResult list(@Validated(QueryGroup.class) JgyDutyGroupBo bo) {
-        return AjaxResult.success(iJgyDutyGroupService.queryList(bo));
-    }
-
-    /**
-     * 新增值班组信息
-     */
-    @ApiOperation("新增值班组信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroup:add')")
-    @Log(title = "值班组信息", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody JgyDutyGroupBo bo) {
-        return toAjax(iJgyDutyGroupService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改值班组信息
-     */
-    @ApiOperation("修改值班组信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroup:edit')")
-    @Log(title = "值班组信息", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody JgyDutyGroupBo bo) {
-        return toAjax(iJgyDutyGroupService.updateByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除值班组信息
-     */
-    @ApiOperation("删除值班组信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroup:remove')")
-    @Log(title = "值班组信息" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{groupIds}")
-    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] groupIds) {
-        return toAjax(iJgyDutyGroupService.deleteWithValidByIds(Arrays.asList(groupIds), true) ? 1 : 0);
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/JgyDutyGroupDetailController.java

@@ -1,66 +0,0 @@
-package com.ruoyi.web.controller.zhdd;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zhdd.domain.vo.JgyDutyGroupDetailVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyGroupDetailBo;
-import com.ruoyi.zhdd.service.IJgyDutyGroupDetailService;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 值班组详细Controller
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Validated
-@Api(value = "值班组详细控制器", tags = {"值班组详细管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/zhdd/dutyGroupDetail")
-public class JgyDutyGroupDetailController extends BaseController {
-
-    private final IJgyDutyGroupDetailService iJgyDutyGroupDetailService;
-
-    /**
-     * 查询值班组详细列表
-     */
-    @ApiOperation("查询值班组详细列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroupDetail:list')")
-    @GetMapping("/list")
-    public AjaxResult list(@Validated(QueryGroup.class) JgyDutyGroupDetailBo bo) {
-        return AjaxResult.success(iJgyDutyGroupDetailService.queryList(bo));
-    }
-
-    /**
-     * 删除值班组详细
-     */
-    @ApiOperation("删除值班组详细")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroupDetail:remove')")
-    @Log(title = "值班组详细" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{detailIds}")
-    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] detailIds) {
-        return toAjax(iJgyDutyGroupDetailService.deleteWithValidByIds(Arrays.asList(detailIds), true) ? 1 : 0);
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/JgyDutyTransferController.java

@@ -1,113 +0,0 @@
-package com.ruoyi.web.controller.zhdd;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zhdd.domain.vo.JgyDutyTransferVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyTransferBo;
-import com.ruoyi.zhdd.service.IJgyDutyTransferService;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 交班事项Controller
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Validated
-@Api(value = "交班事项控制器", tags = {"交班事项管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/zhdd/dutyTransfer")
-public class JgyDutyTransferController extends BaseController {
-
-    private final IJgyDutyTransferService iJgyDutyTransferService;
-
-    /**
-     * 查询交班事项列表
-     */
-    @ApiOperation("查询交班事项列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyTransfer:list')")
-    @GetMapping("/list")
-    public TableDataInfo<JgyDutyTransferVo> list(@Validated(QueryGroup.class) JgyDutyTransferBo bo) {
-        return iJgyDutyTransferService.queryPageList(bo);
-    }
-
-    /**
-     * 导出交班事项列表
-     */
-    @ApiOperation("导出交班事项列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyTransfer:export')")
-    @Log(title = "交班事项", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(@Validated JgyDutyTransferBo bo, HttpServletResponse response) {
-        List<JgyDutyTransferVo> list = iJgyDutyTransferService.queryList(bo);
-        ExcelUtil.exportExcel(list, "交班事项", JgyDutyTransferVo.class, response);
-    }
-
-    /**
-     * 获取交班事项详细信息
-     */
-    @ApiOperation("获取交班事项详细信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyTransfer:query')")
-    @GetMapping("/{dtId}")
-    public AjaxResult<JgyDutyTransferVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("dtId") Long dtId) {
-        return AjaxResult.success(iJgyDutyTransferService.queryById(dtId));
-    }
-
-    /**
-     * 新增交班事项
-     */
-    @ApiOperation("新增交班事项")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyTransfer:add')")
-    @Log(title = "交班事项", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody JgyDutyTransferBo bo) {
-        return toAjax(iJgyDutyTransferService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改交班事项
-     */
-    @ApiOperation("修改交班事项")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyTransfer:edit')")
-    @Log(title = "交班事项", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody JgyDutyTransferBo bo) {
-        return toAjax(iJgyDutyTransferService.updateByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除交班事项
-     */
-    @ApiOperation("删除交班事项")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyTransfer:remove')")
-    @Log(title = "交班事项" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dtIds}")
-    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] dtIds) {
-        return toAjax(iJgyDutyTransferService.deleteWithValidByIds(Arrays.asList(dtIds), true) ? 1 : 0);
-    }
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/JgyDutyGroup.java → ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/DutyEmp.java

@@ -9,35 +9,35 @@ import java.util.Date;
 import java.math.BigDecimal;
 
 /**
- * 值班组信息对象 jgy_duty_group
+ * 值班排班信息对象 b_duty_emp
  *
- * @author ruoyi
- * @date 2021-09-22
+ * @author xintong
+ * @date 2021-10-11
  */
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("jgy_duty_group")
-public class JgyDutyGroup implements Serializable {
+@TableName("b_duty_emp")
+public class DutyEmp implements Serializable {
 
     private static final long serialVersionUID=1L;
 
 
     /**
-     * 值班组号
+     * $column.columnComment
      */
-    @TableId(value = "group_id", type = IdType.AUTO)
-    private Long groupId;
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
 
     /**
-     * 所属管理处
+     * 日期
      */
-    private Long moId;
+    private Integer period;
 
     /**
-     * 值班组名称
+     * 值班人
      */
-    private String name;
+    private String empName;
 
     /**
      * $column.columnComment

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/JgyDutyCommandCont.java → ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/DutyReport.java

@@ -9,80 +9,40 @@ import java.util.Date;
 import java.math.BigDecimal;
 
 /**
- * 日常值班登记对象 jgy_duty_command_cont
+ * 值班报告信息对象 b_duty_report
  *
- * @author ruoyi
- * @date 2021-09-22
+ * @author xintong
+ * @date 2021-10-11
  */
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("jgy_duty_command_cont")
-public class JgyDutyCommandCont implements Serializable {
+@TableName("b_duty_report")
+public class DutyReport implements Serializable {
 
     private static final long serialVersionUID=1L;
 
 
     /**
-     * 值班ID
-     */
-    @TableId(value = "du_id", type = IdType.AUTO)
-    private Long duId;
-
-    /**
-     * 所属管理处
-     */
-    private Long moId;
-
-    /**
-     * 值班日期
-     */
-    private Date dccDate;
-
-    /**
-     * 值班开始时间
-     */
-    private Date dccStartDate;
-
-    /**
-     * 值班结束时间
-     */
-    private Date dccEndDate;
-
-    /**
-     * 班次
-     */
-    private String dccSNum;
-
-    /**
-     * 天气
-     */
-    private String dccWeather;
-
-    /**
-     * 值班人员
-     */
-    private String duEmpName;
-
-    /**
-     * 接班ID
+     * $column.columnComment
      */
-    private Long dduId;
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
 
     /**
-     * 接班人员
+     * 报告内容
      */
-    private String dduEmpName;
+    private String reportContent;
 
     /**
-     * 交接班状态（0初始化  1：交班完成  2：接班完成）
+     * 报告状态
      */
-    private Long duStatus;
+    private Integer status;
 
     /**
-     * 值班人员id
+     * 值班日期
      */
-    private String duEmpId;
+    private Date dutyDate;
 
     /**
      * $column.columnComment

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/JgyDutyEmp.java

@@ -1,42 +0,0 @@
-package com.ruoyi.zhdd.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * 值班人员对象 jgy_duty_emp
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("jgy_duty_emp")
-public class JgyDutyEmp implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-
-    /**
-     * 值班人员Id
-     */
-    @TableId(value = "de_id", type = IdType.AUTO)
-    private Long deId;
-
-    /**
-     * 值班ID
-     */
-    private Long duId;
-
-    /**
-     * $column.columnComment
-     */
-    private Long empId;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/JgyDutyGroupDetail.java

@@ -1,57 +0,0 @@
-package com.ruoyi.zhdd.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * 值班组详细对象 jgy_duty_group_detail
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("jgy_duty_group_detail")
-public class JgyDutyGroupDetail implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-
-    /**
-     * 值班组详细
-     */
-    @TableId(value = "detail_id", type = IdType.AUTO)
-    private Long detailId;
-
-    /**
-     * 组号
-     */
-    private Long groupId;
-
-    /**
-     * 人员号
-     */
-    private Long empId;
-
-    /**
-     * 人员名称
-     */
-    private String empName;
-
-    /**
-     * 是否班长
-     */
-    private Long leaderFlag;
-
-    /**
-     * 是否副班长
-     */
-    private Long viceLeaderFlag;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/JgyDutyTransfer.java

@@ -1,52 +0,0 @@
-package com.ruoyi.zhdd.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * 交班事项对象 jgy_duty_transfer
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("jgy_duty_transfer")
-public class JgyDutyTransfer implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-
-    /**
-     * pk
-     */
-    @TableId(value = "dt_id", type = IdType.AUTO)
-    private Long dtId;
-
-    /**
-     * 值班ID
-     */
-    private Long duId;
-
-    /**
-     * 事件ID
-     */
-    private Long eventId;
-
-    /**
-     * 移交类型
-     */
-    private Long dtType;
-
-    /**
-     * 事件来源
-     */
-    private Long dtSource;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/JgyDutyEmpBo.java → ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/DutyEmpBo.java

@@ -13,34 +13,40 @@ import java.util.Date;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 值班人员业务对象 jgy_duty_emp
+ * 值班排班信息业务对象 b_duty_emp
  *
- * @author ruoyi
- * @date 2021-09-22
+ * @author xintong
+ * @date 2021-10-11
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("值班人员业务对象")
-public class JgyDutyEmpBo extends BaseEntity {
+@ApiModel("值班排班信息业务对象")
+public class DutyEmpBo extends BaseEntity {
 
     /**
-     * 值班人员Id
+     * $column.columnComment
+     */
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
+    /**
+     * 日期
      */
-    @ApiModelProperty(value = "值班人员Id")
-    private Long deId;
+    @ApiModelProperty(value = "日期")
+    private Integer period;
 
     /**
-     * 值班ID
+     * 值班人
      */
-    @ApiModelProperty(value = "值班ID")
-    private Long duId;
+    @ApiModelProperty(value = "值班人")
+    private String empName;
 
     /**
      * $column.columnComment
      */
     @ApiModelProperty(value = "$column.columnComment")
-    private Long empId;
+    private String delFlag;
 
 
     /**

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/JgyDutyGroupDetailBo.java → ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/DutyReportBo.java

@@ -10,55 +10,52 @@ import javax.validation.constraints.*;
 
 import java.util.Date;
 
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 值班组详细业务对象 jgy_duty_group_detail
+ * 值班报告信息业务对象 b_duty_report
  *
- * @author ruoyi
- * @date 2021-09-22
+ * @author xintong
+ * @date 2021-10-11
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("值班组详细业务对象")
-public class JgyDutyGroupDetailBo extends BaseEntity {
-
-    /**
-     * 值班组详细
-     */
-    @ApiModelProperty(value = "值班组详细")
-    private Long detailId;
+@ApiModel("值班报告信息业务对象")
+public class DutyReportBo extends BaseEntity {
 
     /**
-     * 组号
+     * $column.columnComment
      */
-    @ApiModelProperty(value = "组号")
-    private Long groupId;
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
 
     /**
-     * 人员号
+     * 报告内容
      */
-    @ApiModelProperty(value = "人员号")
-    private Long empId;
+    @ApiModelProperty(value = "报告内容")
+    @NotBlank(message = "报告内容不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String reportContent;
 
     /**
-     * 人员名称
+     * 报告状态
      */
-    @ApiModelProperty(value = "人员名称")
-    private String empName;
+    @ApiModelProperty(value = "报告状态.1-暂存。2-提交")
+    private Integer status;
 
     /**
-     * 是否班长
+     * 值班日期
      */
-    @ApiModelProperty(value = "是否班长")
-    private Long leaderFlag;
+    @ApiModelProperty(value = "值班日期")
+    private Date dutyDate;
 
     /**
-     * 是否副班长
+     * $column.columnComment
      */
-    @ApiModelProperty(value = "是否副班长")
-    private Long viceLeaderFlag;
+    @ApiModelProperty(value = "$column.columnComment")
+    private String delFlag;
 
 
     /**

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/JgyDutyCommandContBo.java

@@ -1,132 +0,0 @@
-package com.ruoyi.zhdd.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 日常值班登记业务对象 jgy_duty_command_cont
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("日常值班登记业务对象")
-public class JgyDutyCommandContBo extends BaseEntity {
-
-    /**
-     * 值班ID
-     */
-    @ApiModelProperty(value = "值班ID")
-    private Long duId;
-
-    /**
-     * 所属管理处
-     */
-    @ApiModelProperty(value = "所属管理处")
-    private Long moId;
-
-    /**
-     * 值班日期
-     */
-    @ApiModelProperty(value = "值班日期")
-    private Date dccDate;
-
-    /**
-     * 值班开始时间
-     */
-    @ApiModelProperty(value = "值班开始时间")
-    private Date dccStartDate;
-
-    /**
-     * 值班结束时间
-     */
-    @ApiModelProperty(value = "值班结束时间")
-    private Date dccEndDate;
-
-    /**
-     * 班次
-     */
-    @ApiModelProperty(value = "班次")
-    private String dccSNum;
-
-    /**
-     * 天气
-     */
-    @ApiModelProperty(value = "天气")
-    private String dccWeather;
-
-    /**
-     * 值班人员
-     */
-    @ApiModelProperty(value = "值班人员")
-    private String duEmpName;
-
-    /**
-     * 接班ID
-     */
-    @ApiModelProperty(value = "接班ID")
-    private Long dduId;
-
-    /**
-     * 接班人员
-     */
-    @ApiModelProperty(value = "接班人员")
-    private String dduEmpName;
-
-    /**
-     * 交接班状态（0初始化  1：交班完成  2：接班完成）
-     */
-    @ApiModelProperty(value = "交接班状态（0初始化  1：交班完成  2：接班完成）")
-    private Long duStatus;
-
-    /**
-     * 值班人员id
-     */
-    @ApiModelProperty(value = "值班人员id")
-    private String duEmpId;
-
-    /**
-     * $column.columnComment
-     */
-    @ApiModelProperty(value = "$column.columnComment")
-    private String delFlag;
-
-
-    /**
-     * 分页大小
-     */
-    @ApiModelProperty("分页大小")
-    private Integer pageSize;
-
-    /**
-     * 当前页数
-     */
-    @ApiModelProperty("当前页数")
-    private Integer pageNum;
-
-    /**
-     * 排序列
-     */
-    @ApiModelProperty("排序列")
-    private String orderByColumn;
-
-    /**
-     * 排序的方向desc或者asc
-     */
-    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
-    private String isAsc;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/JgyDutyGroupBo.java

@@ -1,75 +0,0 @@
-package com.ruoyi.zhdd.domain.bo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 值班组信息业务对象 jgy_duty_group
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("值班组信息业务对象")
-public class JgyDutyGroupBo extends BaseEntity {
-
-    /**
-     * 值班组号
-     */
-    @ApiModelProperty(value = "值班组号")
-    private Long groupId;
-
-    /**
-     * 所属管理处
-     */
-    @ApiModelProperty(value = "所属管理处")
-    private Long moId;
-
-    /**
-     * 值班组名称
-     */
-    @ApiModelProperty(value = "值班组名称")
-    private String name;
-
-    /**
-     * 分页大小
-     */
-    @ApiModelProperty("分页大小")
-    private Integer pageSize;
-
-    /**
-     * 当前页数
-     */
-    @ApiModelProperty("当前页数")
-    private Integer pageNum;
-
-    /**
-     * 排序列
-     */
-    @ApiModelProperty("排序列")
-    private String orderByColumn;
-
-    /**
-     * 排序的方向desc或者asc
-     */
-    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
-    private String isAsc;
-
-    @TableField(exist = false)
-    private List<JgyDutyGroupDetailBo> detail = new ArrayList<>();
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/JgyDutyTransferBo.java

@@ -1,82 +0,0 @@
-package com.ruoyi.zhdd.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 交班事项业务对象 jgy_duty_transfer
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("交班事项业务对象")
-public class JgyDutyTransferBo extends BaseEntity {
-
-    /**
-     * pk
-     */
-    @ApiModelProperty(value = "pk")
-    private Long dtId;
-
-    /**
-     * 值班ID
-     */
-    @ApiModelProperty(value = "值班ID")
-    private Long duId;
-
-    /**
-     * 事件ID
-     */
-    @ApiModelProperty(value = "事件ID")
-    private Long eventId;
-
-    /**
-     * 移交类型
-     */
-    @ApiModelProperty(value = "移交类型")
-    private Long dtType;
-
-    /**
-     * 事件来源
-     */
-    @ApiModelProperty(value = "事件来源")
-    private Long dtSource;
-
-
-    /**
-     * 分页大小
-     */
-    @ApiModelProperty("分页大小")
-    private Integer pageSize;
-
-    /**
-     * 当前页数
-     */
-    @ApiModelProperty("当前页数")
-    private Integer pageNum;
-
-    /**
-     * 排序列
-     */
-    @ApiModelProperty("排序列")
-    private String orderByColumn;
-
-    /**
-     * 排序的方向desc或者asc
-     */
-    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
-    private String isAsc;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/JgyDutyEmpVo.java → ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/DutyEmpVo.java

@@ -12,37 +12,37 @@ import java.util.Date;
 
 
 /**
- * 值班人员视图对象 jgy_duty_emp
+ * 值班排班信息视图对象 b_duty_emp
  *
- * @author ruoyi
- * @date 2021-09-22
+ * @author xintong
+ * @date 2021-10-11
  */
 @Data
-@ApiModel("值班人员视图对象")
+@ApiModel("值班排班信息视图对象")
 @ExcelIgnoreUnannotated
-public class JgyDutyEmpVo {
+public class DutyEmpVo {
 
 	private static final long serialVersionUID = 1L;
 
 	/**
-     *  值班人员Id
+     *  $pkColumn.columnComment
      */
-	@ApiModelProperty("值班人员Id")
-	private Long deId;
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
 
     /**
-     * 值班ID
+     * 日期
      */
-	@ExcelProperty(value = "值班ID")
-	@ApiModelProperty("值班ID")
-	private Long duId;
+	@ExcelProperty(value = "日期")
+	@ApiModelProperty("日期")
+	private Integer period;
 
     /**
-     * $column.columnComment
+     * 值班人
      */
-	@ExcelProperty(value = "值班ID")
-	@ApiModelProperty("$column.columnComment")
-	private Long empId;
+	@ExcelProperty(value = "值班人")
+	@ApiModelProperty("值班人")
+	private String empName;
 
 
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/DutyReportVo.java

@@ -0,0 +1,62 @@
+package com.ruoyi.zhdd.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 值班报告信息视图对象 b_duty_report
+ *
+ * @author xintong
+ * @date 2021-10-11
+ */
+@Data
+@ApiModel("值班报告信息视图对象")
+@ExcelIgnoreUnannotated
+public class DutyReportVo {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+     *  $pkColumn.columnComment
+     */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+    /**
+     * 报告内容
+     */
+	@ExcelProperty(value = "报告内容")
+	@ApiModelProperty("报告内容")
+	private String reportContent;
+
+    /**
+     * 报告状态
+     */
+	@ExcelProperty(value = "报告状态")
+	@ApiModelProperty("报告状态")
+	private Integer status;
+
+    /**
+     * 值班日期
+     */
+	@ExcelProperty(value = "值班日期")
+	@ApiModelProperty("值班日期")
+	private Date dutyDate;
+
+    @ExcelProperty(value = "报告人")
+    private String createBy;
+
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/JgyDutyCommandContVo.java

@@ -1,114 +0,0 @@
-package com.ruoyi.zhdd.domain.vo;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 日常值班登记视图对象 jgy_duty_command_cont
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Data
-@ApiModel("日常值班登记视图对象")
-@ExcelIgnoreUnannotated
-public class JgyDutyCommandContVo {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-     *  值班ID
-     */
-	@ApiModelProperty("值班ID")
-	private Long duId;
-
-    /**
-     * 所属管理处
-     */
-	@ExcelProperty(value = "所属管理处")
-	@ApiModelProperty("所属管理处")
-	private Long moId;
-
-    /**
-     * 值班日期
-     */
-	@ExcelProperty(value = "值班日期")
-	@ApiModelProperty("值班日期")
-	private Date dccDate;
-
-    /**
-     * 值班开始时间
-     */
-	@ExcelProperty(value = "值班开始时间")
-	@ApiModelProperty("值班开始时间")
-	private Date dccStartDate;
-
-    /**
-     * 值班结束时间
-     */
-	@ExcelProperty(value = "值班结束时间")
-	@ApiModelProperty("值班结束时间")
-	private Date dccEndDate;
-
-    /**
-     * 班次
-     */
-	@ExcelProperty(value = "班次")
-	@ApiModelProperty("班次")
-	private String dccSNum;
-
-    /**
-     * 天气
-     */
-	@ExcelProperty(value = "天气")
-	@ApiModelProperty("天气")
-	private String dccWeather;
-
-    /**
-     * 值班人员
-     */
-	@ExcelProperty(value = "值班人员")
-	@ApiModelProperty("值班人员")
-	private String duEmpName;
-
-    /**
-     * 接班ID
-     */
-	@ExcelProperty(value = "接班ID")
-	@ApiModelProperty("接班ID")
-	private Long dduId;
-
-    /**
-     * 接班人员
-     */
-	@ExcelProperty(value = "接班人员")
-	@ApiModelProperty("接班人员")
-	private String dduEmpName;
-
-    /**
-     * 交接班状态（0初始化  1：交班完成  2：接班完成）
-     */
-	@ExcelProperty(value = "交接班状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=初始化,1=：交班完成,2=：接班完成")
-	@ApiModelProperty("交接班状态（0初始化  1：交班完成  2：接班完成）")
-	private Long duStatus;
-
-    /**
-     * 值班人员id
-     */
-	@ExcelProperty(value = "值班人员id")
-	@ApiModelProperty("值班人员id")
-	private String duEmpId;
-
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/JgyDutyGroupDetailVo.java

@@ -1,69 +0,0 @@
-package com.ruoyi.zhdd.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 值班组详细视图对象 jgy_duty_group_detail
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Data
-@ApiModel("值班组详细视图对象")
-@ExcelIgnoreUnannotated
-public class JgyDutyGroupDetailVo {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-     *  值班组详细
-     */
-	@ApiModelProperty("值班组详细")
-	private Long detailId;
-
-    /**
-     * 组号
-     */
-	@ExcelProperty(value = "组号")
-	@ApiModelProperty("组号")
-	private Long groupId;
-
-    /**
-     * 人员号
-     */
-	@ExcelProperty(value = "人员号")
-	@ApiModelProperty("人员号")
-	private Long empId;
-
-    /**
-     * 人员名称
-     */
-	@ExcelProperty(value = "人员名称")
-	@ApiModelProperty("人员名称")
-	private String empName;
-
-    /**
-     * 是否班长
-     */
-	@ExcelProperty(value = "是否班长")
-	@ApiModelProperty("是否班长")
-	private Long leaderFlag;
-
-    /**
-     * 是否副班长
-     */
-	@ExcelProperty(value = "是否副班长")
-	@ApiModelProperty("是否副班长")
-	private Long viceLeaderFlag;
-
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/JgyDutyGroupVo.java

@@ -1,48 +0,0 @@
-package com.ruoyi.zhdd.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 值班组信息视图对象 jgy_duty_group
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Data
-@ApiModel("值班组信息视图对象")
-@ExcelIgnoreUnannotated
-public class JgyDutyGroupVo {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-     *  值班组号
-     */
-	@ApiModelProperty("值班组号")
-	private Long groupId;
-
-    /**
-     * 所属管理处
-     */
-	@ExcelProperty(value = "所属管理处")
-	@ApiModelProperty("所属管理处")
-	private Long moId;
-
-    /**
-     * 值班组名称
-     */
-	@ExcelProperty(value = "值班组名称")
-	@ApiModelProperty("值班组名称")
-	private String name;
-
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/JgyDutyTransferVo.java

@@ -1,62 +0,0 @@
-package com.ruoyi.zhdd.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 交班事项视图对象 jgy_duty_transfer
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Data
-@ApiModel("交班事项视图对象")
-@ExcelIgnoreUnannotated
-public class JgyDutyTransferVo {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-     *  pk
-     */
-	@ApiModelProperty("pk")
-	private Long dtId;
-
-    /**
-     * 值班ID
-     */
-	@ExcelProperty(value = "值班ID")
-	@ApiModelProperty("值班ID")
-	private Long duId;
-
-    /**
-     * 事件ID
-     */
-	@ExcelProperty(value = "事件ID")
-	@ApiModelProperty("事件ID")
-	private Long eventId;
-
-    /**
-     * 移交类型
-     */
-	@ExcelProperty(value = "移交类型")
-	@ApiModelProperty("移交类型")
-	private Long dtType;
-
-    /**
-     * 事件来源
-     */
-	@ExcelProperty(value = "事件来源")
-	@ApiModelProperty("事件来源")
-	private Long dtSource;
-
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/JgyDutyEmpMapper.java → ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/DutyEmpMapper.java

@@ -1,16 +1,16 @@
 package com.ruoyi.zhdd.mapper;
 
+import com.ruoyi.zhdd.domain.DutyEmp;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
-import com.ruoyi.zhdd.domain.JgyDutyEmp;
 import org.apache.ibatis.annotations.CacheNamespace;
 
 /**
- * 值班人员Mapper接口
+ * 值班排班信息Mapper接口
  *
- * @author ruoyi
- * @date 2021-09-22
+ * @author xintong
+ * @date 2021-10-11
  */
-public interface JgyDutyEmpMapper extends BaseMapperPlus<JgyDutyEmp> {
+public interface DutyEmpMapper extends BaseMapperPlus<DutyEmp> {
 
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/JgyDutyGroupMapper.java → ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/DutyReportMapper.java

@@ -1,16 +1,16 @@
 package com.ruoyi.zhdd.mapper;
 
+import com.ruoyi.zhdd.domain.DutyReport;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
-import com.ruoyi.zhdd.domain.JgyDutyGroup;
 import org.apache.ibatis.annotations.CacheNamespace;
 
 /**
- * 值班组信息Mapper接口
+ * 值班报告信息Mapper接口
  *
- * @author ruoyi
- * @date 2021-09-22
+ * @author xintong
+ * @date 2021-10-11
  */
-public interface JgyDutyGroupMapper extends BaseMapperPlus<JgyDutyGroup> {
+public interface DutyReportMapper extends BaseMapperPlus<DutyReport> {
 
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/JgyDutyCommandContMapper.java

@@ -1,16 +0,0 @@
-package com.ruoyi.zhdd.mapper;
-
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
-import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
-import com.ruoyi.zhdd.domain.JgyDutyCommandCont;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 日常值班登记Mapper接口
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-public interface JgyDutyCommandContMapper extends BaseMapperPlus<JgyDutyCommandCont> {
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/JgyDutyGroupDetailMapper.java

@@ -1,16 +0,0 @@
-package com.ruoyi.zhdd.mapper;
-
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
-import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
-import com.ruoyi.zhdd.domain.JgyDutyGroupDetail;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 值班组详细Mapper接口
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-public interface JgyDutyGroupDetailMapper extends BaseMapperPlus<JgyDutyGroupDetail> {
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/JgyDutyTransferMapper.java

@@ -1,16 +0,0 @@
-package com.ruoyi.zhdd.mapper;
-
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
-import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
-import com.ruoyi.zhdd.domain.JgyDutyTransfer;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 交班事项Mapper接口
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-public interface JgyDutyTransferMapper extends BaseMapperPlus<JgyDutyTransfer> {
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IDutyEmpService.java

@@ -0,0 +1,56 @@
+package com.ruoyi.zhdd.service;
+
+import com.ruoyi.zhdd.domain.DutyEmp;
+import com.ruoyi.zhdd.domain.vo.DutyEmpVo;
+import com.ruoyi.zhdd.domain.bo.DutyEmpBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 值班排班信息Service接口
+ *
+ * @author xintong
+ * @date 2021-10-11
+ */
+public interface IDutyEmpService extends IServicePlus<DutyEmp, DutyEmpVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	DutyEmpVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<DutyEmpVo> queryPageList(DutyEmpBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<DutyEmpVo> queryList(DutyEmpBo bo);
+
+	/**
+	 * 根据新增业务对象插入值班排班信息
+	 * @param bo 值班排班信息新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(DutyEmpBo bo);
+
+	/**
+	 * 根据编辑业务对象修改值班排班信息
+	 * @param bo 值班排班信息编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(DutyEmpBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IDutyReportService.java

@@ -0,0 +1,56 @@
+package com.ruoyi.zhdd.service;
+
+import com.ruoyi.zhdd.domain.DutyReport;
+import com.ruoyi.zhdd.domain.vo.DutyReportVo;
+import com.ruoyi.zhdd.domain.bo.DutyReportBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 值班报告信息Service接口
+ *
+ * @author xintong
+ * @date 2021-10-11
+ */
+public interface IDutyReportService extends IServicePlus<DutyReport, DutyReportVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	DutyReportVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<DutyReportVo> queryPageList(DutyReportBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<DutyReportVo> queryList(DutyReportBo bo);
+
+	/**
+	 * 根据新增业务对象插入值班报告信息
+	 * @param bo 值班报告信息新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(DutyReportBo bo);
+
+	/**
+	 * 根据编辑业务对象修改值班报告信息
+	 * @param bo 值班报告信息编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(DutyReportBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IJgyDutyCommandContService.java

@@ -1,56 +0,0 @@
-package com.ruoyi.zhdd.service;
-
-import com.ruoyi.zhdd.domain.JgyDutyCommandCont;
-import com.ruoyi.zhdd.domain.vo.JgyDutyCommandContVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyCommandContBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 日常值班登记Service接口
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-public interface IJgyDutyCommandContService extends IServicePlus<JgyDutyCommandCont, JgyDutyCommandContVo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	JgyDutyCommandContVo queryById(Long duId);
-
-	/**
-	 * 查询列表
-	 */
-    TableDataInfo<JgyDutyCommandContVo> queryPageList(JgyDutyCommandContBo bo);
-
-	/**
-	 * 查询列表
-	 */
-	List<JgyDutyCommandContVo> queryList(JgyDutyCommandContBo bo);
-
-	/**
-	 * 根据新增业务对象插入日常值班登记
-	 * @param bo 日常值班登记新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(JgyDutyCommandContBo bo);
-
-	/**
-	 * 根据编辑业务对象修改日常值班登记
-	 * @param bo 日常值班登记编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(JgyDutyCommandContBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IJgyDutyEmpService.java

@@ -1,56 +0,0 @@
-package com.ruoyi.zhdd.service;
-
-import com.ruoyi.zhdd.domain.JgyDutyEmp;
-import com.ruoyi.zhdd.domain.vo.JgyDutyEmpVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyEmpBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 值班人员Service接口
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-public interface IJgyDutyEmpService extends IServicePlus<JgyDutyEmp, JgyDutyEmpVo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	JgyDutyEmpVo queryById(Long deId);
-
-	/**
-	 * 查询列表
-	 */
-    TableDataInfo<JgyDutyEmpVo> queryPageList(JgyDutyEmpBo bo);
-
-	/**
-	 * 查询列表
-	 */
-	List<JgyDutyEmpVo> queryList(JgyDutyEmpBo bo);
-
-	/**
-	 * 根据新增业务对象插入值班人员
-	 * @param bo 值班人员新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(JgyDutyEmpBo bo);
-
-	/**
-	 * 根据编辑业务对象修改值班人员
-	 * @param bo 值班人员编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(JgyDutyEmpBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IJgyDutyGroupDetailService.java

@@ -1,56 +0,0 @@
-package com.ruoyi.zhdd.service;
-
-import com.ruoyi.zhdd.domain.JgyDutyGroupDetail;
-import com.ruoyi.zhdd.domain.vo.JgyDutyGroupDetailVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyGroupDetailBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 值班组详细Service接口
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-public interface IJgyDutyGroupDetailService extends IServicePlus<JgyDutyGroupDetail, JgyDutyGroupDetailVo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	JgyDutyGroupDetailVo queryById(Long detailId);
-
-	/**
-	 * 查询列表
-	 */
-    TableDataInfo<JgyDutyGroupDetailVo> queryPageList(JgyDutyGroupDetailBo bo);
-
-	/**
-	 * 查询列表
-	 */
-	List<JgyDutyGroupDetailVo> queryList(JgyDutyGroupDetailBo bo);
-
-	/**
-	 * 根据新增业务对象插入值班组详细
-	 * @param bo 值班组详细新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(JgyDutyGroupDetailBo bo);
-
-	/**
-	 * 根据编辑业务对象修改值班组详细
-	 * @param bo 值班组详细编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(JgyDutyGroupDetailBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IJgyDutyGroupService.java

@@ -1,56 +0,0 @@
-package com.ruoyi.zhdd.service;
-
-import com.ruoyi.zhdd.domain.JgyDutyGroup;
-import com.ruoyi.zhdd.domain.vo.JgyDutyGroupVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyGroupBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 值班组信息Service接口
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-public interface IJgyDutyGroupService extends IServicePlus<JgyDutyGroup, JgyDutyGroupVo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	JgyDutyGroupVo queryById(Long groupId);
-
-	/**
-	 * 查询列表
-	 */
-    TableDataInfo<JgyDutyGroupVo> queryPageList(JgyDutyGroupBo bo);
-
-	/**
-	 * 查询列表
-	 */
-	List<JgyDutyGroupVo> queryList(JgyDutyGroupBo bo);
-
-	/**
-	 * 根据新增业务对象插入值班组信息
-	 * @param bo 值班组信息新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(JgyDutyGroupBo bo);
-
-	/**
-	 * 根据编辑业务对象修改值班组信息
-	 * @param bo 值班组信息编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(JgyDutyGroupBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IJgyDutyTransferService.java

@@ -1,56 +0,0 @@
-package com.ruoyi.zhdd.service;
-
-import com.ruoyi.zhdd.domain.JgyDutyTransfer;
-import com.ruoyi.zhdd.domain.vo.JgyDutyTransferVo;
-import com.ruoyi.zhdd.domain.bo.JgyDutyTransferBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 交班事项Service接口
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-public interface IJgyDutyTransferService extends IServicePlus<JgyDutyTransfer, JgyDutyTransferVo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	JgyDutyTransferVo queryById(Long dtId);
-
-	/**
-	 * 查询列表
-	 */
-    TableDataInfo<JgyDutyTransferVo> queryPageList(JgyDutyTransferBo bo);
-
-	/**
-	 * 查询列表
-	 */
-	List<JgyDutyTransferVo> queryList(JgyDutyTransferBo bo);
-
-	/**
-	 * 根据新增业务对象插入交班事项
-	 * @param bo 交班事项新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(JgyDutyTransferBo bo);
-
-	/**
-	 * 根据编辑业务对象修改交班事项
-	 * @param bo 交班事项编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(JgyDutyTransferBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/JgyDutyEmpServiceImpl.java → ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/DutyEmpServiceImpl.java

@@ -9,59 +9,59 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.zhdd.domain.bo.JgyDutyEmpBo;
-import com.ruoyi.zhdd.domain.vo.JgyDutyEmpVo;
-import com.ruoyi.zhdd.domain.JgyDutyEmp;
-import com.ruoyi.zhdd.mapper.JgyDutyEmpMapper;
-import com.ruoyi.zhdd.service.IJgyDutyEmpService;
+import com.ruoyi.zhdd.domain.bo.DutyEmpBo;
+import com.ruoyi.zhdd.domain.vo.DutyEmpVo;
+import com.ruoyi.zhdd.domain.DutyEmp;
+import com.ruoyi.zhdd.mapper.DutyEmpMapper;
+import com.ruoyi.zhdd.service.IDutyEmpService;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
 
 /**
- * 值班人员Service业务层处理
+ * 值班排班信息Service业务层处理
  *
- * @author ruoyi
- * @date 2021-09-22
+ * @author xintong
+ * @date 2021-10-11
  */
 @Service
-public class JgyDutyEmpServiceImpl extends ServicePlusImpl<JgyDutyEmpMapper, JgyDutyEmp, JgyDutyEmpVo> implements IJgyDutyEmpService {
+public class DutyEmpServiceImpl extends ServicePlusImpl<DutyEmpMapper, DutyEmp, DutyEmpVo> implements IDutyEmpService {
 
     @Override
-    public JgyDutyEmpVo queryById(Long deId){
-        return getVoById(deId);
+    public DutyEmpVo queryById(Long id){
+        return getVoById(id);
     }
 
     @Override
-    public TableDataInfo<JgyDutyEmpVo> queryPageList(JgyDutyEmpBo bo) {
-        PagePlus<JgyDutyEmp, JgyDutyEmpVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+    public TableDataInfo<DutyEmpVo> queryPageList(DutyEmpBo bo) {
+        PagePlus<DutyEmp, DutyEmpVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         return PageUtils.buildDataInfo(result);
     }
 
     @Override
-    public List<JgyDutyEmpVo> queryList(JgyDutyEmpBo bo) {
+    public List<DutyEmpVo> queryList(DutyEmpBo bo) {
         return listVo(buildQueryWrapper(bo));
     }
 
-    private LambdaQueryWrapper<JgyDutyEmp> buildQueryWrapper(JgyDutyEmpBo bo) {
+    private LambdaQueryWrapper<DutyEmp> buildQueryWrapper(DutyEmpBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<JgyDutyEmp> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDuId() != null, JgyDutyEmp::getDuId, bo.getDuId());
-        lqw.eq(bo.getEmpId() != null, JgyDutyEmp::getEmpId, bo.getEmpId());
+        LambdaQueryWrapper<DutyEmp> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPeriod() != null, DutyEmp::getPeriod, bo.getPeriod());
+        lqw.like(StringUtils.isNotBlank(bo.getEmpName()), DutyEmp::getEmpName, bo.getEmpName());
         return lqw;
     }
 
     @Override
-    public Boolean insertByBo(JgyDutyEmpBo bo) {
-        JgyDutyEmp add = BeanUtil.toBean(bo, JgyDutyEmp.class);
+    public Boolean insertByBo(DutyEmpBo bo) {
+        DutyEmp add = BeanUtil.toBean(bo, DutyEmp.class);
         validEntityBeforeSave(add);
         return save(add);
     }
 
     @Override
-    public Boolean updateByBo(JgyDutyEmpBo bo) {
-        JgyDutyEmp update = BeanUtil.toBean(bo, JgyDutyEmp.class);
+    public Boolean updateByBo(DutyEmpBo bo) {
+        DutyEmp update = BeanUtil.toBean(bo, DutyEmp.class);
         validEntityBeforeSave(update);
         return updateById(update);
     }
@@ -71,7 +71,7 @@ public class JgyDutyEmpServiceImpl extends ServicePlusImpl<JgyDutyEmpMapper, Jgy
      *
      * @param entity 实体类数据
      */
-    private void validEntityBeforeSave(JgyDutyEmp entity){
+    private void validEntityBeforeSave(DutyEmp entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/DutyReportServiceImpl.java

@@ -0,0 +1,101 @@
+package com.ruoyi.zhdd.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zhdd.domain.bo.DutyReportBo;
+import com.ruoyi.zhdd.domain.vo.DutyReportVo;
+import com.ruoyi.zhdd.domain.DutyReport;
+import com.ruoyi.zhdd.mapper.DutyReportMapper;
+import com.ruoyi.zhdd.service.IDutyReportService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 值班报告信息Service业务层处理
+ *
+ * @author xintong
+ * @date 2021-10-11
+ */
+@Service
+public class DutyReportServiceImpl extends ServicePlusImpl<DutyReportMapper, DutyReport, DutyReportVo> implements IDutyReportService {
+
+    @Override
+    public DutyReportVo queryById(Long id) {
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<DutyReportVo> queryPageList(DutyReportBo bo) {
+        PagePlus<DutyReport, DutyReportVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<DutyReportVo> queryList(DutyReportBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<DutyReport> buildQueryWrapper(DutyReportBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DutyReport> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getReportContent()), DutyReport::getReportContent, bo.getReportContent());
+        lqw.eq(bo.getStatus() != null, DutyReport::getStatus, bo.getStatus());
+        lqw.eq(bo.getDutyDate() != null, DutyReport::getDutyDate, bo.getDutyDate());
+        lqw.orderByDesc(DutyReport::getUpdateTime);
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(DutyReportBo bo) {
+        DutyReport add = BeanUtil.toBean(bo, DutyReport.class);
+        validEntityBeforeSave(add);
+        add.setDutyDate(new Date());
+        return save(add);
+    }
+
+    @Override
+    public Boolean updateByBo(DutyReportBo bo) {
+        // 如果是已提交则不能修改
+        DutyReportVo dutyReportVo = this.queryById(bo.getId());
+        if (dutyReportVo.getStatus() == 2) {
+            throw new ServiceException("报告已提交不能修改");
+        }
+        DutyReport update = BeanUtil.toBean(bo, DutyReport.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(DutyReport entity) {
+        //TODO 做一些数据校验,如唯一约束
+        if (entity.getStatus() != 1 && entity.getStatus() != 2) {
+            throw new ServiceException("状态值非法-" + entity.getStatus());
+        }
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/JgyDutyCommandContServiceImpl.java

@@ -1,94 +0,0 @@
-package com.ruoyi.zhdd.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.zhdd.domain.bo.JgyDutyCommandContBo;
-import com.ruoyi.zhdd.domain.vo.JgyDutyCommandContVo;
-import com.ruoyi.zhdd.domain.JgyDutyCommandCont;
-import com.ruoyi.zhdd.mapper.JgyDutyCommandContMapper;
-import com.ruoyi.zhdd.service.IJgyDutyCommandContService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 日常值班登记Service业务层处理
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Service
-public class JgyDutyCommandContServiceImpl extends ServicePlusImpl<JgyDutyCommandContMapper, JgyDutyCommandCont, JgyDutyCommandContVo> implements IJgyDutyCommandContService {
-
-    @Override
-    public JgyDutyCommandContVo queryById(Long duId){
-        return getVoById(duId);
-    }
-
-    @Override
-    public TableDataInfo<JgyDutyCommandContVo> queryPageList(JgyDutyCommandContBo bo) {
-        PagePlus<JgyDutyCommandCont, JgyDutyCommandContVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        return PageUtils.buildDataInfo(result);
-    }
-
-    @Override
-    public List<JgyDutyCommandContVo> queryList(JgyDutyCommandContBo bo) {
-        return listVo(buildQueryWrapper(bo));
-    }
-
-    private LambdaQueryWrapper<JgyDutyCommandCont> buildQueryWrapper(JgyDutyCommandContBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<JgyDutyCommandCont> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getMoId() != null, JgyDutyCommandCont::getMoId, bo.getMoId());
-        lqw.eq(bo.getDccDate() != null, JgyDutyCommandCont::getDccDate, bo.getDccDate());
-        lqw.eq(bo.getDccStartDate() != null, JgyDutyCommandCont::getDccStartDate, bo.getDccStartDate());
-        lqw.eq(bo.getDccEndDate() != null, JgyDutyCommandCont::getDccEndDate, bo.getDccEndDate());
-        lqw.eq(StringUtils.isNotBlank(bo.getDccSNum()), JgyDutyCommandCont::getDccSNum, bo.getDccSNum());
-        lqw.eq(StringUtils.isNotBlank(bo.getDccWeather()), JgyDutyCommandCont::getDccWeather, bo.getDccWeather());
-        lqw.like(StringUtils.isNotBlank(bo.getDuEmpName()), JgyDutyCommandCont::getDuEmpName, bo.getDuEmpName());
-        lqw.eq(bo.getDduId() != null, JgyDutyCommandCont::getDduId, bo.getDduId());
-        lqw.like(StringUtils.isNotBlank(bo.getDduEmpName()), JgyDutyCommandCont::getDduEmpName, bo.getDduEmpName());
-        lqw.eq(bo.getDuStatus() != null, JgyDutyCommandCont::getDuStatus, bo.getDuStatus());
-        lqw.eq(StringUtils.isNotBlank(bo.getDuEmpId()), JgyDutyCommandCont::getDuEmpId, bo.getDuEmpId());
-        return lqw;
-    }
-
-    @Override
-    public Boolean insertByBo(JgyDutyCommandContBo bo) {
-        JgyDutyCommandCont add = BeanUtil.toBean(bo, JgyDutyCommandCont.class);
-        validEntityBeforeSave(add);
-        return save(add);
-    }
-
-    @Override
-    public Boolean updateByBo(JgyDutyCommandContBo bo) {
-        JgyDutyCommandCont update = BeanUtil.toBean(bo, JgyDutyCommandCont.class);
-        validEntityBeforeSave(update);
-        return updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(JgyDutyCommandCont entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return removeByIds(ids);
-    }
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/JgyDutyGroupDetailServiceImpl.java

@@ -1,88 +0,0 @@
-package com.ruoyi.zhdd.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.zhdd.domain.bo.JgyDutyGroupDetailBo;
-import com.ruoyi.zhdd.domain.vo.JgyDutyGroupDetailVo;
-import com.ruoyi.zhdd.domain.JgyDutyGroupDetail;
-import com.ruoyi.zhdd.mapper.JgyDutyGroupDetailMapper;
-import com.ruoyi.zhdd.service.IJgyDutyGroupDetailService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 值班组详细Service业务层处理
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Service
-public class JgyDutyGroupDetailServiceImpl extends ServicePlusImpl<JgyDutyGroupDetailMapper, JgyDutyGroupDetail, JgyDutyGroupDetailVo> implements IJgyDutyGroupDetailService {
-
-    @Override
-    public JgyDutyGroupDetailVo queryById(Long detailId){
-        return getVoById(detailId);
-    }
-
-    @Override
-    public TableDataInfo<JgyDutyGroupDetailVo> queryPageList(JgyDutyGroupDetailBo bo) {
-        PagePlus<JgyDutyGroupDetail, JgyDutyGroupDetailVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        return PageUtils.buildDataInfo(result);
-    }
-
-    @Override
-    public List<JgyDutyGroupDetailVo> queryList(JgyDutyGroupDetailBo bo) {
-        return listVo(buildQueryWrapper(bo));
-    }
-
-    private LambdaQueryWrapper<JgyDutyGroupDetail> buildQueryWrapper(JgyDutyGroupDetailBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<JgyDutyGroupDetail> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getGroupId() != null, JgyDutyGroupDetail::getGroupId, bo.getGroupId());
-        lqw.eq(bo.getEmpId() != null, JgyDutyGroupDetail::getEmpId, bo.getEmpId());
-        lqw.like(StringUtils.isNotBlank(bo.getEmpName()), JgyDutyGroupDetail::getEmpName, bo.getEmpName());
-        lqw.eq(bo.getLeaderFlag() != null, JgyDutyGroupDetail::getLeaderFlag, bo.getLeaderFlag());
-        lqw.eq(bo.getViceLeaderFlag() != null, JgyDutyGroupDetail::getViceLeaderFlag, bo.getViceLeaderFlag());
-        return lqw;
-    }
-
-    @Override
-    public Boolean insertByBo(JgyDutyGroupDetailBo bo) {
-        JgyDutyGroupDetail add = BeanUtil.toBean(bo, JgyDutyGroupDetail.class);
-        validEntityBeforeSave(add);
-        return save(add);
-    }
-
-    @Override
-    public Boolean updateByBo(JgyDutyGroupDetailBo bo) {
-        JgyDutyGroupDetail update = BeanUtil.toBean(bo, JgyDutyGroupDetail.class);
-        validEntityBeforeSave(update);
-        return updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(JgyDutyGroupDetail entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return removeByIds(ids);
-    }
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/JgyDutyGroupServiceImpl.java

@@ -1,114 +0,0 @@
-package com.ruoyi.zhdd.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.zhdd.domain.JgyDutyGroupDetail;
-import com.ruoyi.zhdd.domain.bo.JgyDutyGroupDetailBo;
-import com.ruoyi.zhdd.service.IJgyDutyGroupDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.zhdd.domain.bo.JgyDutyGroupBo;
-import com.ruoyi.zhdd.domain.vo.JgyDutyGroupVo;
-import com.ruoyi.zhdd.domain.JgyDutyGroup;
-import com.ruoyi.zhdd.mapper.JgyDutyGroupMapper;
-import com.ruoyi.zhdd.service.IJgyDutyGroupService;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 值班组信息Service业务层处理
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Service
-public class JgyDutyGroupServiceImpl extends ServicePlusImpl<JgyDutyGroupMapper, JgyDutyGroup, JgyDutyGroupVo> implements IJgyDutyGroupService {
-
-    @Autowired
-    private IJgyDutyGroupDetailService dutyGroupDetailService;
-
-    @Override
-    public JgyDutyGroupVo queryById(Long groupId){
-        return getVoById(groupId);
-    }
-
-    @Override
-    public TableDataInfo<JgyDutyGroupVo> queryPageList(JgyDutyGroupBo bo) {
-        PagePlus<JgyDutyGroup, JgyDutyGroupVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        return PageUtils.buildDataInfo(result);
-    }
-
-    @Override
-    public List<JgyDutyGroupVo> queryList(JgyDutyGroupBo bo) {
-        return listVo(buildQueryWrapper(bo));
-    }
-
-    private LambdaQueryWrapper<JgyDutyGroup> buildQueryWrapper(JgyDutyGroupBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<JgyDutyGroup> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getMoId() != null, JgyDutyGroup::getMoId, bo.getMoId());
-        lqw.like(StringUtils.isNotBlank(bo.getName()), JgyDutyGroup::getName, bo.getName());
-        return lqw;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean insertByBo(JgyDutyGroupBo bo) {
-        JgyDutyGroup add = BeanUtil.toBean(bo, JgyDutyGroup.class);
-        validEntityBeforeSave(add);
-        save(add);
-        // 新增组信息
-        List<JgyDutyGroupDetailBo> detail = bo.getDetail();
-        for (JgyDutyGroupDetailBo jgyDutyGroupDetailBo : detail) {
-            jgyDutyGroupDetailBo.setGroupId(add.getGroupId());
-        }
-        List<JgyDutyGroupDetail> jgyDutyGroupDetails = BeanUtil.copyToList(detail, JgyDutyGroupDetail.class);
-        dutyGroupDetailService.saveBatch(jgyDutyGroupDetails);
-        return true;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean updateByBo(JgyDutyGroupBo bo) {
-        JgyDutyGroup update = BeanUtil.toBean(bo, JgyDutyGroup.class);
-        validEntityBeforeSave(update);
-        updateById(update);
-        // 新增或更新组信息
-        List<JgyDutyGroupDetailBo> detail = bo.getDetail();
-        for (JgyDutyGroupDetailBo jgyDutyGroupDetailBo : detail) {
-            jgyDutyGroupDetailBo.setGroupId(update.getGroupId());
-        }
-        List<JgyDutyGroupDetail> jgyDutyGroupDetails = BeanUtil.copyToList(detail, JgyDutyGroupDetail.class);
-        dutyGroupDetailService.saveOrUpdateBatch(jgyDutyGroupDetails);
-        return true;
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(JgyDutyGroup entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        removeByIds(ids);
-        // 删除组信息
-        dutyGroupDetailService.remove(Wrappers.<JgyDutyGroupDetail>lambdaQuery().in(JgyDutyGroupDetail::getGroupId, ids));
-        return true;
-    }
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/JgyDutyTransferServiceImpl.java

@@ -1,87 +0,0 @@
-package com.ruoyi.zhdd.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.zhdd.domain.bo.JgyDutyTransferBo;
-import com.ruoyi.zhdd.domain.vo.JgyDutyTransferVo;
-import com.ruoyi.zhdd.domain.JgyDutyTransfer;
-import com.ruoyi.zhdd.mapper.JgyDutyTransferMapper;
-import com.ruoyi.zhdd.service.IJgyDutyTransferService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 交班事项Service业务层处理
- *
- * @author ruoyi
- * @date 2021-09-22
- */
-@Service
-public class JgyDutyTransferServiceImpl extends ServicePlusImpl<JgyDutyTransferMapper, JgyDutyTransfer, JgyDutyTransferVo> implements IJgyDutyTransferService {
-
-    @Override
-    public JgyDutyTransferVo queryById(Long dtId){
-        return getVoById(dtId);
-    }
-
-    @Override
-    public TableDataInfo<JgyDutyTransferVo> queryPageList(JgyDutyTransferBo bo) {
-        PagePlus<JgyDutyTransfer, JgyDutyTransferVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        return PageUtils.buildDataInfo(result);
-    }
-
-    @Override
-    public List<JgyDutyTransferVo> queryList(JgyDutyTransferBo bo) {
-        return listVo(buildQueryWrapper(bo));
-    }
-
-    private LambdaQueryWrapper<JgyDutyTransfer> buildQueryWrapper(JgyDutyTransferBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<JgyDutyTransfer> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDuId() != null, JgyDutyTransfer::getDuId, bo.getDuId());
-        lqw.eq(bo.getEventId() != null, JgyDutyTransfer::getEventId, bo.getEventId());
-        lqw.eq(bo.getDtType() != null, JgyDutyTransfer::getDtType, bo.getDtType());
-        lqw.eq(bo.getDtSource() != null, JgyDutyTransfer::getDtSource, bo.getDtSource());
-        return lqw;
-    }
-
-    @Override
-    public Boolean insertByBo(JgyDutyTransferBo bo) {
-        JgyDutyTransfer add = BeanUtil.toBean(bo, JgyDutyTransfer.class);
-        validEntityBeforeSave(add);
-        return save(add);
-    }
-
-    @Override
-    public Boolean updateByBo(JgyDutyTransferBo bo) {
-        JgyDutyTransfer update = BeanUtil.toBean(bo, JgyDutyTransfer.class);
-        validEntityBeforeSave(update);
-        return updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(JgyDutyTransfer entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return removeByIds(ids);
-    }
-}

ruoyi-zhdd/src/main/resources/mapper/zhdd/JgyDutyGroupMapper.xml → ruoyi-zhdd/src/main/resources/mapper/zhdd/DutyEmpMapper.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.zhdd.mapper.JgyDutyGroupMapper">
+<mapper namespace="com.ruoyi.zhdd.mapper.DutyEmpMapper">
 
-    <resultMap type="com.ruoyi.zhdd.domain.JgyDutyGroup" id="JgyDutyGroupResult">
-        <result property="groupId" column="group_id"/>
-        <result property="moId" column="mo_id"/>
-        <result property="name" column="name"/>
+    <resultMap type="com.ruoyi.zhdd.domain.DutyEmp" id="DutyEmpResult">
+        <result property="id" column="id"/>
+        <result property="period" column="period"/>
+        <result property="empName" column="emp_name"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>

ruoyi-zhdd/src/main/resources/mapper/zhdd/DutyReportMapper.xml

@@ -0,0 +1,20 @@
+<?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="com.ruoyi.zhdd.mapper.DutyReportMapper">
+
+    <resultMap type="com.ruoyi.zhdd.domain.DutyReport" id="DutyReportResult">
+        <result property="id" column="id"/>
+        <result property="reportContent" column="report_content"/>
+        <result property="status" column="status"/>
+        <result property="dutyDate" column="duty_date"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

ruoyi-zhdd/src/main/resources/mapper/zhdd/JgyDutyCommandContMapper.xml

@@ -1,28 +0,0 @@
-<?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="com.ruoyi.zhdd.mapper.JgyDutyCommandContMapper">
-
-    <resultMap type="com.ruoyi.zhdd.domain.JgyDutyCommandCont" id="JgyDutyCommandContResult">
-        <result property="duId" column="du_id"/>
-        <result property="moId" column="mo_id"/>
-        <result property="dccDate" column="dcc_date"/>
-        <result property="dccStartDate" column="dcc_start_date"/>
-        <result property="dccEndDate" column="dcc_end_date"/>
-        <result property="dccSNum" column="dcc_s_num"/>
-        <result property="dccWeather" column="dcc_weather"/>
-        <result property="duEmpName" column="du_emp_name"/>
-        <result property="dduId" column="ddu_id"/>
-        <result property="dduEmpName" column="ddu_emp_name"/>
-        <result property="duStatus" column="du_status"/>
-        <result property="duEmpId" column="du_emp_id"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-
-</mapper>

ruoyi-zhdd/src/main/resources/mapper/zhdd/JgyDutyEmpMapper.xml

@@ -1,14 +0,0 @@
-<?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="com.ruoyi.zhdd.mapper.JgyDutyEmpMapper">
-
-    <resultMap type="com.ruoyi.zhdd.domain.JgyDutyEmp" id="JgyDutyEmpResult">
-        <result property="deId" column="de_id"/>
-        <result property="duId" column="du_id"/>
-        <result property="empId" column="emp_id"/>
-    </resultMap>
-
-
-</mapper>

ruoyi-zhdd/src/main/resources/mapper/zhdd/JgyDutyGroupDetailMapper.xml

@@ -1,17 +0,0 @@
-<?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="com.ruoyi.zhdd.mapper.JgyDutyGroupDetailMapper">
-
-    <resultMap type="com.ruoyi.zhdd.domain.JgyDutyGroupDetail" id="JgyDutyGroupDetailResult">
-        <result property="detailId" column="detail_id"/>
-        <result property="groupId" column="group_id"/>
-        <result property="empId" column="emp_id"/>
-        <result property="empName" column="emp_name"/>
-        <result property="leaderFlag" column="leader_flag"/>
-        <result property="viceLeaderFlag" column="vice_leader_flag"/>
-    </resultMap>
-
-
-</mapper>

ruoyi-zhdd/src/main/resources/mapper/zhdd/JgyDutyTransferMapper.xml

@@ -1,16 +0,0 @@
-<?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="com.ruoyi.zhdd.mapper.JgyDutyTransferMapper">
-
-    <resultMap type="com.ruoyi.zhdd.domain.JgyDutyTransfer" id="JgyDutyTransferResult">
-        <result property="dtId" column="dt_id"/>
-        <result property="duId" column="du_id"/>
-        <result property="eventId" column="event_id"/>
-        <result property="dtType" column="dt_type"/>
-        <result property="dtSource" column="dt_source"/>
-    </resultMap>
-
-
-</mapper>