Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r30312 -r30755 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 30312) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 30755) @@ -11,6 +11,7 @@ import java.util.Calendar; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -120,6 +121,7 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecordPic; +import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.entity.toussetransition.TousseTransitionPlan; import com.forgon.disinfectsystem.entity.toussetransition.WashTransitionItem; @@ -6495,5 +6497,39 @@ private String getQualityMonitoringGoodsDetails(JSONObject params){ return JSONUtil.buildJsonObject(false, "查看质量监测明细功能正在完善中...").toString(); } + + /** + * 提示上传设备物理参数图片(SZYK-27) + */ + @SuppressWarnings("unused") + private String promptUploadDeviceParameterPicture(JSONObject params){ + JSONArray message = new JSONArray(); + List allVo = new ArrayList(); + List vo1 = sterilizationRecordManager.promptUploadDeviceParameterPicture(); + List vo2 = washAndDisinfectRecordManager.promptUploadDeviceParameterPicture(); + if(vo1 != null){ + allVo.addAll(vo1); + } + if(vo2 != null){ + allVo.addAll(vo2); + } + allVo.sort(new Comparator() { + @Override + public int compare(SystemWarningVo o1, SystemWarningVo o2) { + if (o1.getEndDate() == null && o2.getEndDate() != null) { + return -1; + } + if (o1.getEndDate() != null && o2.getEndDate() == null) { + return 1; + } + return o2.getEndDate().compareTo(o1.getEndDate()); + } + }); + for(int i=0;i<20 && i