微信扫一扫电梯维保修改

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/dto/MaintenanceInfoModelForWX.java

@@ -12,7 +12,7 @@ import java.util.Date;
 public class MaintenanceInfoModelForWX {
 
     @ApiModelProperty(value = "最近维保日期")
-    private Date recentTime;
+    private Date informStart;
 
     @ApiModelProperty(value = "维保单位")
     private String meUnitName;

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java

@@ -101,15 +101,7 @@ import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.security.AlgorithmParameters;
 import java.security.Security;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -334,10 +326,16 @@ public class TzsAppService {
 
 			// 设备维保信息
 			JSONObject useJsonObject = new JSONObject();
-			List useList = new ArrayList();
-			getGroupList(null, record, MaintenanceInfo.class, MaintenanceInfoModelForWX.class, unseInfoService, useList, false, dictionaryList, equipmentCategories);
+			List maintenanceList = new ArrayList();
+			getGroupList(null, record, MaintenanceInfo.class, MaintenanceInfoModelForWX.class, maintenanceInfoService, maintenanceList, false, dictionaryList, equipmentCategories);
 			useJsonObject.put("title", "设备维保信息");
-			useJsonObject.put("tabValue", useList);
+			if (maintenanceList.size() > 1) {
+				List maintenanceList1 =  new ArrayList();
+				maintenanceList1.add(maintenanceList.get(0));
+				maintenanceList.clear();
+				maintenanceList.add(maintenanceList1.get(0));
+			}
+			useJsonObject.put("tabValue", maintenanceList);
 			jsonArray.add(useJsonObject);
 			map.put("tab", jsonArray);
 		} else if ("气瓶".equals(map.get("EQU_CATEGORY"))) {