安装计划

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

@@ -27,7 +27,7 @@ public interface InstallListMapper {
 
     List<InstallDeviceDto> getInstallList(@Param("dto") InstallQueryDto dto, @Param("userCondition") UserCondition userCondition);
 
-    List<InstallListVo> getUnInstallList(@Param("planId") Integer planId);
+    List<InstallListVo> findInstallList(@Param("planId") Integer planId);
 
     List<InstallDeviceDto> getUnInstallDeviceList(@Param("planId") Integer planId);
 

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

@@ -289,8 +289,8 @@
     order by ril.create_date desc
   </select>
 
-  <select id="getUnInstallList" resultType="com.zcxk.rmcp.api.vo.InstallListVo">
-    select id,door_no,meter_code,user_name,user_phone,id_card from rmcp_install_list where status = 1 and install_plan_id = #{planId} and is_installed = 0
+  <select id="findInstallList" resultType="com.zcxk.rmcp.api.vo.InstallListVo">
+    select id,door_no,meter_code,user_name,user_phone,id_card from rmcp_install_list where status = 1 and install_plan_id = #{planId}
   </select>
 
   <select id="getUnInstallDeviceList" resultType="com.zcxk.rmcp.api.dto.install.InstallDeviceDto">

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

@@ -320,7 +320,7 @@ public class InstallPlanServiceImpl implements InstallPlanService {
     public void downInstallMeterTemplate(Integer id, HttpServletResponse response) {
 
         InstallPlan plan = installPlanMapper.findById(id);
-        List<InstallListVo> list = installListMapper.getUnInstallList(id);
+        List<InstallListVo> list = installListMapper.findInstallList(id);
         Community community = communityMapper.findCommunity(plan.getCommunityId());
         DownloadExcelData data = new DownloadExcelData();
         data.setId(id);