值班管理接口

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

@@ -48,31 +48,8 @@ public class JgyDutyGroupController extends BaseController {
     @ApiOperation("查询值班组信息列表")
     @PreAuthorize("@ss.hasPermi('zhdd:dutyGroup:list')")
     @GetMapping("/list")
-    public TableDataInfo<JgyDutyGroupVo> list(@Validated(QueryGroup.class) JgyDutyGroupBo bo) {
-        return iJgyDutyGroupService.queryPageList(bo);
-    }
-
-    /**
-     * 导出值班组信息列表
-     */
-    @ApiOperation("导出值班组信息列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroup:export')")
-    @Log(title = "值班组信息", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(@Validated JgyDutyGroupBo bo, HttpServletResponse response) {
-        List<JgyDutyGroupVo> list = iJgyDutyGroupService.queryList(bo);
-        ExcelUtil.exportExcel(list, "值班组信息", JgyDutyGroupVo.class, response);
-    }
-
-    /**
-     * 获取值班组信息详细信息
-     */
-    @ApiOperation("获取值班组信息详细信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroup:query')")
-    @GetMapping("/{groupId}")
-    public AjaxResult<JgyDutyGroupVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("groupId") Long groupId) {
-        return AjaxResult.success(iJgyDutyGroupService.queryById(groupId));
+    public AjaxResult list(@Validated(QueryGroup.class) JgyDutyGroupBo bo) {
+        return AjaxResult.success(iJgyDutyGroupService.queryList(bo));
     }
 
     /**

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

@@ -48,55 +48,8 @@ public class JgyDutyGroupDetailController extends BaseController {
     @ApiOperation("查询值班组详细列表")
     @PreAuthorize("@ss.hasPermi('zhdd:dutyGroupDetail:list')")
     @GetMapping("/list")
-    public TableDataInfo<JgyDutyGroupDetailVo> list(@Validated(QueryGroup.class) JgyDutyGroupDetailBo bo) {
-        return iJgyDutyGroupDetailService.queryPageList(bo);
-    }
-
-    /**
-     * 导出值班组详细列表
-     */
-    @ApiOperation("导出值班组详细列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroupDetail:export')")
-    @Log(title = "值班组详细", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(@Validated JgyDutyGroupDetailBo bo, HttpServletResponse response) {
-        List<JgyDutyGroupDetailVo> list = iJgyDutyGroupDetailService.queryList(bo);
-        ExcelUtil.exportExcel(list, "值班组详细", JgyDutyGroupDetailVo.class, response);
-    }
-
-    /**
-     * 获取值班组详细详细信息
-     */
-    @ApiOperation("获取值班组详细详细信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroupDetail:query')")
-    @GetMapping("/{detailId}")
-    public AjaxResult<JgyDutyGroupDetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("detailId") Long detailId) {
-        return AjaxResult.success(iJgyDutyGroupDetailService.queryById(detailId));
-    }
-
-    /**
-     * 新增值班组详细
-     */
-    @ApiOperation("新增值班组详细")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroupDetail:add')")
-    @Log(title = "值班组详细", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody JgyDutyGroupDetailBo bo) {
-        return toAjax(iJgyDutyGroupDetailService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改值班组详细
-     */
-    @ApiOperation("修改值班组详细")
-    @PreAuthorize("@ss.hasPermi('zhdd:dutyGroupDetail:edit')")
-    @Log(title = "值班组详细", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody JgyDutyGroupDetailBo bo) {
-        return toAjax(iJgyDutyGroupDetailService.updateByBo(bo) ? 1 : 0);
+    public AjaxResult list(@Validated(QueryGroup.class) JgyDutyGroupDetailBo bo) {
+        return AjaxResult.success(iJgyDutyGroupDetailService.queryList(bo));
     }
 
     /**

ruoyi-admin/src/main/resources/application.yml

@@ -177,7 +177,7 @@ mybatis-plus:
       # INPUT 用户输入ID
       # ASSIGN_ID 全局唯一ID
       # ASSIGN_UUID 全局唯一ID UUID
-      idType: ASSIGN_ID
+      idType: AUTO
       # 表名前缀
       tablePrefix: null
       # 字段 format,例: %s,(对主键无效)

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

@@ -1,5 +1,6 @@
 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;
@@ -8,7 +9,9 @@ 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;
 
@@ -43,13 +46,6 @@ public class JgyDutyGroupBo extends BaseEntity {
     private String name;
 
     /**
-     * $column.columnComment
-     */
-    @ApiModelProperty(value = "$column.columnComment")
-    private String delFlag;
-
-
-    /**
      * 分页大小
      */
     @ApiModelProperty("分页大小")
@@ -73,4 +69,7 @@ public class JgyDutyGroupBo extends BaseEntity {
     @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/service/impl/JgyDutyGroupServiceImpl.java

@@ -5,6 +5,10 @@ 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;
@@ -14,6 +18,7 @@ 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;
@@ -28,6 +33,9 @@ import java.util.Collection;
 @Service
 public class JgyDutyGroupServiceImpl extends ServicePlusImpl<JgyDutyGroupMapper, JgyDutyGroup, JgyDutyGroupVo> implements IJgyDutyGroupService {
 
+    @Autowired
+    private IJgyDutyGroupDetailService dutyGroupDetailService;
+
     @Override
     public JgyDutyGroupVo queryById(Long groupId){
         return getVoById(groupId);
@@ -53,17 +61,35 @@ public class JgyDutyGroupServiceImpl extends ServicePlusImpl<JgyDutyGroupMapper,
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(JgyDutyGroupBo bo) {
         JgyDutyGroup add = BeanUtil.toBean(bo, JgyDutyGroup.class);
         validEntityBeforeSave(add);
-        return save(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);
-        return updateById(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;
     }
 
     /**
@@ -80,6 +106,9 @@ public class JgyDutyGroupServiceImpl extends ServicePlusImpl<JgyDutyGroupMapper,
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return removeByIds(ids);
+        removeByIds(ids);
+        // 删除组信息
+        dutyGroupDetailService.remove(Wrappers.<JgyDutyGroupDetail>lambdaQuery().in(JgyDutyGroupDetail::getGroupId, ids));
+        return true;
     }
 }