diff --git a/src/main/java/com/emr/entity/Archive_Detail_Vo.java b/src/main/java/com/emr/entity/Archive_Detail_Vo.java index d3bbed2..e182d20 100644 --- a/src/main/java/com/emr/entity/Archive_Detail_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Detail_Vo.java @@ -25,6 +25,10 @@ public class Archive_Detail_Vo extends Archive_Detail{ private Integer checker; private String assortId; + + private String sort; + + private String order; } diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index b2ff1e5..a6e98fa 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -230,15 +230,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public List selectByColumn(Archive_Master_Vo archiveMasterVo) { setMaxRoleId(archiveMasterVo); - long start = System.currentTimeMillis(); List list = archiveMasterMapper.selectByColumn(archiveMasterVo); - long end = System.currentTimeMillis(); - System.out.println("查询所需的时间"+(end-start)/1000.0+"s"); //转换科室与赋值超期天数 - long start1 = System.currentTimeMillis(); selectByColumnChange(list); - long end1 = System.currentTimeMillis(); - System.out.println("组织所需的时间"+(end1-start1)/1000.0+"s"); //根据状态code转换状态及判断显示按钮 if(null != list && !list.isEmpty()){ //查询流转角色集合 diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index 6329a8e..cddbbb4 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -76,7 +76,15 @@ and t.Source = #{source,jdbcType=VARCHAR} - ORDER BY z.assort_sort,t.UpLoadDateTime + ORDER BY + + + t.UpLoadDateTime ${order} + + + z.assort_sort,t.UpLoadDateTime + +