update

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostTemplateCol.java

@@ -3,6 +3,7 @@ package com.blt.other.module.cost.model;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.common.collect.Lists;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,6 +51,7 @@ public class CostTemplateCol implements Serializable {
     private Boolean isDefault;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     private Integer createUserId;
@@ -59,6 +61,7 @@ public class CostTemplateCol implements Serializable {
     private String updateUserName;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime lastUpdateTime;
 
     private String companyScope;

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

@@ -27,7 +27,6 @@ public class DepartmentCheckState extends CostState {
 
     @Autowired
     FinancialCheckState financialCheckState;
-
     @Resource
     OaDepartmentMapper oaDepartmentMapper;
     @Resource

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

@@ -87,7 +87,6 @@ public class CostTemplateColServiceImpl extends ServiceImpl<CostTemplateColMappe
         costTemplateService.updateById(costTemplate);
 
 
-
     }
 
     /**
@@ -133,6 +132,8 @@ public class CostTemplateColServiceImpl extends ServiceImpl<CostTemplateColMappe
 
         return costTemplateService.queryDetail(req.getCostTemplateId()).getCostTemplateColList()
                 .stream()
+                //非默认
+                .filter(costTemplateCol -> !costTemplateCol.getIsDefault())
                 //字段类目
                 .filter(costTemplateCol -> StringUtils.isEmpty(req.getColCategory()) ||
                         Optional.ofNullable(costTemplateCol.getCostTemplateBaseCol().getColCategory()).map(str -> str.contains(req.getColCategory())).orElse(false))