diff --git a/src/main/java/com/cm/bigdata/controller/apis/partyscore/PartyScoreController.java b/src/main/java/com/cm/bigdata/controller/apis/partyscore/PartyScoreController.java
index dd05372..4bd617d 100644
--- a/src/main/java/com/cm/bigdata/controller/apis/partyscore/PartyScoreController.java
+++ b/src/main/java/com/cm/bigdata/controller/apis/partyscore/PartyScoreController.java
@@ -326,14 +326,14 @@ public class PartyScoreController extends AbstractController {
if(resultScore > scoreProperties.getMeetingGrossscore()) {
resultScore = scoreProperties.getMeetingGrossscore();
}
- partyMeetingScoreDTO.setScore(resultScore);
+ partyMeetingScoreDTO.setScore(Double.valueOf(String.format("%.2f", resultScore)));
}else {
partyMeetingScoreDTO.setQuarter("全年");
double resultScore = trueCount / baseCount * scoreProperties.getMeetingGrossscore();
if(resultScore > scoreProperties.getMeetingGrossscore()) {
resultScore = scoreProperties.getMeetingGrossscore();
}
- partyMeetingScoreDTO.setScore(resultScore);
+ partyMeetingScoreDTO.setScore(Double.valueOf(String.format("%.2f", resultScore)));
}
}
}
diff --git a/src/main/java/com/cm/bigdata/pojo/dtos/configforscore/ConfigForScoreDTO.java b/src/main/java/com/cm/bigdata/pojo/dtos/configforscore/ConfigForScoreDTO.java
index 979d8da..f2d0f66 100644
--- a/src/main/java/com/cm/bigdata/pojo/dtos/configforscore/ConfigForScoreDTO.java
+++ b/src/main/java/com/cm/bigdata/pojo/dtos/configforscore/ConfigForScoreDTO.java
@@ -26,6 +26,8 @@ public class ConfigForScoreDTO {
private String unit;
@ApiModelProperty(name = "type", value = "配置类型")
private String type;
+ @ApiModelProperty(name = "typeName", value = "配置类型名称")
+ private String typeName;
public String getConfigForScoreId() {
return configForScoreId == null ? "" : configForScoreId.trim();
@@ -74,4 +76,12 @@ public class ConfigForScoreDTO {
public void setType(String type) {
this.type = type;
}
+
+ public String getTypeName() {
+ return typeName == null ? "" : typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
}
diff --git a/src/main/java/com/cm/bigdata/pojo/vos/configforscore/ConfigForScoreVO.java b/src/main/java/com/cm/bigdata/pojo/vos/configforscore/ConfigForScoreVO.java
index df162a7..3fc8bbd 100644
--- a/src/main/java/com/cm/bigdata/pojo/vos/configforscore/ConfigForScoreVO.java
+++ b/src/main/java/com/cm/bigdata/pojo/vos/configforscore/ConfigForScoreVO.java
@@ -25,8 +25,10 @@ public class ConfigForScoreVO {
private String areaName;
@ApiModelProperty(name = "unit", value = "单位")
private String unit;
- @ApiModelProperty(name = "type", value = "配置类型")
+ @ApiModelProperty(name = "type", value = "配置类型ID")
private String type;
+ @ApiModelProperty(name = "typeName", value = "配置类型名称")
+ private String typeName;
public String getCount() {
return count == null ? "" : count.trim();
@@ -67,4 +69,12 @@ public class ConfigForScoreVO {
public void setType(String type) {
this.type = type;
}
+
+ public String getTypeName() {
+ return typeName == null ? "" : typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
}
diff --git a/src/main/java/com/cm/bigdata/service/configforscore/impl/ConfigForScoreServiceImpl.java b/src/main/java/com/cm/bigdata/service/configforscore/impl/ConfigForScoreServiceImpl.java
index 01e5871..00087fa 100644
--- a/src/main/java/com/cm/bigdata/service/configforscore/impl/ConfigForScoreServiceImpl.java
+++ b/src/main/java/com/cm/bigdata/service/configforscore/impl/ConfigForScoreServiceImpl.java
@@ -81,7 +81,7 @@ public class ConfigForScoreServiceImpl extends AbstractService implements IConfi
Integer count = countNumberConfigForScore(params);
if(!count.equals(0)) {
if(StringUtils.isEmpty(params.get("area"))) {
- throw new SearchException(params.get("type") + "数据已存在,请进行修改");
+ throw new SearchException(params.get("typeName") + "数据已存在,请进行修改");
}else {
throw new SearchException(params.get("areaName") + "数据已存在,请进行修改");
}
diff --git a/src/main/resources/mybatis/mapper/configforscore/configforscore-mapper.xml b/src/main/resources/mybatis/mapper/configforscore/configforscore-mapper.xml
index 133fce8..98b5320 100644
--- a/src/main/resources/mybatis/mapper/configforscore/configforscore-mapper.xml
+++ b/src/main/resources/mybatis/mapper/configforscore/configforscore-mapper.xml
@@ -9,6 +9,7 @@