修改测试bug

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java

@@ -137,36 +137,37 @@ public class CheckAllRecordController extends BaseJsonBodyController {
                 model.put("checkPercent",numberFormat.format(checkPercent));
                 BigDecimal appealPercent = current.getAppealScore().divide(current.getInitScore(),6,BigDecimal.ROUND_HALF_UP);
                 model.put("appealPercent",numberFormat.format(appealPercent));
-            }
-            CheckAllScoreSummaryVo last = checkAllRecordService.getScoreSummary(lastQuery);
-            if(last!=null){
-                BigDecimal huanbi = current.getTotal().subtract(last.getTotal());
-                huanbi = huanbi.divide(last.getTotal(),6,BigDecimal.ROUND_HALF_UP);
-                model.put("huanbi",numberFormat.format(huanbi));
-            }
-            if (query.getSummaryType() == SummaryTopTypeEnum.年.getValue()) {
+
+                CheckAllScoreSummaryVo last = checkAllRecordService.getScoreSummary(lastQuery);
                 if(last!=null){
-                    model.put("tongbi",model.get("huanbi"));
+                    BigDecimal huanbi = current.getTotal().subtract(last.getTotal());
+                    huanbi = huanbi.divide(last.getTotal(),6,BigDecimal.ROUND_HALF_UP);
+                    model.put("huanbi",numberFormat.format(huanbi));
                 }
-            }else {
-                String yyyy = query.getCheckTimeStart().substring(0,4);
-                int lastyear = DataUtil.converStr2Int(yyyy,0);
-                lastyear--;
-                if(query.getCheckTimeStart().substring(4).equals("-02-29")){
-                    lastQuery.setCheckTimeStart(lastyear+"-02-28");
+                if (query.getSummaryType() == SummaryTopTypeEnum.年.getValue()) {
+                    if(last!=null){
+                        model.put("tongbi",model.get("huanbi"));
+                    }
                 }else {
-                    lastQuery.setCheckTimeStart(lastyear+query.getCheckTimeStart().substring(4));
-                }
-                if(query.getCheckTimeEnd().substring(4).equals("-02-29")){
-                    lastQuery.setCheckTimeEnd(lastyear+"-02-28");
-                }else {
-                    lastQuery.setCheckTimeEnd(lastyear+query.getCheckTimeEnd().substring(4));
-                }
-                CheckAllScoreSummaryVo tb = checkAllRecordService.getScoreSummary(lastQuery);
-                if(tb!=null){
-                    BigDecimal tongbi = current.getTotal().subtract(tb.getTotal());
-                    tongbi = tongbi.divide(last.getTotal(),6,BigDecimal.ROUND_HALF_UP);
-                    model.put("tongbi",numberFormat.format(tongbi));
+                    String yyyy = query.getCheckTimeStart().substring(0,4);
+                    int lastyear = DataUtil.converStr2Int(yyyy,0);
+                    lastyear--;
+                    if(query.getCheckTimeStart().substring(4).equals("-02-29")){
+                        lastQuery.setCheckTimeStart(lastyear+"-02-28");
+                    }else {
+                        lastQuery.setCheckTimeStart(lastyear+query.getCheckTimeStart().substring(4));
+                    }
+                    if(query.getCheckTimeEnd().substring(4).equals("-02-29")){
+                        lastQuery.setCheckTimeEnd(lastyear+"-02-28");
+                    }else {
+                        lastQuery.setCheckTimeEnd(lastyear+query.getCheckTimeEnd().substring(4));
+                    }
+                    CheckAllScoreSummaryVo tb = checkAllRecordService.getScoreSummary(lastQuery);
+                    if(tb!=null){
+                        BigDecimal tongbi = current.getTotal().subtract(tb.getTotal());
+                        tongbi = tongbi.divide(last.getTotal(),6,BigDecimal.ROUND_HALF_UP);
+                        model.put("tongbi",numberFormat.format(tongbi));
+                    }
                 }
             }