删除重复的Page

src/main/java/com/imed/costaccount/model/dto/IncomeAccountDto.java

@@ -0,0 +1,21 @@
+package com.imed.costaccount.model.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.model.dto
+ * @date 2021-08-03 15:14
+ */
+@Data
+@Api("为收入归集设置添加会计科目实体类")
+public class IncomeAccountDto {
+
+    @ApiModelProperty("收入归集设置的Id")
+    public Long id;
+
+    @ApiModelProperty("会计科目的代码集合")
+    public String[] accountCodes;
+}

src/main/java/com/imed/costaccount/service/CostIncomeGroupSetService.java

@@ -5,6 +5,7 @@ import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.CostIncomeGroupSet;
 import com.imed.costaccount.model.dto.CostIncomeGroupSetEditDto;
 import com.imed.costaccount.model.dto.CostIncomeGroupSetSaveDto;
+import com.imed.costaccount.model.dto.IncomeAccountDto;
 import com.imed.costaccount.model.vo.CostIncomeGroupSetVO;
 
 import java.util.List;
@@ -55,8 +56,8 @@ public interface CostIncomeGroupSetService extends IService<CostIncomeGroupSet>
 
     /**
      * 设置对应的排除成本科目
-     * @param accountList
+     * @param incomeAccountDto
      */
-    void updateAccountCode(Integer id,List<String> accountList);
+    void updateAccountCode(IncomeAccountDto incomeAccountDto);
 }
 

src/main/java/com/imed/costaccount/service/CostShareLevelService.java

@@ -1,11 +1,11 @@
 package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.CostShareLevel;
 import com.imed.costaccount.model.dto.CostShareLevelEditDto;
 import com.imed.costaccount.model.dto.CostShareLevelSaveDto;
 import com.imed.costaccount.model.vo.CostShareLevelVO;
-import com.imed.costaccount.utils.PageUtils;
 
 import java.util.List;
 

src/main/java/com/imed/costaccount/service/ResponsibilityDepartmentService.java

@@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.DepartDTO;
 import com.imed.costaccount.model.vo.CenterDepartmentVO;
-import com.imed.costaccount.utils.PageUtils;
 import com.imed.costaccount.model.ResponsibilityDepartment;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 责任中心科室对照表

src/main/java/com/imed/costaccount/service/RoleMenuService.java

@@ -1,11 +1,8 @@
 package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.imed.costaccount.utils.PageUtils;
 import com.imed.costaccount.model.RoleMenu;
 
