diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java index 22621812..c146dbf8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java @@ -71,16 +71,17 @@ public class QualityEvaluationController extends BaseController> getEvaluationForm(FormVO form){ QualityEvaluation qualityEvaluation = new QualityEvaluation(); qualityEvaluation.setLawId(form.getLawId()) ; qualityEvaluation.setUserId(form.getUserId()) ; + qualityEvaluation.setEvaluationType(form.getEvaluationType()); - iQualityEvaluationService.getEvaluationForm(qualityEvaluation); + List evaluationForm = iQualityEvaluationService.getEvaluationForm(qualityEvaluation); - return null; + return Result.success(evaluationForm); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java index 9432145d..0059d8ca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java @@ -23,4 +23,7 @@ public interface QualityEvaluationDao extends BaseMapper { public IPage getHistory(IPage page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + public List getEvaluationForm(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java index ddcb4919..48272e92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -77,13 +77,18 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) - private LocalDateTime modifyTime; + private Date modifyTime; + + @TableField(exist = false) + @ApiModelProperty(value = "指标名称") + private String indexTitle; + @TableField(exist = false) private Integer page; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index b068eff1..786abe9a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -58,6 +58,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl tableData = form.getTableData(); tableData.forEach(item->{ + item.setModifyTime(new Date()); item.setId( UUIDUtils.randomUUID20()); if ("number".equals(item.getValueType()) ){ item.setScore(String.valueOf (Double.valueOf(item.getScore()) * 2) ); @@ -83,6 +84,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getEvaluationForm(QualityEvaluation query) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("UNAME as userName","score","reason","create_time as createTime","modify_time as modifyTime","idx.value_type as valueType") - .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID" + - "LEFT JOIN evaluation_index as idx on iex.id=quality_evaluation.evaluation_index"); if (query.getLawId()!=null){ @@ -113,8 +112,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getScore(String lawId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("law_id",lawId); - List list = this.list(queryWrapper); + queryWrapper.eq("law_id",lawId) + .eq("`index`.value_type","number"); + +// List list = this.list(queryWrapper); + + Page page = new Page<>(1, 1000); + + List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); return list.stream() .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, - Collectors.averagingDouble(item -> getScoreSingle(item)))); + Collectors.averagingDouble(item ->Double.valueOf(item.getScore()) ))); } - private Double getScoreSingle(QualityEvaluation item){ - - QueryWrapper indexQuery = new QueryWrapper<>(); - indexQuery.select("code","weight"); - - List indexList = iEvaluationIndexService.list(indexQuery); - - Map weightMap = indexList.stream() - .collect(Collectors.toMap(EvaluationIndex::getCode, obj -> Float.valueOf(obj.getWeight()))); - - - - String score = item.getScore(); - return ((score == null || (Float.valueOf(item.getScore()) < 0.0)) ? 0.0 : Float.valueOf(score) * weightMap.get(item.getEvaluationIndex())); - } +// private Double getScoreSingle(QualityEvaluation item){ +// +// QueryWrapper indexQuery = new QueryWrapper<>(); +// indexQuery.select("code","weight") +// .eq("value_type","number"); +// +// List indexList = iEvaluationIndexService.list(indexQuery); +// +// Map weightMap = indexList.stream() +// .collect(Collectors.toMap(EvaluationIndex::getCode, obj -> Float.valueOf(obj.getWeight()))); +// +// +// +// String score = item.getScore(); +// return (score == null && !weightMap.containsKey(item.getEvaluationIndex()) ) ? 0.0 : Float.valueOf(score) * weightMap.get(item.getEvaluationIndex()); +// } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 5323d86d..b21525e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -108,7 +108,7 @@ public class FieldConvertUtil { List timeList = Arrays.asList(timeStr.split(",")); List collect = timeList.stream() - .map(item -> "str_to_date('" + item + "','%Y-%m-%d %H:%i:%s')") + .map(item -> "str_to_date('" + item + "','%Y-%m-%d')") .collect(Collectors.toList()); timeStr ="concat(" + String.join(", \',\' ,", collect) + ")"; } else { @@ -143,7 +143,7 @@ public class FieldConvertUtil { String mustValue = "'"+ UUIDUtils.randomUUID20() + "','" + id + "','0','" + LoginUserUtil.getUserId() + "'"; Date date = new Date(); - SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); String nowTime = sf.format(date); String timeValue = "," + changeTimeValue(nowTime); mustValue += timeValue + timeValue; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index 2c134c8c..4d603e7f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -8,17 +8,46 @@ SELECT `user`.UNAME AS userName, eva.user_id, - avg(eva.score * iex.weight) AS score, - iex.index_type as valueType + `index`.value_type as valueType, + eva.evaluation_type as evaluationType, + avg(eva.score * `index`.weight) AS score, + min(eva.create_time) as createTiem, + max(eva.modify_time) as modifyTime FROM quality_evaluation AS eva LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID - LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id + LEFT JOIN evaluation_index AS `index` ON eva.evaluation_index = `index`.id + ${ew.customSqlSegment} GROUP BY userName, eva.user_id, - index_type + index_type, + valueType, + evaluationType + ORDER BY modifyTime DESC - ${ew.customSqlSegment} + + + +