diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointAuditRecordDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointAuditRecordDAO.java index dadf8d4db..b8bdd680d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointAuditRecordDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointAuditRecordDAO.java @@ -6,6 +6,7 @@ import com.cool.store.enums.NodeNoEnum; import com.cool.store.mapper.PointAuditRecordMapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @@ -64,4 +65,18 @@ public class PointAuditRecordDAO { } return pointAuditRecordMapper.getPointAllAuditRecord(pointId); } + + /** + * 获取提交时间 + * @param pointIds + * @return + */ + public Map getPointSubmitTimeMap(List pointIds){ + if(CollectionUtils.isEmpty(pointIds)){ + return Maps.newHashMap(); + } + List auditList = pointAuditRecordMapper.getPointSubmitAuditTime(pointIds); + return auditList.stream().collect(Collectors.toMap(k->k.getPointId(), v->v.getFinishTaskTime(), (oldDate, newDate) -> oldDate.compareTo(newDate) > 0 ? oldDate : newDate)); + } + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java index 1c7e08ce2..1e95ba285 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java @@ -64,12 +64,4 @@ public class PointTodoInfoDAO { } return pointTodoInfoMapper.getCurNodeNoByPoint(pointId); } - - public Map getPointSubmitTimeMap(List pointIds){ - if(CollectionUtils.isEmpty(pointIds)){ - return Maps.newHashMap(); - } - List auditList = pointTodoInfoMapper.getPointSubmitAuditTime(pointIds); - return auditList.stream().collect(Collectors.toMap(k->k.getPointId(), v->v.getFinishTaskTime(), (oldDate, newDate) -> oldDate.compareTo(newDate) > 0 ? oldDate : newDate)); - } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointAuditRecordMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointAuditRecordMapper.java index 060cd14e3..78e6f2c0d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointAuditRecordMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointAuditRecordMapper.java @@ -4,7 +4,6 @@ import com.cool.store.entity.PointAuditRecordDO; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; -import java.util.Date; import java.util.List; public interface PointAuditRecordMapper extends Mapper { @@ -38,4 +37,11 @@ public interface PointAuditRecordMapper extends Mapper { * @return */ List getPointAllAuditRecord(@Param("pointId") Long pointId); + + /** + * 获取提交时间 + * @param pointIds + * @return + */ + List getPointSubmitAuditTime(@Param("pointIds") List pointIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java index a8aa03c2d..438aed108 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java @@ -65,10 +65,4 @@ public interface PointTodoInfoMapper extends Mapper { */ Integer getCurNodeNoByPoint(@Param("pointId") Long pointId); - /** - * 获取提交时间 - * @param pointIds - * @return - */ - List getPointSubmitAuditTime(@Param("pointIds") List pointIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointAuditRecordMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointAuditRecordMapper.xml index 61ad36a21..9da35f61d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointAuditRecordMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointAuditRecordMapper.xml @@ -135,4 +135,15 @@ update xfsg_point_audit_record set deleted = 1 where point_id = #{pointId} and cycle_count = #{cycleCount} and audit_status = 0 + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml index 0e026515d..aedfa9796 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml @@ -100,15 +100,4 @@ select node_no from xfsg_point_todo_info where point_id = #{pointId} and status = 0 and deleted = 0 limit 1 - - \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index c3c703018..c0fcb04a5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -949,7 +949,7 @@ public class PointServiceImpl implements PointService { List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List pointIds = pointPage.stream().map(PointInfoDO::getId).collect(Collectors.toList()); //获取提交时间 - Map submitTimeMap = pointTodoInfoDAO.getPointSubmitTimeMap(pointIds); + Map submitTimeMap = pointAuditRecordDAO.getPointSubmitTimeMap(pointIds); Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); resultList = PointToDoVO.convertVO(pointPage.getResult(), regionNameMap, submitTimeMap); }