diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index d0c8afe8..c6cb60f4 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -473,6 +473,8 @@ public class ResultRecordController extends AbstractController { } + //目前支持已生成对象的。不支持当前非对象表中的数据,如果要使用请用常量值 + //lz_result_detail>check_weight*lz_result_detail>acquire_score private String setCalculateValue(List calculateModels, Object model){ String mName = model.getClass().getName();//.replace("req", "dto"); String cal = ""; @@ -480,7 +482,12 @@ public class ResultRecordController extends AbstractController { //) { for(int i = 0; i < calculateModels.size(); i++){ CalculateModel calculate = calculateModels.get(i); - if(mName.contains("." + calculate.getTaboleBeanName())){//支持表名生成的req和dto + if(calculate.getTaboleBeanName() == null){//数字 + cal += calculate.getFieldName(); + if(calculate.getOpt() != null){ + cal += calculate.getOpt(); + } + }else if(mName.contains("." + calculate.getTaboleBeanName())){//支持表名生成的req和dto //获取值 try { Class clazz = model.getClass(); @@ -519,10 +526,14 @@ public class ResultRecordController extends AbstractController { CalculateModel calculateModel = null; int type = 0;//0table名称 1字段名称 String value = ""; + boolean isDig = false;//是否为数字 for (int i = 0; i < chars.length;i++ ) { char b = chars[i]; if(b == '*' || b == '/' || b == '+' || b == '-'){ + if(isDig){ + calculateModel.setTableName(null); + } calculateModel.setFieldName(value); calculateModel.setFieldBeanName(getBeanName(value)); calculateModel.setOpt(String.valueOf(b)); @@ -530,6 +541,7 @@ public class ResultRecordController extends AbstractController { calculateModel = null; type = 0; value = ""; + isDig = false; continue; }else if(b == '>'){ @@ -541,16 +553,24 @@ public class ResultRecordController extends AbstractController { type--; type *= -1; value = ""; + isDig = false; continue; + }else if(b > 47 && b < 58){ + //数字 + isDig = true; } if(calculateModel == null){ calculateModel = new CalculateModel(); } value += String.valueOf(b); if(i == chars.length - 1){ + if(isDig){ + calculateModel.setTableName(null); + } calculateModel.setFieldName(value); calculateModel.setFieldBeanName(getBeanName(value)); calculateModels.add(calculateModel); + isDig = false; break; } diff --git a/src/main/java/com/lz/modules/flow/entity/ResultScore.java b/src/main/java/com/lz/modules/flow/entity/ResultScore.java index cb6a4ea3..dd44b411 100644 --- a/src/main/java/com/lz/modules/flow/entity/ResultScore.java +++ b/src/main/java/com/lz/modules/flow/entity/ResultScore.java @@ -10,10 +10,9 @@ import java.math.BigDecimal; import java.util.Date; /** *

-* 菜单权限表 *

*业绩详情评分表 * @author quyixiao -* @since 2020-10-13 +* @since 2020-11-09 */ @Data @@ -41,6 +40,9 @@ public class ResultScore implements java.io.Serializable { //审批人id @ApiModelProperty(value = "审批人id", name = "approvalId") private Long approvalId; + //评分说明 + @ApiModelProperty(value = "评分说明", name = "scoreComment") + private String scoreComment; /** * * @return @@ -146,6 +148,21 @@ public class ResultScore implements java.io.Serializable { this.approvalId = approvalId; } + /** + * 评分说明 + * @return + */ + public String getScoreComment() { + return scoreComment; + } + /** + * 评分说明 + * @param scoreComment + */ + public void setScoreComment(String scoreComment) { + this.scoreComment = scoreComment; + } + @Override public String toString() { return "ResultScore{" + @@ -156,6 +173,7 @@ public class ResultScore implements java.io.Serializable { ",acquireScore=" + acquireScore + ",detailId=" + detailId + ",approvalId=" + approvalId + + ",scoreComment=" + scoreComment + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java index edc6a486..762b8fb7 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java @@ -35,6 +35,10 @@ public class ResultScoreDto { //审批人id @ApiModelProperty(value = "所占权重", name = "weight") private BigDecimal weight; + + //评分说明 + @ApiModelProperty(value = "评分说明", name = "scoreComment") + private String scoreComment; /** * * @return diff --git a/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java b/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java index 81203bab..cf3c1da6 100644 --- a/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java +++ b/src/main/java/com/lz/modules/flow/req/ResultScoreReq.java @@ -49,6 +49,9 @@ public class ResultScoreReq implements java.io.Serializable { //审批人id @ApiModelProperty(value = "审批人id", name = "approvalId") private Long approvalId; + //评分说明 + @ApiModelProperty(value = "评分说明", name = "scoreComment") + private String scoreComment; /** * * @return diff --git a/src/main/resources/mapper/flow/ResultScoreMapper.xml b/src/main/resources/mapper/flow/ResultScoreMapper.xml index 9895a68f..4e79556b 100644 --- a/src/main/resources/mapper/flow/ResultScoreMapper.xml +++ b/src/main/resources/mapper/flow/ResultScoreMapper.xml @@ -11,50 +11,54 @@ + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, acquire_score AS acquireScore, detail_id AS detailId, approval_id AS approvalId + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, acquire_score AS acquireScore, detail_id AS detailId, approval_id AS approvalId, score_comment AS scoreComment insert into lz_result_score( - acquire_score, - detail_id, - approval_id, - is_delete, - gmt_create, - gmt_modified + acquire_score, + detail_id, + approval_id, + score_comment, + is_delete, + gmt_create, + gmt_modified )values( - #{ acquireScore}, - #{ detailId}, - #{ approvalId}, - 0, - now(), - now() + #{ acquireScore}, + #{ detailId}, + #{ approvalId}, + #{ scoreComment}, + 0, + now(), + now() ) update - lz_result_score + lz_result_score is_delete = #{isDelete}, gmt_create = #{gmtCreate}, acquire_score = #{acquireScore}, detail_id = #{detailId}, - approval_id = #{approvalId} + approval_id = #{approvalId}, + score_comment = #{scoreComment} ,gmt_modified = now() where id = #{id} @@ -63,13 +67,14 @@ update - lz_result_score - set + lz_result_score + set is_delete = #{isDelete}, gmt_create = #{gmtCreate}, acquire_score = #{acquireScore}, detail_id = #{detailId}, - approval_id = #{approvalId} + approval_id = #{approvalId}, + score_comment = #{scoreComment} ,gmt_modified = now() where id = #{id} diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index d8784020..c89a36a3 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -126,7 +126,7 @@ public class MysqlMain { List list = new ArrayList(); - list.add(new TablesBean("lz_flow_record")); + list.add(new TablesBean("lz_result_score")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments();