FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_foton_20231031' into fix_foton_20231031

Browse Source
This commit is contained in:
zyn
2023-11-08 03:00:15 +08:00
parent 53dc401a10 97841cc7c6
commit 8657280cb8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
+7 -5
View File
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.PipedReader; import java.io.PipedReader;
import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.*; import java.util.*;
@@ -301,11 +302,12 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
return score; return score;
} )))); } ))));
Double finalScore = result.get("quality") * 0.9 + result.get("dynamic"); BigDecimal qualityScore = BigDecimal.valueOf(result.get("quality"));
// NumberFormat nf = NumberFormat.getNumberInstance(); BigDecimal dynamicScore = BigDecimal.valueOf(result.get("dynamic"));
// nf.setMaximumFractionDigits(2); double finalScore = qualityScore.setScale(2, RoundingMode.HALF_UP).doubleValue() * 0.9 + dynamicScore.setScale(2, RoundingMode.HALF_UP).doubleValue();
// nf.setRoundingMode(RoundingMode.UP); result.put("dynamic",dynamicScore.setScale(2, RoundingMode.HALF_UP).doubleValue());
result.put("finalScore", finalScore); result.put("quality",qualityScore.setScale(2, RoundingMode.HALF_UP).doubleValue());
result.put("finalScore", new BigDecimal(finalScore).setScale(2, RoundingMode.HALF_UP).doubleValue());
return result; return result;
} }
adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class SarMenuStandardServiceImpl extends ServiceImpl<SarMenuStandardDao,
@Override @Override
public List<SarMenuStandard> getAll(String dicId) { public List<SarMenuStandard> getAll(String dicId) {
QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>();
sarMenuQueryWrapper.eq("VALID_FLAG",0); //sarMenuQueryWrapper.eq("VALID_FLAG",0);
sarMenuQueryWrapper.eq("DIC_ID",dicId); sarMenuQueryWrapper.eq("DIC_ID",dicId);
sarMenuQueryWrapper.orderByAsc("DISPLAY_SEQ"); sarMenuQueryWrapper.orderByAsc("DISPLAY_SEQ");
// sarMenuQueryWrapper.isNull("PARENT_ID"); // sarMenuQueryWrapper.isNull("PARENT_ID");