1

src/main/java/com/fdkankan/agent/service/impl/CameraIncrementLogServiceImpl.java

@@ -2,16 +2,23 @@ package com.fdkankan.agent.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.common.PageInfo;
+import com.fdkankan.agent.common.util.IncrementUtil;
 import com.fdkankan.agent.entity.CameraIncrementLog;
+import com.fdkankan.agent.entity.IncrementType;
 import com.fdkankan.agent.mapper.ICameraIncrementLogMapper;
 import com.fdkankan.agent.request.CameraIncrementParam;
 import com.fdkankan.agent.response.CameraIncrementVo;
 import com.fdkankan.agent.service.ICameraIncrementLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.agent.service.IIncrementTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Parameter;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -24,9 +31,20 @@ import java.util.List;
 @Service
 public class CameraIncrementLogServiceImpl extends ServiceImpl<ICameraIncrementLogMapper, CameraIncrementLog> implements ICameraIncrementLogService {
 
+    @Autowired
+    IIncrementTypeService incrementTypeService;
+
     @Override
     public Object pageList(CameraIncrementParam param) {
         Page<CameraIncrementVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        Set<Integer> typeIds = page.getRecords().stream().map(CameraIncrementVo::getIncrementTypeId).collect(Collectors.toSet());
+        HashMap<Integer, IncrementType> mapByIds = incrementTypeService.getMapByIds(typeIds);
+        for (CameraIncrementVo record : page.getRecords()) {
+            IncrementType incrementType = mapByIds.get(record.getIncrementTypeId();
+            if(record.getIncrementTypeId() != null && incrementType !=null){
+                IncrementUtil.getStrIncrementName(incrementType.getValidTimeType(),incrementType.getName());
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 }

src/main/resources/mapper/agent/CameraIncrementLogMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.fdkankan.agent.mapper.ICameraIncrementLogMapper">
 
     <select id="pageList" resultType="com.fdkankan.agent.response.CameraIncrementVo">
-        select  cil.*,c.sn_code,u.user_name as operationUserName  from t_camera_increment_log cil
+        select  cil.*,c.sn_code,u.user_name as operationUserName,ui.increment_type_id from t_camera_increment_log cil
             left join t_camera c on cil.camera_id = c.id
             left join t_user_increment ui on cil.increment_id = ui.id
             left join t_user u on cil.operation_user = u.id