Commit 6fa651a7 by 张祺

修改模板配置的字段名字

parent 4bcd6692
......@@ -227,7 +227,7 @@ public class DataEnterCtrl {
}
StringBuilder sb = new StringBuilder();
List<TaskIndValue> taskIndValues = new ArrayList<>();
if (template.getCType() == 1) {
if (template.getCtype() == 1) {
// 指标是列值
if (hasSameTerm) {
startRow = 2;
......
......@@ -179,7 +179,7 @@ public class ExcelTempCtrl {
}
List<OnceAbsoluteMergeStrategy> merges = new ArrayList<>();
List<List<String>> headers = new ArrayList<>();
if (template.getCType() == 1) {
if (template.getCtype() == 1) {
// 列类型:1、指标 2 考核对象
List<String> column1 = new ArrayList<>();
column1.add("");
......
......@@ -4,6 +4,7 @@ import com.keymobile.indicators.model.entity.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Setter;
import javax.persistence.*;
import java.util.List;
......@@ -26,8 +27,8 @@ public class ExcelTemplate extends BaseModel {
/**
* 列类型
*/
@ApiModelProperty("列类型:1、指标 2 考核对象")
private Integer cType;
@ApiModelProperty("列类型:1、指标 2 考核对象" )
private Integer ctype;
/**
* 是否需要同期值
......
......@@ -2,7 +2,7 @@ spring:
application:
name: indicators
profiles:
active: dev
active: test
cloud:
config:
uri: http://localhost:8082
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment