扫码后台0215完成19:32

whepi-web/src/main/java/com/bofeng/dao/SweepCodeMapper.java

@@ -12,4 +12,5 @@ import java.util.Map;
 @Repository
 public interface SweepCodeMapper {
     List<SysUptownHouse> selectCode(PageDb pageDb, Map<String, Object> queryParam);
+    List<SysUptownHouse> export(Map<String, Object> queryParam);
 }

whepi-web/src/main/java/com/bofeng/service/SweepCodeService.java

@@ -21,13 +21,23 @@ public class SweepCodeService {
 
     public List<SysUptownHouse> selectCode(PageDb pageDb, Map<String, Object> queryParam) {
         List<SysUptownHouse> sysUptownHouses = sweepCodeMapper.selectCode(pageDb,queryParam);
-        for (int i = 0; i < sysUptownHouses.size(); i++) {
-            if(sysUptownHouses.get(i).getInType() == 1 ){
-                sysUptownHouses.get(i).setInTypeStr("进入");
-            }else if(sysUptownHouses.get(i).getInType() == 2 ){
-                sysUptownHouses.get(i).setInTypeStr("外出");
+
+        return sysUptownHouses;
+    }
+
+
+    public List<SysUptownHouse> export(Map<String, Object> queryParam) {
+        List<SysUptownHouse> sysUptownHouses = sweepCodeMapper.export(queryParam);
+        if(sysUptownHouses.size() != 0){
+            for (int i = 0; i < sysUptownHouses.size(); i++) {
+                if(sysUptownHouses.get(i).getInType() == 1 ){
+                    sysUptownHouses.get(i).setInTypeStr("进入");
+                }else if(sysUptownHouses.get(i).getInType() == 2 ){
+                    sysUptownHouses.get(i).setInTypeStr("外出");
+                }
             }
         }
+
         return sysUptownHouses;
     }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/ScanAdminController.java

@@ -68,8 +68,8 @@ public class ScanAdminController {
     @ApiOperation("导出")
     @PostMapping("/whepi/sweepCode/export")
     @SneakyThrows
-    public void export(HttpParameterParser parser,HttpServletResponse resp,PageDb pageDb) {
-        List<SysUptownHouse> sysUptownHouses = sweepCodeService.selectCode(pageDb,parser.getMap());
+    public void export(HttpParameterParser parser,HttpServletResponse resp) {
+        List<SysUptownHouse> sysUptownHouses = sweepCodeService.export(parser.getMap());
         ExcelUtils.writeSheet(SysUptownHouse.class, sysUptownHouses).export(resp,"出入管理");
     }
 

whepi-web/src/main/resources/mapper/SweepCodeMapper.xml

@@ -30,6 +30,35 @@
          </if>
         </where>
     </select>
+    <select id="export" resultType="com.bofeng.entity.SysUptownHouse">
+     select DISTINCT
+     a.uptown_name,
+     d.ridgepole,
+     d.unit,
+     e.doorplate,
+     b.door_name,
+     c.date,
+     c.in_type,
+     g.linkman
+     from out_scan c
+     inner join sys_user_role t on c.user_id = t.user_id and role_id =1
+     inner join sys_uptown_home g on g.house_id = t.property_id
+     inner join sys_uptown a on c.uptown_id = a.uptown_id
+     inner join sys_uptown_door b on c.door_id = b.door_id
+     inner join sys_uptown_house e on e.house_id = t.property_id
+     inner join sys_uptown_unit d on d.unit_id = e.unit_id
+        <where>
+         <if test="queryProperties != null and queryProperties != ''">
+          a.uptown_name like concat('%',#{queryProperties},'%')
+         </if>
+         <if test="dateSta != null and dateSta !=''">
+          and c.date >= #{dateSta}
+         </if>
+         <if test="dateEnd != null and dateEnd !=''">
+          and c.date &lt; #{dateEnd}
+         </if>
+        </where>
+    </select>
 
 
 </mapper>