安装计划

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceMapper.java

@@ -144,7 +144,7 @@ public interface DeviceMapper {
      * @return java.util.List<com.zcxk.rmcp.api.dto.install.InstallDeviceDto>
      * @author linqingwei
      **/
-    List<InstallDeviceDto> getUnInstallDeviceList(@Param("tenantId") String tenantId, @Param("companyOrgId") Integer companyOrgId, @Param("deptOrgId") Integer deptOrgId, @Param("productId") Integer productId, @Param("listId") Integer listId);
+    List<InstallDeviceDto> getUnInstallDeviceList(@Param("tenantId") String tenantId, @Param("companyOrgId") Integer companyOrgId, @Param("deptOrgId") Integer deptOrgId, @Param("productId") Integer productId, @Param("communityId") Integer communityId, @Param("listId") Integer listId);
 
     /*
      * @description deviceNo获取设备
@@ -192,11 +192,12 @@ public interface DeviceMapper {
     List<MeterSyncDto> meterSync(@Param("meterSync") MeterSyncInputDto meterSync);
 
     /**
-    * 统计小区下有多少个设备数
-    * @author Andy
-    * @date 16:04 2021/9/10
-    * @param communityId:
-    * @return int
-    **/
+     * 统计小区下有多少个设备数
+     *
+     * @param communityId:
+     * @return int
+     * @author Andy
+     * @date 16:04 2021/9/10
+     **/
     int countDeviceByCommunityId(int communityId);
 }

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

@@ -674,6 +674,7 @@
       <if test="companyOrgId != null">and rd.company_org_id = #{companyOrgId}</if>
       <if test="deptOrgId != null">and rd.dept_org_id = #{deptOrgId}</if>
       <if test="productId != null">and rd.product_id = #{productId}</if>
+      <if test="communityId != null != null">and rd.community_id = #{communityId}</if>
     </where>
   </select>
 

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

@@ -228,7 +228,7 @@ public class InstallListServiceImpl implements InstallListService {
     public List<InstallDeviceDto> getUnInstallList(Integer planId, Integer id) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         InstallPlan plan = installPlanMapper.findById(planId);
-        List<InstallDeviceDto> list = deviceMapper.getUnInstallDeviceList(loginUser.getTenantId(),plan.getCompanyOrgId(),plan.getDeptOrgId(),plan.getProductId(),id);
+        List<InstallDeviceDto> list = deviceMapper.getUnInstallDeviceList(loginUser.getTenantId(),plan.getCompanyOrgId(),plan.getDeptOrgId(),plan.getProductId(),plan.getCommunityId(),id);
         return list;
     }