考勤组更新api

sop-business/src/main/java/com/qmth/sop/business/bean/result/SysDingGroupResult.java

@@ -1,13 +1,11 @@
 package com.qmth.sop.business.bean.result;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.business.entity.SysDingGroup;
-import com.qmth.sop.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
+import com.qmth.sop.business.entity.SysDingObj;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -30,6 +28,19 @@ public class SysDingGroupResult extends SysDingGroup implements Serializable {
     @ApiModelProperty(value = "供应商")
     private Long supplier;
 
+    @ApiModelProperty(value = "适用考勤对象")
+    private List<SysDingObj> dingObjs;
+
+    public List<SysDingObj> getDingObjs() {
+        return dingObjs;
+    }
+
+    public void setDingObjs(List<SysDingObj> dingObjs) {
+        this.dingObjs = dingObjs;
+    }
+
+
+
     public String getService() {
         return service;
     }
@@ -45,4 +56,8 @@ public class SysDingGroupResult extends SysDingGroup implements Serializable {
     public void setSupplier(Long supplier) {
         this.supplier = supplier;
     }
+
+
+
+
 }

sop-business/src/main/java/com/qmth/sop/business/mapper/SysDingGroupMapper.java

@@ -23,6 +23,6 @@ public interface SysDingGroupMapper extends BaseMapper<SysDingGroup> {
 	 * @param iPage
 	 * @return
 	 */
-	public IPage<SysDingGroupResult> query(IPage<Map> iPage, @Param("query") String query, @Param("serviceId") long serviceId);
+	public IPage<SysDingGroupResult> query(IPage<Map> iPage, @Param("query") String query, @Param("serviceId") Long serviceId);
 
 }

sop-business/src/main/java/com/qmth/sop/business/service/SysDingGroupService.java

@@ -23,21 +23,21 @@ public interface SysDingGroupService extends IService<SysDingGroup>{
     * @param iPage
     * @return
     */
-    IPage<SysDingGroupResult> query(IPage<Map> iPage, String query, long serviceId);
+    IPage<SysDingGroupResult> query(IPage<Map> iPage, String query, Long serviceId);
 
     /**
     * 新增考勤组表
     *
     * @param sysDingGroup
     */
-    void add(SysDingGroup sysDingGroup);
+    void add(SysDingGroupResult sysDingGroup);
 
     /**
     * 修改考勤组表
     *
     * @param sysDingGroup
     */
-    void update(SysDingGroup sysDingGroup);
+    void update(SysDingGroupResult sysDingGroup);
 
     /**
     * 删除考勤组表

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysDingGroupServiceImpl.java

@@ -1,22 +1,22 @@
 package com.qmth.sop.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.api.exception.ApiException;
 import com.qmth.sop.business.bean.result.SysDingGroupResult;
 import com.qmth.sop.business.entity.SysDingGroup;
+import com.qmth.sop.business.entity.SysDingObj;
+import com.qmth.sop.business.entity.SysLevelRole;
 import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.mapper.SysDingGroupMapper;
 import com.qmth.sop.business.service.SysDingGroupService;
-import com.qmth.sop.common.contant.SystemConstant;
-import com.qmth.sop.common.util.ResultUtil;
+import com.qmth.sop.business.service.SysDingObjService;
 import com.qmth.sop.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * 考勤组表 服务实现.
@@ -28,56 +28,72 @@ import java.util.Objects;
  * @Company: www.qmth.com.cn
  */
 @Service
-public class SysDingGroupServiceImpl extends ServiceImpl<SysDingGroupMapper, SysDingGroup> implements SysDingGroupService{
+public class SysDingGroupServiceImpl extends ServiceImpl<SysDingGroupMapper, SysDingGroup> implements SysDingGroupService {
+
+    @Resource
+    SysDingObjService sysDingObjService;
 
+    /**
+     * 查询列表
+     *
+     * @param iPage
+     * @return
+     */
+    @Override
+    public IPage<SysDingGroupResult> query(IPage<Map> iPage, String query, Long serviceId) {
+        IPage<SysDingGroupResult> dingGroupResultIPage = this.baseMapper.query(iPage, query, serviceId);
+        dingGroupResultIPage.getRecords().forEach(e -> {
+            e.setDingObjs(sysDingObjService.list(new QueryWrapper<SysDingObj>().lambda().eq(SysDingObj::getDingGroupId, e.getId())));
+        });
+        return dingGroupResultIPage;
+    }
 
-		/**
-		* 查询列表
-		*
-		* @param iPage
-		* @return
-		*/
-		@Override
-		public IPage<SysDingGroupResult> query(IPage<Map> iPage, String query, long serviceId) {
-				return this.baseMapper.query(iPage, query,serviceId);
-		}
-		/**
-		* 新增考勤组表
-		*
-		* @param sysDingGroup
-		*/
-		@Override
-		@Transactional
-		public void add(SysDingGroup sysDingGroup) {
-			SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-			sysDingGroup.setCreateId(sysUser.getId());
-			sysDingGroup.setCreateTime(System.currentTimeMillis());
-			this.saveOrUpdate(sysDingGroup);
-		}
+    /**
+     * 新增考勤组表
+     *
+     * @param sysDingGroup
+     */
+    @Override
+    @Transactional
+    public void add(SysDingGroupResult sysDingGroup) {
+        sysDingGroup.getDingObjs().forEach(e -> {
+            e.setDingGroupId(sysDingGroup.getId());
+        });
+        sysDingObjService.saveBatch(sysDingGroup.getDingObjs());
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        sysDingGroup.setCreateId(sysUser.getId());
+        sysDingGroup.setCreateTime(System.currentTimeMillis());
+        this.saveOrUpdate(sysDingGroup);
+    }
 
-		/**
-		* 修改考勤组表
-		*
-		* @param sysDingGroup
-		*/
-		@Override
-		@Transactional
-		public void update(SysDingGroup sysDingGroup) {
-			SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-			sysDingGroup.setCreateId(sysUser.getId());
-			sysDingGroup.setUpdateTime(System.currentTimeMillis());
-			this.saveOrUpdate(sysDingGroup);
-		}
+    /**
+     * 修改考勤组表
+     *
+     * @param sysDingGroup
+     */
+    @Override
+    @Transactional
+    public void update(SysDingGroupResult sysDingGroup) {
+        sysDingObjService.remove(new QueryWrapper<SysDingObj>().lambda().eq(SysDingObj::getDingGroupId, sysDingGroup.getId()));
+        sysDingGroup.getDingObjs().forEach(e -> {
+            e.setDingGroupId(sysDingGroup.getId());
+        });
+        sysDingObjService.saveBatch(sysDingGroup.getDingObjs());
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        sysDingGroup.setUpdateId(sysUser.getId());
+        sysDingGroup.setUpdateTime(System.currentTimeMillis());
+        this.saveOrUpdate(sysDingGroup);
+    }
 
-		/**
-		* 删除考勤组表
-		*
-		* @param id
-		*/
-		@Override
-		@Transactional
-		public void delete(Long id) {
-			this.removeById(id);
-		}
+    /**
+     * 删除考勤组表
+     *
+     * @param id
+     */
+    @Override
+    @Transactional
+    public void delete(Long id) {
+        this.removeById(id);
+    }
 
 }

sop-server/src/main/java/com/qmth/sop/server/api/SysDingGroupController.java

@@ -1,5 +1,6 @@
 package com.qmth.sop.server.api;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,9 +9,10 @@ import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.EditResult;
 import com.qmth.sop.business.bean.result.SysDingGroupResult;
-import com.qmth.sop.business.entity.SysDevice;
-import com.qmth.sop.business.entity.SysDingGroup;
+import com.qmth.sop.business.bean.result.SysLevelResult;
+import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.service.SysDingGroupService;
+import com.qmth.sop.business.service.SysDingObjService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
@@ -44,13 +46,16 @@ public class SysDingGroupController {
     @Resource
     SysDingGroupService sysDingGroupService;
 
-   
+    @Resource
+    SysDingObjService sysDingObjService;
+
+    
     @ApiOperation(value = "考勤组表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤组表列表信息", response = SysDingGroupResult.class)})
     public Result query(
                 @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String query,
-                @ApiParam(value = "服务单元id", required = false) @RequestParam(required = false) long serviceId,
+                @ApiParam(value = "服务单元id", required = false) @RequestParam(required = false) Long serviceId,
                 @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                 @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysDingGroupResult> resultIPage = sysDingGroupService.query(new Page<>(pageNumber, pageSize),query,serviceId);
@@ -58,27 +63,27 @@ public class SysDingGroupController {
         return ResultUtil.ok(resultIPage);
     }
 
-   
+    
     @ApiOperation(value = "新增考勤组表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增考勤组表信息", response = Object.class)})
-    public Result add(@ApiParam(value = "考勤组表信息", required = true) @RequestBody(required = true) SysDingGroup sysDingGroup) {
+    public Result add(@ApiParam(value = "考勤组表信息", required = true) @RequestBody(required = true) SysDingGroupResult sysDingGroup) {
         sysDingGroupService.add(sysDingGroup);
         return ResultUtil.ok();
     }
 
 
-   
+    
     @ApiOperation(value = "修改考勤组表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改考勤组表信息", response = Object.class)})
