用友接口

platform-dao/src/main/java/com/platform/dao/util/CustomExcelImportUtil.java

@@ -1005,7 +1005,7 @@ public class CustomExcelImportUtil {
                 record.setParentSbNo(getCellValue(row.getCell(11)));
                 record.setCreatedTime(now);
                 record.setCreatedUserId("1");
-
+                record.setSeatNumber(60);// 预警天数默认60天
                 PartInfo partInfo = new PartInfo();
                 partInfo.setId(IdGeneratorUtils.getObjectId());
                 partInfo.setSbId(record.getId());
@@ -1087,7 +1087,10 @@ public class CustomExcelImportUtil {
                 checkStandard.setLastDate(DateUtils.strToLocalDate((getCellValue(row.getCell(25))), DateUtils.PATTERN_YMD));
                 checkStandard.setRequirement(getCellValue(row.getCell(26)));
                 checkStandard.setRemark(getCellValue(row.getCell(27)));
-                checkStandard.setCreatedTime(now);
+
+                // 检定日期和检定周期
+                record.setCheckDate(DateUtils.strToLocalDate((getCellValue(row.getCell(28))), DateUtils.PATTERN_YMD));
+                record.setCheckPeriod(Integer.valueOf(getCellValue(row.getCell(29))));
                 checkStandard.setCreatedUserId("1");
                 record.setCheckStandard(checkStandard);
                 record.setPartInfo(partInfo);

platform-service/src/main/java/com/platform/service/sb/SbInfoService.java

@@ -285,7 +285,7 @@ public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
      * @param pageSize
      * @return
      */
-    public AbstractPageResultBean<SbInfoVO> selectPageInfoForWarn(SbInfoDTO record, int pageNum, int pageSize);
+    public MyVOPage<SbInfoVO> selectPageInfoForWarn(SbInfoDTO record, int pageNum, int pageSize);
 
     void updateBatchChild(List<SbInfoDTO> sbInfoDTOList);
 

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -2075,11 +2075,11 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     }
 
     @Override
-    public AbstractPageResultBean<SbInfoVO> selectPageInfoForWarn(SbInfoDTO record, int pageNum, int pageSize) {
+    public MyVOPage<SbInfoVO> selectPageInfoForWarn(SbInfoDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         record.setUseType(SbUseType.BGCL.getValue());
-        AbstractPageResultBean<SbInfoVO> pageInfo = new MyPage(mapper.selectPageInfoForWarn(record));
-        return pageInfo;
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyVOPage<>(mapper.selectPageInfoForWarn(record));
     }
 
     /**