积分规则调整

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java

@@ -19,6 +19,6 @@ public class PointDetailResultDTO implements Serializable {
 	private Integer point;
 	private String pointUnit;
 	private String upLimit;
-	private String enabledFlag;
+	private Boolean enabledFlag;
 	private String upLimitDesc;
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointRuleResultDTO.java

@@ -16,6 +16,7 @@ public class PointRuleResultDTO implements Serializable {
 	private String ruleId;
 	private String ruleName;
 	private String ruleDesc;
+	private Boolean enabledFlag;
 	/**
 	 * 拼接好的 积分值/单位
 	 */

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -115,6 +115,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 				log.error("list ruleId:{} have not pointUnit or pointNum,pointRule:{}", JSON.toJSONString(pointRuleEntity));
 				return null;
 			}
+			resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
 			resultDTO.setPointValue(pointRuleEntity.getPoint().toString().concat("分").concat(StrConstant.SEPARATOR).concat(pointUnitEnum.getDesc()));
 			return resultDTO;
 		}).filter(fun -> fun != null).collect(Collectors.toList());
@@ -129,7 +130,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		}
 		PointDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(pointRuleEntity, PointDetailResultDTO.class);
 		resultDTO.setRuleId(pointRuleEntity.getId());
-		resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? "true" : "false");
+		resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
 		return resultDTO;
 	}