-    public Result update(@ApiParam(value = "考勤组表信息", required = true) @RequestBody(required = true) SysDingGroup sysDingGroup) {
+    public Result update(@ApiParam(value = "考勤组表信息", required = true) @RequestBody(required = true) SysDingGroupResult sysDingGroup) {
         sysDingGroupService.update(sysDingGroup);
         return ResultUtil.ok();
     }
 
 
-   
+    
     @ApiOperation(value = "删除考勤组表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除考勤组表信息", response = Object.class)})
@@ -90,7 +95,7 @@ public class SysDingGroupController {
     /*列表
 
      */
-   
+    
     @ApiOperation(value = "考勤组表列表接口")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤组表列表", response = SysDingGroup.class, responseContainer = "List")})
@@ -102,12 +107,15 @@ public class SysDingGroupController {
      * @param id
      * @return
      */
-
+    
     @ApiOperation(value = "获取单个考勤组表信息")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
-    @ApiResponses({@ApiResponse(code = 200, message = "考勤组表信息", response = SysDingGroup.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考勤组表信息", response = SysDingGroupResult.class)})
     public Result get(@ApiParam(value = "id", required = true) @RequestParam(value = "id") long id) {
-        return ResultUtil.ok(sysDingGroupService.getById(id));
+        SysDingGroup sysDingGroup = sysDingGroupService.getById(id);
+        SysDingGroupResult sysDingGroupResult= JSON.toJavaObject((JSON) JSON.toJSON(sysDingGroup),SysDingGroupResult.class);
+        sysDingGroupResult.setDingObjs(sysDingObjService.list(new QueryWrapper<SysDingObj>().lambda().eq(SysDingObj::getDingGroupId, id)));
+        return ResultUtil.ok(sysDingGroupResult);
     }