-import java.util.Map;
-
 /**
  * 角色与菜单对应关系
  *

src/main/java/com/imed/costaccount/service/UserRoleService.java

@@ -1,11 +1,8 @@
 package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.imed.costaccount.utils.PageUtils;
 import com.imed.costaccount.model.UserRole;
 
-import java.util.Map;
-
 /**
  * 用户与角色对应关系
  *

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupSetServiceImpl.java

@@ -14,6 +14,7 @@ import com.imed.costaccount.model.CostIncomeGroupSet;
 import com.imed.costaccount.model.Responsibility;
 import com.imed.costaccount.model.dto.CostIncomeGroupSetEditDto;
 import com.imed.costaccount.model.dto.CostIncomeGroupSetSaveDto;
+import com.imed.costaccount.model.dto.IncomeAccountDto;
 import com.imed.costaccount.model.vo.CostIncomeGroupSetVO;
 import com.imed.costaccount.service.CostIncomeGroupSetService;
 import com.imed.costaccount.service.ResponsibilityService;
@@ -211,16 +212,20 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
 
     /**
      * 设置对应的排除成本科目
-     * @param id  收入归集设置的Id
-     * @param accountList 对应科目的Code集合
+     * @param incomeAccountDto
      */
     @Override
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
-    public void updateAccountCode(Integer id,List<String> accountList) {
+    public void updateAccountCode(IncomeAccountDto incomeAccountDto) {
+        Long id = incomeAccountDto.getId();
+        List<String> accountList = Arrays.asList(incomeAccountDto.getAccountCodes());
         CostIncomeGroupSet incomeGroupSet = this.getById(id);
         if (Objects.isNull(incomeGroupSet)){
             throw new CostException(500,"收入归集设置不存在");
         }
+        if (NumberConstant.TWO.equals(incomeGroupSet.getOpenDepartmentStatus())|| NumberConstant.TWO.equals(incomeGroupSet.getStartDepartmentStatus())){
+            throw new CostException(500,"存在成本中心 不允许设置排除的会计科目");
+        }
         if(CollUtil.isNotEmpty(accountList)){
             String accountCodes = accountList.stream().map(String::valueOf).collect(Collectors.joining(StrUtil.COMMA));
             incomeGroupSet.setAccountCode(accountCodes);

src/main/java/com/imed/costaccount/service/impl/CostShareLevelServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.CostShareLevelMapper;
 import com.imed.costaccount.model.CostShareLevel;
 import com.imed.costaccount.model.User;
@@ -12,7 +13,6 @@ import com.imed.costaccount.model.dto.CostShareLevelSaveDto;
 import com.imed.costaccount.model.vo.CostShareLevelVO;
 import com.imed.costaccount.service.CostShareLevelService;
 import com.imed.costaccount.utils.BeanUtil;
-import com.imed.costaccount.utils.PageUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

src/main/java/com/imed/costaccount/utils/PageUtils.java

@@ -1,102 +0,0 @@
-package com.imed.costaccount.utils;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 分页工具类
- *
- * @author Mark sunlightcs@gmail.com
- */
-public class PageUtils implements Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 总记录数
-	 */
-	private int totalCount;
-	/**
-	 * 每页记录数
-	 */
-	private int pageSize;
-	/**
-	 * 总页数
-	 */
-	private int totalPage;
-	/**
-	 * 当前页数
-	 */
-	private int currPage;
-	/**
-	 * 列表数据
-	 */
-	private List<?> list;
-	
-	/**
-	 * 分页
-	 * @param list        列表数据
-	 * @param totalCount  总记录数
-	 * @param pageSize    每页记录数
-	 * @param currPage    当前页数
-	 */
-	public PageUtils(List<?> list, int totalCount, int pageSize, int currPage) {
-		this.list = list;
-		this.totalCount = totalCount;
-		this.pageSize = pageSize;
-		this.currPage = currPage ;
-		this.totalPage = (int)Math.ceil((double)totalCount/pageSize);
-	}
-
-	/**
-	 * 分页
-	 */
-	public PageUtils(IPage<?> page) {
-		this.list = page.getRecords();
-		this.totalCount = (int)page.getTotal();
-		this.pageSize = (int)page.getSize();
-		this.currPage = (int)page.getCurrent();
-		this.totalPage = (int)page.getPages();
-	}
-
-	public int getTotalCount() {
-		return totalCount;
-	}
-
-	public void setTotalCount(int totalCount) {
-		this.totalCount = totalCount;
-	}
-
-	public int getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	public int getTotalPage() {
-		return totalPage;
-	}
-
-	public void setTotalPage(int totalPage) {
-		this.totalPage = totalPage;
-	}
-
-	public int getCurrPage() {
-		return currPage;
-	}
-
-	public void setCurrPage(int currPage) {
-		this.currPage = currPage;
-	}
-
-	public List<?> getList() {
-		return list;
-	}
-
-	public void setList(List<?> list) {
-		this.list = list;
-	}
-	
-}

src/main/java/com/imed/costaccount/web/AccountingController.java

@@ -1,5 +1,6 @@
 package com.imed.costaccount.web;
 
+import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.AccountingEditDTO;
@@ -7,7 +8,6 @@ import com.imed.costaccount.model.dto.AccountingSaveDTO;
 import com.imed.costaccount.model.vo.AccountVO;
 import com.imed.costaccount.model.vo.SelectAccountingVO;
 import com.imed.costaccount.service.AccountingService;
-import com.imed.costaccount.utils.PageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/imed/costaccount/web/CostIncomeGroupSetController.java

@@ -5,6 +5,7 @@ import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.common.util.UserContext;
 import com.imed.costaccount.model.dto.CostIncomeGroupSetEditDto;
 import com.imed.costaccount.model.dto.CostIncomeGroupSetSaveDto;
+import com.imed.costaccount.model.dto.IncomeAccountDto;
 import com.imed.costaccount.model.vo.CostIncomeGroupSetVO;
 import com.imed.costaccount.service.CostIncomeGroupSetService;
 import com.imed.costaccount.service.impl.AccountingServiceImpl;
@@ -15,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Arrays;
-import java.util.List;
 
 
 /**
@@ -84,7 +84,7 @@ public class CostIncomeGroupSetController{
      * 删除
      */
     @PostMapping("/delete")
-    @ApiOperation("分删除收入归集设置数据")
+    @ApiOperation("删除收入归集设置数据")
     public Result delete(@RequestBody Long[] ids){
 		costIncomeGroupSetService.removeByIds(Arrays.asList(ids));
         return Result.ok();
@@ -95,9 +95,9 @@ public class CostIncomeGroupSetController{
      */
     @PostMapping("/addIncomeAccount")
     @ApiOperation("添加需要排除的成本科目")
-    public Result addIncomeAccount(Integer id,String[] accountCode){
-        List<String> accountList = Arrays.asList(accountCode);
-        costIncomeGroupSetService.updateAccountCode(id,accountList);
+    public Result addIncomeAccount(@RequestBody IncomeAccountDto incomeAccountDto){
+
+        costIncomeGroupSetService.updateAccountCode(incomeAccountDto);
         return Result.ok();
     }
 

src/main/java/com/imed/costaccount/web/CostShareLevelController.java

@@ -1,12 +1,12 @@
 package com.imed.costaccount.web;
 
+import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.CostShareLevelEditDto;
 import com.imed.costaccount.model.dto.CostShareLevelSaveDto;
 import com.imed.costaccount.model.vo.CostShareLevelVO;
 import com.imed.costaccount.service.CostShareLevelService;
-import com.imed.costaccount.utils.PageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;

src/main/java/com/imed/costaccount/web/ResponsibilityDepartmentController.java

@@ -1,11 +1,11 @@
 package com.imed.costaccount.web;
 
+import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.DepartDTO;
 import com.imed.costaccount.model.vo.CenterDepartmentVO;
 import com.imed.costaccount.service.ResponsibilityDepartmentService;
-import com.imed.costaccount.utils.PageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;