lvzhikai 5 lat temu
rodzic
commit
631728b39f

+ 1 - 1
src/main/java/com/chinaitop/depot/agent/archive/mapper/StorageArchiveMapper.xml

@@ -399,7 +399,7 @@
399
     <if test="startTime != null and endTime != null">
399
     <if test="startTime != null and endTime != null">
400
       AND archive.create_time BETWEEN #{startTime} AND #{endTime}
400
       AND archive.create_time BETWEEN #{startTime} AND #{endTime}
401
     </if>
401
     </if>
402
-    ORDER BY archive.archive_state,
402
+    ORDER BY approval.result,
403
              approval.updatetime DESC
403
              approval.updatetime DESC
404
   </select>
404
   </select>
405
 
405
 

+ 8 - 1
src/main/java/com/chinaitop/depot/agent/archive/service/impl/ArchiveServiceImpl.java

@@ -35,7 +35,14 @@ public class ArchiveServiceImpl implements ArchiveService {
35
             criteria.andCreateTimeBetween(ParameterUtil.string2datetime(startTime + " 00:00:00"),ParameterUtil.string2datetime(endTime + " 23:59:59"));
35
             criteria.andCreateTimeBetween(ParameterUtil.string2datetime(startTime + " 00:00:00"),ParameterUtil.string2datetime(endTime + " 23:59:59"));
36
         }
36
         }
37
         if (ParameterUtil.isnotnull(archiveState)) {
37
         if (ParameterUtil.isnotnull(archiveState)) {
38
-            criteria.andArchiveStateEqualTo(archiveState);
38
+            if(ParameterUtil.isequal(3,archiveState)){
39
+                List<String> stateList = new ArrayList<String>();
40
+                stateList.add("3");
41
+                stateList.add("4");
42
+                criteria.andArchiveStateIn(stateList);
43
+            }else{
44
+                criteria.andArchiveStateEqualTo(archiveState);
45
+            }
39
         }
46
         }
40
         example.setOrderByClause("updatetime desc");
47
         example.setOrderByClause("updatetime desc");
41
         List<StorageArchive> storageArchives = StorageArchiveMapper.selectByExample(example);
48
         List<StorageArchive> storageArchives = StorageArchiveMapper.selectByExample(example);