浏览代码

incrementName

lyhzzz 2 年之前
父节点
当前提交
79f75707c2

+ 1 - 1
src/main/java/com/fdkankan/agent/response/CameraIncrementVo.java

@@ -9,5 +9,5 @@ public class CameraIncrementVo extends CameraIncrementLog {
     private String snCode;
     private String operationUserName;
     private Integer incrementTypeId;
-    private Integer incrementTypeName;
+    private String incrementTypeName;
 }

+ 2 - 1
src/main/java/com/fdkankan/agent/service/impl/CameraIncrementLogServiceImpl.java

@@ -42,7 +42,8 @@ public class CameraIncrementLogServiceImpl extends ServiceImpl<ICameraIncrementL
         for (CameraIncrementVo record : page.getRecords()) {
             IncrementType incrementType = mapByIds.get(record.getIncrementTypeId());
             if(record.getIncrementTypeId() != null && incrementType !=null){
-                IncrementUtil.getStrIncrementName(incrementType.getValidTimeType(),incrementType.getName());
+                String incrementName = IncrementUtil.getStrIncrementName(incrementType.getValidTimeType(),incrementType.getName());
+                record.setIncrementTypeName(incrementName);
             }
         }
         return PageInfo.PageInfo(page);