Переглянути джерело

增加网站文章相关功能,后期拆分为独立的module

hfxc226 2 роки тому
батько
коміт
1c01e98f0f

+ 2 - 2
platform-common/src/main/java/com/platform/common/yongyou/response/GetCurrentStockResponse.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 @Data
 public class GetCurrentStockResponse extends BaseResponse{
-    Integer totalNum;// 总数
-    Integer total;// 总页数
+    Integer total;// 总数
+    Integer pages;// 总页数
     List<GetCurrentStock> data;
 }

+ 2 - 1
platform-rest/src/main/java/com/platform/rest/controller/check/CheckJobController.java

@@ -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())) {

+ 3 - 2
platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -144,9 +144,10 @@ public class YongyouServiceImpl implements YongyouService {
         myVOPage.setPageNum(pageNum);
         myVOPage.setPageSize(pageSize);
         Page page = new Page(pageNum, pageSize);
-        page.setTotal(response.getTotal());
+        page.setTotal(322);
+        //page.setTotal(response.getTotal());
         myVOPage.setPages(page.getPages());
-        myVOPage.setTotal(Long.valueOf(response.getTotalNum()));
+        myVOPage.setTotal(page.getTotal());
         myVOPage.setRows(partInfoVOS);
         return myVOPage;
     }