|
@@ -446,9 +446,9 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
Integer totalTaskSize = jsonObject.getInteger("totalTaskSize");
|
|
|
Integer currentTaskSize = jsonObject.getInteger("currentTaskSize");
|
|
|
|
|
|
- BigDecimal progress = new BigDecimal(0);
|
|
|
- BigDecimal b = new BigDecimal(100);
|
|
|
- progress = new BigDecimal(currentTaskSize).divide(new BigDecimal(totalTaskSize), 2, BigDecimal.ROUND_HALF_UP).multiply(b);
|
|
|
+ BigDecimal progress = BigDecimal.valueOf(0);
|
|
|
+ BigDecimal b = BigDecimal.valueOf(100);
|
|
|
+ progress = BigDecimal.valueOf(currentTaskSize).divide(BigDecimal.valueOf(totalTaskSize), 2, BigDecimal.ROUND_HALF_UP).multiply(b);
|
|
|
if (Objects.isNull(tbTaskHistory.getProgress()) || (Objects.nonNull(tbTaskHistory.getProgress()) && tbTaskHistory.getProgress().doubleValue() < progress.doubleValue())) {
|
|
|
tbTaskHistory.setProgress(progress.doubleValue());
|
|
|
tbTaskHistoryService.updateById(tbTaskHistory);
|
|
@@ -520,8 +520,8 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
TBTaskHistory tbTaskHistory = (TBTaskHistory) map.get("tbTaskHistory");
|
|
|
Boolean objectiveScorePush = (Boolean) map.get(SystemConstant.OBJECTIVE_SCORE_PUSH);
|
|
|
|
|
|
- BigDecimal progress = new BigDecimal(0);
|
|
|
- BigDecimal b = new BigDecimal(100);
|
|
|
+ BigDecimal progress = BigDecimal.valueOf(0);
|
|
|
+ BigDecimal b = BigDecimal.valueOf(100);
|
|
|
TBOrg tbOrg = themisCacheService.addOrgCache(orgId);
|
|
|
|
|
|
Integer totalTaskSize = jsonObject.getInteger("totalTaskSize");
|
|
@@ -591,7 +591,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- progress = new BigDecimal(currentTaskSize).divide(new BigDecimal(totalTaskSize), 2, BigDecimal.ROUND_HALF_UP).multiply(b);
|
|
|
+ progress = BigDecimal.valueOf(currentTaskSize).divide(BigDecimal.valueOf(totalTaskSize), 2, BigDecimal.ROUND_HALF_UP).multiply(b);
|
|
|
if (Objects.isNull(tbTaskHistory.getProgress()) || (Objects.nonNull(tbTaskHistory.getProgress()) && tbTaskHistory.getProgress().doubleValue() < progress.doubleValue())) {
|
|
|
tbTaskHistory.setProgress(progress.doubleValue());
|
|
|
tbTaskHistoryService.updateById(tbTaskHistory);
|
|
@@ -723,8 +723,8 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
map.put("paperJsonList", paperJsonList);
|
|
|
examPaperIdSet = new HashSet<>(teExamPaperList.size());
|
|
|
|
|
|
- BigDecimal progress = new BigDecimal(0);
|
|
|
- BigDecimal b = new BigDecimal(100);
|
|
|
+ BigDecimal progress = BigDecimal.valueOf(0);
|
|
|
+ BigDecimal b = BigDecimal.valueOf(100);
|
|
|
|
|
|
int min = 0;
|
|
|
int max = SystemConstant.MAX_IMPORT_SIZE, size = teExamPaperList.size();
|
|
@@ -787,7 +787,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
tbTaskHistory.setRemark(jsonObject.toJSONString());
|
|
|
}
|
|
|
}
|
|
|
- progress = new BigDecimal(currentTaskSize).divide(new BigDecimal(totalTaskSize), 2, BigDecimal.ROUND_HALF_UP).multiply(b);
|
|
|
+ progress = BigDecimal.valueOf(currentTaskSize).divide(BigDecimal.valueOf(totalTaskSize), 2, BigDecimal.ROUND_HALF_UP).multiply(b);
|
|
|
if (Objects.isNull(tbTaskHistory.getProgress()) || (Objects.nonNull(tbTaskHistory.getProgress()) && tbTaskHistory.getProgress().doubleValue() < progress.doubleValue())) {
|
|
|
tbTaskHistory.setProgress(progress.doubleValue());
|
|
|
tbTaskHistoryService.updateById(tbTaskHistory);
|
|
@@ -910,8 +910,8 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
* @return
|
|
|
*/
|
|
|
public List<String> importProgress(int max, int min, int size, List<String> txtList, TBTaskHistory tbTaskHistory) {
|
|
|
- BigDecimal bigDecimal = new BigDecimal(100);
|
|
|
- BigDecimal progress = new BigDecimal(Double.valueOf(new BigDecimal(max).divide(new BigDecimal(size), 2, BigDecimal.ROUND_HALF_UP).multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal bigDecimal = BigDecimal.valueOf(100);
|
|
|
+ BigDecimal progress = BigDecimal.valueOf(Double.valueOf(BigDecimal.valueOf(max).divide(BigDecimal.valueOf(size), 2, BigDecimal.ROUND_HALF_UP).multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
if (progress.intValue() == 100) {
|
|
|
tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
|
|
|
tbTaskHistory.setSummary("共处理了" + size + "条数据");
|
|
@@ -937,12 +937,12 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
|
|
|
* @return
|
|
|
*/
|
|
|
public List<String> exportProgress(int max, int min, int size, List<String> txtList, TBTaskHistory tbTaskHistory) {
|
|
|
- BigDecimal bigDecimal = new BigDecimal(100);
|
|
|
+ BigDecimal bigDecimal = BigDecimal.valueOf(100);
|
|
|
BigDecimal progress = null;
|
|
|
if (size > 0) {
|
|
|
- progress = new BigDecimal(Double.valueOf(new BigDecimal(max).divide(new BigDecimal(size), 2, BigDecimal.ROUND_HALF_UP).multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
+ progress = BigDecimal.valueOf(Double.valueOf(BigDecimal.valueOf(max).divide(BigDecimal.valueOf(size), 2, BigDecimal.ROUND_HALF_UP).multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
} else {
|
|
|
- progress = new BigDecimal(-1);
|
|
|
+ progress = BigDecimal.valueOf(-1);
|
|
|
}
|
|
|
if (progress.intValue() == 100) {
|
|
|
tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
|