# update

cost-service/src/main/java/com/blt/other/module/cost/dto/request/CostTypeBaseReq.java

@@ -17,8 +17,8 @@ public class CostTypeBaseReq {
     @ApiModelProperty("会计一级科目编号")
     private String accountingSubjectNo;
 
-    @ApiModelProperty("1-费用类型 2-收入类型 3-借支类型")
-    private Integer type;
+    @ApiModelProperty("1-费用类型 2-收入类型 3-借支类型 默认1")
+    private Integer type = 1;
 
     @ApiModelProperty(value = "费用模版类型作用", hidden = true)
     private Integer costTemplateType;

cost-service/src/main/java/com/blt/other/module/cost/service/CostLogService.java

@@ -6,14 +6,20 @@ import java.util.List;
 
 public interface CostLogService {
 
+    //
     Integer save(String costNo, Integer updateUserid, String updateMainNote);
 
+    //
     Integer save(String costNo, Integer updateUserid, String updateMainNote, Integer type);
 
+    //
     void saveByManage(String costNo, String updateMainNote, Integer type);
 
+    //
     List<CostLogDomain> getListByCostNo(String costNo);
 
+
+    //
     List<String> getListLogs(List<CostLogDomain> logs);
 
 }

cost-service/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java

@@ -26,7 +26,6 @@ import com.blt.other.module.cost.dao.CostDetailDao;
 import com.blt.other.module.cost.dao.CostTemplateBaseColMapper;
 import com.blt.other.module.cost.dto.request.CheckCostListReq;
 import com.blt.other.module.cost.dto.request.CostQueryPageReq;
-import com.blt.other.module.cost.dto.response.CostPageResult;
 import com.blt.other.module.cost.dto.response.UpdateCostResp;
 import com.blt.other.module.cost.model.CostCurrentReviewer;
 import com.blt.other.module.cost.model.CostDetailDomain;
@@ -38,19 +37,19 @@ import com.blt.other.module.cost.vo.ApplyCallbackUrlVo;
 import com.blt.other.module.cost.vo.CashierCallbackUrlDataDataVo;
 import com.blt.other.module.cost.vo.CashierCallbackUrlVo;
 import com.blt.other.module.sys.service.UserService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -86,27 +85,6 @@ public abstract class AbstractCostService implements CostService {
     OaDepartmentMapper oaDepartmentMapper;
 
     @Override
-    public CostPageResult getAllCost(Integer pageNum,
-                                     Integer pageSize,
-                                     Integer userId,
-                                     String projectTypes) {
-        PageHelper.startPage(pageNum, pageSize);
-        List<String> projectTypeList = new ArrayList<>();
-        if (!StringUtils.isEmpty(projectTypes)) {
-            projectTypeList = Lists.newArrayList(projectTypes.split(",")).stream().filter(str -> !StringUtils.isEmpty(str)).collect(Collectors.toList());
-        }
-
-        List<CostDomain> costDomains = costDao.selectAll(userId, projectTypeList);
-
-        this.setPrimaryDepartment(costDomains);
-
-        CostPageResult result = new CostPageResult();
-        result.setCosts(costDomains.stream().map(CostDomain::castToDto).collect(Collectors.toList()));
-        result.setPageInfo(new PageInfo<>(costDomains));
-        return result;
-    }
-
-    @Override
     public void setPrimaryDepartment(List<CostDomain> costDomains) {
         if (ListUtil.isEmpty(costDomains)) {
             return;