update

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/cost/CostCheckController.java

@@ -3,7 +3,6 @@ package com.blt.other.module.cost.controller.cost;
 import com.bailuntec.cost.api.dto.CostDto;
 import com.bailuntec.cost.api.response.CostResult;
 import com.blt.other.common.util.AxiosUtil;
-import com.blt.other.module.cost.dto.CostApiDto;
 import com.blt.other.module.cost.dto.UpdateCostResp;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.service.CostCashiercallbackService;
@@ -14,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/costplan/CostPlanNewController.java

 package com.blt.other.module.cost.controller.costplan;
 
 import com.blt.other.common.util.CurUtils;
-import com.blt.other.module.cost.dto.CostPlanNewApiDto;
 import com.blt.other.module.cost.dto.RestResp;
 import com.blt.other.module.cost.dto.SaveResp;
 import com.blt.other.module.cost.service.CostPlanService;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/costtemplate/CostTemplateBaseColController.java

@@ -2,7 +2,7 @@ package com.blt.other.module.cost.controller.costtemplate;
 
 
 import com.bailuntec.cost.api.response.CostResult;
-import com.blt.other.module.cost.dto.CostTemplateBaseColApiReq;
+import com.blt.other.module.cost.dto.AddReq;
 import com.blt.other.module.cost.model.CostTemplateBaseCol;
 import com.blt.other.module.cost.service.ICostTemplateBaseColService;
 import io.swagger.annotations.Api;
