安装计划

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallDeviceDto.java

@@ -57,4 +57,7 @@ public class InstallDeviceDto {
 
     @ApiModelProperty(value="厂商名称")
     private String manufacturerName;
+
+    @ApiModelProperty(value="是否支持阀门 0：否 1：是")
+    private Integer isSupportValve;
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/InstallListMapper.xml

@@ -275,9 +275,11 @@
     rd.last_receive_time,
     rd.user_name,
     rd.user_phone,
-    rd.is_accept
+    rd.is_accept,
+    rp.is_support_valve
     from rmcp_install_list ril
     left join rmcp_device rd on ril.device_id = rd.id
+    left join rmcp_product rp on rd.product_id = rp.id
     where ril.status = 1 and rd.status = 1 and ril.install_plan_id = #{dto.id}
     <if test="userCondition.tenantId != null">and ril.tenant_id = #{userCondition.tenantId}</if>
     <if test="dto.deviceNo != null and dto.deviceNo != ''">and (rd.meter_no LIKE concat('%',#{dto.deviceNo},'%') or rd.file_no LIKE concat('%',#{dto.deviceNo},'%'))</if>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/excel/resolver/listener/InstallPlanListener.java

@@ -59,8 +59,6 @@ public class InstallPlanListener extends AnalysisEventListener<InstallPlanExcelD
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
         log.info("批量导出设备完成 successNum = {},failNum = {}",excelData.getSuccessNum().get(),excelData.getFailNum().get());
         installPlanService.saveExcelData(excelData);
-        // TODO: 2021/8/2 生成失败文件
-        // TODO: 2021/8/2 生成消息
     }
 
     @Override