瀏覽代碼

安装计划

lin 3 年之前
父節點
當前提交
46b422c642

+ 0 - 1
zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallInputDto.java

@@ -12,7 +12,6 @@ import javax.validation.constraints.NotNull;
  */
  */
 @Data
 @Data
 public class InstallInputDto {
 public class InstallInputDto {
-    @NotNull(message = "id cannot be null")
     @ApiModelProperty(value="编号")
     @ApiModelProperty(value="编号")
     private Integer id;
     private Integer id;
 
 

+ 2 - 1
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/install/impl/InstallListServiceImpl.java

@@ -249,6 +249,7 @@ public class InstallListServiceImpl implements InstallListService {
         }
         }
 
 
         InstallList install = installListMapper.findById(data.getId());
         InstallList install = installListMapper.findById(data.getId());
+        excelData.setPlanId(install.getInstallPlanId());
         if (install.getIsInstalled() == 1) {
         if (install.getIsInstalled() == 1) {
             resultMessage.setMessage(RmcpErrorEnum.DOOR_EXISTED.getMessage());
             resultMessage.setMessage(RmcpErrorEnum.DOOR_EXISTED.getMessage());
             return resultMessage;
             return resultMessage;
@@ -284,7 +285,7 @@ public class InstallListServiceImpl implements InstallListService {
         installList.setDeviceId(device.getId());
         installList.setDeviceId(device.getId());
         this.updateByPrimaryKeySelective(installList);
         this.updateByPrimaryKeySelective(installList);
 
 
-        excelData.setPlanId(install.getInstallPlanId());
+
 
 
         resultMessage.setStatus(true);
         resultMessage.setStatus(true);
         return resultMessage;
         return resultMessage;