|
@@ -24,6 +24,7 @@ import com.platform.rest.log.annotation.SysLog;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.util.List;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
@@ -189,7 +190,7 @@ public class CheckJobController {
|
|
|
List<CheckJobVO> list = checkJobService.getVOListByDTO(checkJobDTO);
|
|
|
list.forEach(item->{
|
|
|
if(item.getRealHours() != null){
|
|
|
- item.setRealHours(BigDecimalUtil.div(new BigDecimal(item.getRealHours()), new BigDecimal(60)).setScale(2).toString());
|
|
|
+ item.setRealHours(BigDecimalUtil.div(new BigDecimal(item.getRealHours()), new BigDecimal(60)).setScale(2, RoundingMode.HALF_UP).toString());
|
|
|
}
|
|
|
});
|
|
|
if (checkJobDTO.getStatus() != null && checkJobDTO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue())) {
|
|
@@ -199,6 +200,11 @@ public class CheckJobController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ public static void main(String[] args) {
|
|
|
+ BigDecimal zero = new BigDecimal(0.00);
|
|
|
+ BigDecimalUtil.div(zero, new BigDecimal(60)).setScale(2).toString();
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 接收点检任务
|
|
|
*
|