sprint21

smart-city-platform/src/main/java/com/bz/smart_city/async/AsyncInstallPlanDownloadTask.java

@@ -287,7 +287,7 @@ public class AsyncInstallPlanDownloadTask {
                 }
             }
 
-            InputStream in = this.getClass().getClassLoader().getResourceAsStream("excel/installWaterMeterTemplate20201228.xlsx");   //得到文档的路径
+            InputStream in = this.getClass().getClassLoader().getResourceAsStream("excel/installWaterMeterTemplate20210114-yc.xlsx");   //得到文档的路径
 
             //列表数据将存储到指定的excel文件路径
             FileOutputStream out = new FileOutputStream(filePath);

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/InstallRemoteMeterResolverExcelTemplate.java

@@ -47,7 +47,7 @@ public class InstallRemoteMeterResolverExcelTemplate extends AbstractResolverExc
     @Override
     protected void cycleExcel() {
         log.info("begin InstallRemoteMeterResolverExcelTemplate");
-        String executeSheetName = "安装计划模板";
+        String executeSheetName = "远传水表-安装计划模板";
         InstallListDTO dto = new InstallListDTO();
         dto.setSiteId(record.getSiteId());
         dto.setInstallTime(LocalDateTime.now());

smart-city-platform/src/main/resources/mapper/CommunityMapper.xml

@@ -297,6 +297,7 @@
         left join sc_area sa2 on   sc.city=sa2.id
         left join sc_area sa3 on   sc.region=sa3.id
         where sc.status = 1
+        <if test="param.siteId "> and sc.site_id = #{param.siteId} </if>
         <if test="param.customerId != null and param.customerId != 0 "> and sc.customer_id = #{param.customerId} </if>
         <if test="param.province != null"> and sc.province = #{param.province} </if>
         <if test="param.city != null"> and sc.city = #{param.city} </if>
@@ -324,6 +325,7 @@
         left join sc_area sa2 on   sc.city=sa2.id
         left join sc_area sa3 on   sc.region=sa3.id
         where sc.status = 1
+        <if test="param.siteId != null"> and sc.site_id = #{param.siteId} </if>
         <if test="param.customerId != null and param.customerId != 0 "> and sc.customer_id = #{param.customerId} </if>
         <if test="param.province != null"> and sc.province = #{param.province} </if>
         <if test="param.city != null"> and sc.city = #{param.city} </if>