Browse Source

安装计划

lin 3 years ago
parent
commit
4e51ff49ff

+ 4 - 1
zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallPlanDataDto.java

@@ -39,9 +39,12 @@ public class InstallPlanDataDto {
     private Integer totalNumber = 0;
 
 
-    @ApiModelProperty(value = "类型",example = "1")
+    @ApiModelProperty(value = "类型")
     private Integer type;
 
+    @ApiModelProperty(value = "code")
+    private String code;
+
     @ApiModelProperty(value="水表档案号")
     private String fileNo;
 

+ 10 - 0
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/install/impl/InstallPlanServiceImpl.java

@@ -259,6 +259,7 @@ public class InstallPlanServiceImpl implements InstallPlanService {
                 installPlanDataDTO.setParentId(installPlanData.getParentId());
                 installPlanDataDTO.setName(installPlanData.getName());
                 installPlanDataDTO.setType(installPlanData.getType());
+                installPlanDataDTO.setCode(convertCode(installPlanData.getType()));
                 installPlanDataDTOList.add(installPlanDataDTO);
             }
         }
@@ -274,6 +275,7 @@ public class InstallPlanServiceImpl implements InstallPlanService {
                 installPlanDataDTO.setName(installList.getDoorNo());
                 installPlanDataDTO.setDeviceId(installList.getDeviceId());
                 installPlanDataDTO.setType(4);
+                installPlanDataDTO.setCode("door");
                 installPlanDataDTO.setIsInstalled(installList.getIsInstalled());
                 installPlanDataDTO.setIsAccepted(installList.getIsAccepted());
                 installPlanDataDTO.setDeviceStatus(installList.getDeviceStatus());
@@ -295,6 +297,14 @@ public class InstallPlanServiceImpl implements InstallPlanService {
         return installDetail;
     }
 
+    private String convertCode(Integer type){
+        if(type == 1)return "build";
+        if(type == 2)return "unit";
+        if(type == 3)return "floor";
+        return "";
+    }
+
+
     @Override
     public void downPlanTemplate(HttpServletResponse response) {
         DownloadExcelData downloadExcelData = new DownloadExcelData();