Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/Inspection

web/client/src/sections/patrolManage/containers/yujingguanli.js

@@ -268,12 +268,12 @@ function YujingGuanli (props) {
                             //         parseInt(moment(i?.patrolRecordIssueHandles[0].yujingshijian).format('YYYYMMDDHHMMSS'))<parseInt(moment(j?.patrolRecordIssueHandles[0]?.yujingshijian).format('YYYYMMDDHHMMSS'))
                             // }).length===0    
                             })  
-                            console.log(data,'data')
+                            // console.log(data,'data')
                             const data = res?.payload?.data?.filter(i=>{
                                 return i?.patrolRecordIssueHandles[0]?.yanshoucishu>2&&i?.patrolRecordIssueHandles[0]?.isgaojing!==true
                                     &&res?.payload?.data?.filter(j=>j?.pointId===i?.pointId
-                                        &&j?.points?.project?.id===i?.points?.project?.id&&
-                                        parseInt(i?.patrolRecordIssueHandles[0].yujingshijian)<parseInt(j?.patrolRecordIssueHandles[0]?.yujingshijian)
+                                        &&j?.points?.project?.id===i?.points?.project?.id
+                                        &&moment(i?.patrolRecordIssueHandles[0].yanshoushijian).valueOf()<moment(j?.patrolRecordIssueHandles[0]?.yanshoushijian).valueOf()
                                         ).length===0   
                             })
                             console.log(res,'res')