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 3cb8543a..4fb73187 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -430,7 +430,7 @@ public class ResultRecordController extends AbstractController { scores) { if(scoreDto.getApprovalId().longValue() == score.getApprovalId().longValue()){ ResultScoreDto scoreDto1 = new ResultScoreDto(); - BeanUtils.copyProperties(scoreDto1, score); + BeanUtils.copyProperties(score, scoreDto1); scoreDto1.setApprovalId(scoreDto.getApprovalId()); scoreDto1.setApprovalName(scoreDto.getApprovalName()); scoreDto1.setWeight(scoreDto.getWeight()); @@ -604,6 +604,7 @@ public class ResultRecordController extends AbstractController { }else{ updateScores.add(resultScore); } + resultScore.setDetailId(detailDto.getId()); } resultDetail.setAcquireScore(score); weight = weight.add(resultDetail.getCheckWeight()); diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java index 7332ca28..0214f0a1 100644 --- a/src/test/java/com/lz/mysql/MysqlMain.java +++ b/src/test/java/com/lz/mysql/MysqlMain.java @@ -3,6 +3,7 @@ package com.lz.mysql; import com.lz.common.utils.StringUtil; import com.lz.modules.flow.entity.FlowChartRole; import org.springframework.util.ResourceUtils; +import org.springframework.util.StopWatch; import java.io.File; import java.util.ArrayList; @@ -49,11 +50,43 @@ public class MysqlMain { public static String dto_exclude = ",is_delete,gmt_create,gmt_modified,";//生成dto时排除字段,前后都要加英文逗号 public static String req_exclude = ",,";//生成Req时排除字段,前后都要加英文逗号 + public static class TestStaticAndHuo{ + public static int compare(Long a, Long b){ + return a.compareTo(b); + } + + public static boolean isEmpt(String str){ + return str == null || str.length() == 0; + } + } + /** * @param args */ public static void main(String[] args) throws Exception { + /*Long a = 2l; + Long b = 3l; + String value = "aaa"; + StopWatch stopWatch = new StopWatch(); + stopWatch.start("测试静态方法"); + for(int i = 0; i < 10000; i++){ + if(TestStaticAndHuo.isEmpt(value)){ + + } + } + stopWatch.stop(); + + stopWatch.start("测试对象方法"); + for(int i = 0; i < 10000; i++){ + if(value == null || value.length() == 0){ + + } + } + stopWatch.stop(); + + System.out.println(stopWatch.prettyPrint());*/ + /*List testMaps = new ArrayList<>(); TestMap test = new TestMap(); test.setName("123"); @@ -78,7 +111,6 @@ public class MysqlMain { } }).collect(Collectors.joining(","));*/ - String path = ResourceUtils.getURL("classpath:").getPath(); System.out.println(path); String dir = null; @@ -147,6 +179,8 @@ public class MysqlMain { for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2XML.printXMLForMap(list2.get(i)); } + + } }