Commit 5b914687 by hzc

实体类中rank转义

parent 92612dd3
...@@ -267,6 +267,7 @@ public class DriveIndIdObjCalActor extends AbstractActor{ ...@@ -267,6 +267,7 @@ public class DriveIndIdObjCalActor extends AbstractActor{
driveIndIdCalActor.tell(driveIndAverageAndRankMsg, ActorRef.noSender()); driveIndIdCalActor.tell(driveIndAverageAndRankMsg, ActorRef.noSender());
} }
} catch (Exception e) { } catch (Exception e) {
//判断结果表中是否已存在该结果数据,存在则覆盖 //判断结果表中是否已存在该结果数据,存在则覆盖
// DriveIndCalResultDef driveIndCalResult = driveIndCalResultService. // DriveIndCalResultDef driveIndCalResult = driveIndCalResultService.
// findCalResultDataIsExist(compareId, compareObj, driveIndId, date); // findCalResultDataIsExist(compareId, compareObj, driveIndId, date);
...@@ -281,9 +282,10 @@ public class DriveIndIdObjCalActor extends AbstractActor{ ...@@ -281,9 +282,10 @@ public class DriveIndIdObjCalActor extends AbstractActor{
// driveIndCalResult.setLastUpdateTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); // driveIndCalResult.setLastUpdateTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
// } // }
// driveIndCalResultService.saveOrUpdate(driveIndCalResult); // driveIndCalResultService.saveOrUpdate(driveIndCalResult);
//e.printStackTrace();
logger.error("error:",e);
logger.error("driveIndId:" + driveIndId + ";" + logger.error("driveIndId:" + driveIndId + ";" +
"paramEnv:" + env + ";formula:" + driveIndFormula); "paramEnv:" + env + ";formula:" +driveIndFormula);
//日志记录 //日志记录
// String logInfo = compCalLog.getLogInfo(); // String logInfo = compCalLog.getLogInfo();
// if(StringUtils.isNotBlank(logInfo)) { // if(StringUtils.isNotBlank(logInfo)) {
......
...@@ -2,14 +2,12 @@ package com.keymobile.indicators.model.entity.indicators; ...@@ -2,14 +2,12 @@ package com.keymobile.indicators.model.entity.indicators;
import java.util.Date; import java.util.Date;
import javax.persistence.GeneratedValue; import javax.persistence.*;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import com.keymobile.indicators.utils.DateUtils; import com.keymobile.indicators.utils.DateUtils;
import lombok.Data; import lombok.Data;
import lombok.Value;
/** /**
* author:zhangkb time:2020-6-11 desc:考核指标结果表 * author:zhangkb time:2020-6-11 desc:考核指标结果表
...@@ -33,6 +31,10 @@ public class DriveIndCalResultDef { ...@@ -33,6 +31,10 @@ public class DriveIndCalResultDef {
private String lastUpdateTime = DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"); private String lastUpdateTime = DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
private String lastUpdater; private String lastUpdater;
private String average;//组内平均数 private String average;//组内平均数
/**
* rank在mysql8是函数名要转义一下
* */
@Column(name="`rank`")
private Integer rank;//同组排名 private Integer rank;//同组排名
private String score;//指标评分分数 private String score;//指标评分分数
private String improveScore;//改善提升得分 private String improveScore;//改善提升得分
......
package com.keymobile.indicators.model.entity.parameter; package com.keymobile.indicators.model.entity.parameter;
import javax.persistence.GeneratedValue; import javax.persistence.*;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import lombok.Data; import lombok.Data;
...@@ -21,6 +18,10 @@ public class ParameterDataReport { ...@@ -21,6 +18,10 @@ public class ParameterDataReport {
private String parameterName;//台账对象名称 private String parameterName;//台账对象名称
private String parameterObj;//台账对象 private String parameterObj;//台账对象
private Double sumScore;//总积分 private Double sumScore;//总积分
/**
* rank在mysql8是函数名要转义一下
* */
@Column(name="`rank`")
private Integer rank;//排名 private Integer rank;//排名
private String code;//机构编码 private String code;//机构编码
private String reportUser;//报告人 private String reportUser;//报告人
......
...@@ -2,10 +2,7 @@ package com.keymobile.indicators.model.entity.testrun; ...@@ -2,10 +2,7 @@ package com.keymobile.indicators.model.entity.testrun;
import java.util.Date; import java.util.Date;
import javax.persistence.GeneratedValue; import javax.persistence.*;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import com.keymobile.indicators.utils.DateUtils; import com.keymobile.indicators.utils.DateUtils;
...@@ -33,6 +30,10 @@ public class TestDriveIndCalResultDef { ...@@ -33,6 +30,10 @@ public class TestDriveIndCalResultDef {
private String lastUpdateTime = DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"); private String lastUpdateTime = DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
private String lastUpdater; private String lastUpdater;
private String average;//组内平均数 private String average;//组内平均数
/**
* rank在mysql8是函数名要转义一下
* */
@Column(name="`rank`")
private Integer rank;//同组排名 private Integer rank;//同组排名
private String score;//指标评分分数 private String score;//指标评分分数
private String improveScore;//改善提升得分 private String improveScore;//改善提升得分
......
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