@@ -37,7 +37,7 @@ public class CostTemplateBaseColController {
 
     @ApiOperation("新增费用单基础字段")
     @PostMapping("/add")
-    public CostResult<CostTemplateBaseCol> add(@RequestBody CostTemplateBaseColApiReq.AddReq req) {
+    public CostResult<CostTemplateBaseCol> add(@RequestBody AddReq req) {
         CostTemplateBaseCol costTemplateBaseCol = costTemplateBaseColService.add(req);
         return CostResult.success(costTemplateBaseCol);
     }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/costtemplate/CostTemplateColController.java

@@ -2,7 +2,7 @@ package com.blt.other.module.cost.controller.costtemplate;
 
 
 import com.bailuntec.cost.api.response.CostResult;
-import com.blt.other.module.cost.dto.CostTemplateColApiReq;
+import com.blt.other.module.cost.dto.QueryListReq;
 import com.blt.other.module.cost.model.CostTemplateCol;
 import com.blt.other.module.cost.service.ICostTemplateColService;
 import io.swagger.annotations.Api;
@@ -51,7 +51,7 @@ public class CostTemplateColController {
 
     @ApiOperation("/筛选费用单模版字段")
     @PostMapping("/queryList")
-    public CostResult<List<CostTemplateCol>> queryList(@RequestBody CostTemplateColApiReq.QueryListReq req) {
+    public CostResult<List<CostTemplateCol>> queryList(@RequestBody QueryListReq req) {
         List<CostTemplateCol> resp = costTemplateColService.queryList(req);
         return CostResult.success(resp);
     }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/costtemplate/CostTemplateController.java

@@ -2,7 +2,7 @@ package com.blt.other.module.cost.controller.costtemplate;
 
 
 import com.bailuntec.cost.api.response.CostResult;
-import com.blt.other.module.cost.dto.CostTemplateApiDto;
+import com.blt.other.module.cost.dto.QueryListReq;
 import com.blt.other.module.cost.model.CostTemplate;
 import com.blt.other.module.cost.service.ICostTemplateService;
 import io.swagger.annotations.Api;
@@ -51,7 +51,7 @@ public class CostTemplateController {
 
     @ApiOperation("查询费用单模板列表")
     @GetMapping("/queryList")
-    public CostResult<List<CostTemplate>> queryList(CostTemplateApiDto.QueryListReq req) {
+    public CostResult<List<CostTemplate>> queryList(QueryListReq req) {
         List<CostTemplate> costTemplateList = costTemplateService.queryList(req);
         return CostResult.success(costTemplateList);
     }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/dto/QueryListReq.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -54,4 +55,25 @@ public class QueryListReq {
     @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
     private LocalDateTime updateTimeEnd;
 
+
+    /**/
+    private BigDecimal enableAutoReview;
+
+    private String templateName;
+
+    private BigDecimal enableDepartmentReview;
+
+    private BigDecimal enableFinalReview;
+    private BigDecimal enableFinancialAutoReview;
+
+
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+
+    private LocalDateTime createStartTime;
+    private LocalDateTime createEndTime;
+
+    private Boolean setAutoCheck;
+
+
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/CostListSearchService.java

 package com.blt.other.module.cost.service;
 
-import com.blt.other.module.cost.dto.CostApiDto;
 import com.blt.other.module.cost.dto.GetByKeyResp;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.vo.CostListSearchKeysVo;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/CostPlanSearchService.java

 package com.blt.other.module.cost.service;
 
-import com.blt.other.module.cost.dto.CostPlanApiDto;
 import com.blt.other.module.cost.dto.SearchByKeyResp;
 
 public interface CostPlanSearchService {

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/CostPlanService.java

 package com.blt.other.module.cost.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.blt.other.module.cost.dto.CostPlanApiDto;
 import com.blt.other.module.cost.dto.GetAllCostPlanReq;
 import com.blt.other.module.cost.dto.GetAllCostPlanResp;
 import com.blt.other.module.cost.dto.GetCostPlanResp;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/CostService.java

@@ -4,7 +4,6 @@ import com.bailuntec.cost.api.dto.CostDto;
 import com.bailuntec.cost.api.dto.CostListPrintDto;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.blt.other.module.cost.dto.CheckCostListReq;
-import com.blt.other.module.cost.dto.CostApiDto;
 import com.blt.other.module.cost.dto.CostPageResult;
 import com.blt.other.module.cost.dto.UpdateCostResp;
 import com.blt.other.module.cost.model.CostDomain;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/ICostTemplateBaseColService.java

 package com.blt.other.module.cost.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.blt.other.module.cost.dto.AddReq;
 import com.blt.other.module.cost.dto.CostTemplateBaseColApiReq;
 import com.blt.other.module.cost.model.CostTemplateBaseCol;
 import com.blt.other.module.cost.model.CostTemplateCol;
@@ -34,7 +35,7 @@ public interface ICostTemplateBaseColService extends IService<CostTemplateBaseCo
      *
      * @param req req
      */
-    CostTemplateBaseCol add(CostTemplateBaseColApiReq.AddReq req);
+    CostTemplateBaseCol add(AddReq req);
 
     /**
      * <p>

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/ICostTemplateColService.java

 package com.blt.other.module.cost.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.blt.other.module.cost.dto.CostTemplateColApiReq;
+import com.blt.other.module.cost.dto.QueryListReq;
 import com.blt.other.module.cost.model.CostTemplate;
 import com.blt.other.module.cost.model.CostTemplateCol;
 
@@ -71,7 +71,7 @@ public interface ICostTemplateColService extends IService<CostTemplateCol> {
      * @param req req
      * @return res
      */
-    List<CostTemplateCol> queryList(CostTemplateColApiReq.QueryListReq req);
+    List<CostTemplateCol> queryList(QueryListReq req);
 
     /**
      * <p>

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/ICostTemplateService.java

 package com.blt.other.module.cost.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.blt.other.module.cost.dto.CostTemplateApiDto;
+import com.blt.other.module.cost.dto.QueryListReq;
 import com.blt.other.module.cost.model.CostTemplate;
 import org.springframework.lang.Nullable;
 
@@ -62,5 +62,5 @@ public interface ICostTemplateService extends IService<CostTemplate> {
      * @param req req
      * @return
      */
-    List<CostTemplate> queryList(CostTemplateApiDto.QueryListReq req);
+    List<CostTemplate> queryList(QueryListReq req);
 }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/CostListSearchServiceImpl.java

@@ -3,7 +3,6 @@ package com.blt.other.module.cost.service.impl;
 import com.bailuntec.cost.api.dto.CostDto;
 import com.blt.other.module.cost.dao.CostDao;
 import com.blt.other.module.cost.dao.CostListSearchDao;
-import com.blt.other.module.cost.dto.CostApiDto;
 import com.blt.other.module.cost.dto.GetByKeyResp;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.service.CostListSearchService;

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

@@ -24,7 +24,6 @@ import com.blt.other.module.auth.model.OaUser;
 import com.blt.other.module.auth.service.UserService;
 import com.blt.other.module.cost.dao.*;
 import com.blt.other.module.cost.dto.CheckCostListReq;
-import com.blt.other.module.cost.dto.CostApiDto;
 import com.blt.other.module.cost.dto.CostPageResult;
 import com.blt.other.module.cost.dto.UpdateCostResp;
 import com.blt.other.module.cost.model.CostDetailDomain;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/AbstractCostPlanService.java

@@ -5,7 +5,6 @@ import com.bailuntec.cost.api.dto.CostPlanDto;
 import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.module.auth.dao.UserDao;
 import com.blt.other.module.cost.dao.*;
-import com.blt.other.module.cost.dto.CostPlanApiDto;
 import com.blt.other.module.cost.dto.GetAllCostPlanReq;
 import com.blt.other.module.cost.dto.GetAllCostPlanResp;
 import com.blt.other.module.cost.dto.GetCostPlanResp;

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costtemplate/CostTemplateBaseColServiceImpl.java

@@ -5,7 +5,7 @@ import com.bailuntec.common.ListUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.blt.other.module.auth.dao.UserDao;
 import com.blt.other.module.cost.dao.CostTemplateBaseColMapper;
-import com.blt.other.module.cost.dto.CostTemplateBaseColApiReq;
+import com.blt.other.module.cost.dto.AddReq;
 import com.blt.other.module.cost.model.CostTemplateBaseCol;
 import com.blt.other.module.cost.model.CostTemplateCol;
 import com.blt.other.module.cost.service.ICostTemplateBaseColService;
@@ -36,7 +36,7 @@ public class CostTemplateBaseColServiceImpl extends ServiceImpl<CostTemplateBase
     }
 
     @Override
-    public CostTemplateBaseCol add(CostTemplateBaseColApiReq.AddReq req) {
+    public CostTemplateBaseCol add(AddReq req) {
         if (!req.getIsExtension()) {
             throw new RuntimeException("只能添加扩展字段");
         }
@@ -47,8 +47,6 @@ public class CostTemplateBaseColServiceImpl extends ServiceImpl<CostTemplateBase
     }
 
 
-
-
     @Override
     public void modify(CostTemplateBaseCol costTemplateBaseCol) {
         this.updateById(costTemplateBaseCol);

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costtemplate/CostTemplateColServiceImpl.java

@@ -8,7 +8,7 @@ import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.module.auth.dao.UserDao;
 import com.blt.other.module.cost.dao.CostCompanyDao;
 import com.blt.other.module.cost.dao.CostTemplateColMapper;
-import com.blt.other.module.cost.dto.CostTemplateColApiReq;
+import com.blt.other.module.cost.dto.QueryListReq;
 import com.blt.other.module.cost.model.CostTemplate;
 import com.blt.other.module.cost.model.CostTemplateCol;
 import com.blt.other.module.cost.service.ICostTemplateBaseColService;
@@ -128,7 +128,7 @@ public class CostTemplateColServiceImpl extends ServiceImpl<CostTemplateColMappe
     }
 
     @Override
-    public List<CostTemplateCol> queryList(CostTemplateColApiReq.QueryListReq req) {
+    public List<CostTemplateCol> queryList(QueryListReq req) {
 
         return costTemplateService.queryDetail(req.getCostTemplateId()).getCostTemplateColList()
                 .stream()

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costtemplate/CostTemplateServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.blt.other.module.auth.service.UserService;
 import com.blt.other.module.cost.dao.CostTemplateMapper;
-import com.blt.other.module.cost.dto.CostTemplateApiDto;
+import com.blt.other.module.cost.dto.QueryListReq;
 import com.blt.other.module.cost.model.CostTemplate;
 import com.blt.other.module.cost.model.CostTemplateBaseCol;
 import com.blt.other.module.cost.model.CostTemplateCol;
@@ -97,7 +97,7 @@ public class CostTemplateServiceImpl extends ServiceImpl<CostTemplateMapper, Cos
     }
 
     @Override
-    public List<CostTemplate> queryList(CostTemplateApiDto.QueryListReq req) {
+    public List<CostTemplate> queryList(QueryListReq req) {
 
         LambdaQueryWrapper<CostTemplate> wrapper = new LambdaQueryWrapper<>();
         if (req.getEnableAutoReview() != null) {