归档bug

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

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

src/main/java/com/chinaitop/depot/agent/archive/service/impl/ArchiveServiceImpl.java

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