上传excel

src/main/java/com/wxxcx/index/WxxcxIndexController.java

@@ -2089,34 +2089,54 @@ public class WxxcxIndexController<AesException extends Throwable> {
 
         // 根据queryListParam查询条件是否为空，拼接 jdbc sql
         StringBuilder sql = new StringBuilder("SELECT * FROM dev_info WHERE 1=1 ");
+        StringBuilder countSql = new StringBuilder("SELECT count(*) FROM dev_info WHERE 1=1 ");
         if (!StringUtils.isEmpty(queryListParam.getDevId())) {
             sql.append(" AND dev_id like '%" + queryListParam.getDevId() + "%'");
+            countSql.append(" AND dev_id like '%" + queryListParam.getDevId() + "%'");
         }
         if (!StringUtils.isEmpty(queryListParam.getDevType())) {
             sql.append(" AND dev_type = '" + queryListParam.getDevType() + "'");
+            countSql.append(" AND dev_type = '" + queryListParam.getDevType() + "'");
         }
         if (!StringUtils.isEmpty(queryListParam.getSoftware())) {
             sql.append(" AND software = '" + queryListParam.getSoftware() + "'");
+            countSql.append(" AND software = '" + queryListParam.getSoftware() + "'");
         }
 
         if (!StringUtils.isEmpty(queryListParam.getDevName())) {
             sql.append(" AND dev_name like '%" + queryListParam.getDevName() + "%'");
+            countSql.append(" AND dev_name like '%" + queryListParam.getDevName() + "%'");
         }
 
         if (queryListParam.getOnline() != null) {
             sql.append(" AND online = '" + queryListParam.getOnline() + "'");
+            countSql.append(" AND online = '" + queryListParam.getOnline() + "'");
         }
 
         // 添加创建时间的范围查询 数据库里的create_time字段为timestamp类型，查询条件里的createtimestart和createtimeend为string类型，需要转换成timestamp类型,yyyyMMdd
         String queryStartTime = queryListParam.getCreateTimeStart();
         if (!StringUtils.isEmpty(queryStartTime)) {
             sql.append(" AND create_time >= STR_TO_DATE('" + queryStartTime + "', '%Y%m%d') ");
+            countSql.append(" AND create_time >= STR_TO_DATE('" + queryStartTime + "', '%Y%m%d') ");
         }
         String queryEndTime = queryListParam.getCreateTimeEnd();
         if (!StringUtils.isEmpty(queryEndTime)) {
             LocalDate endDate = LocalDate.parse(queryEndTime, DateTimeFormatter.ofPattern("yyyyMMdd"));
             endDate = endDate.plusDays(1);
             sql.append(" AND create_time < STR_TO_DATE('" + DateTimeFormatter.ofPattern("yyyyMMdd").format(endDate) + "', '%Y%m%d') ");
+            countSql.append(" AND create_time < STR_TO_DATE('" + DateTimeFormatter.ofPattern("yyyyMMdd").format(endDate) + "', '%Y%m%d') ");
+        }
+
+        // count
+        // 待确认分享数
+        Integer fxqr = baseDAO.getJdbcTemplate().queryForObject(
+                countSql.toString(), Integer.class);
+        R r = JSONUtil.getSuccessMsg(null);
+        if (fxqr == null || fxqr == 0) {
+            r.data.put("fxqr", 0);
+            return r;
+        } else {
+            r.data.put("fxqr", fxqr);
         }
 
         // 分页参数
@@ -2127,7 +2147,6 @@ public class WxxcxIndexController<AesException extends Throwable> {
         sql.append(" ORDER BY create_time DESC LIMIT ").append("" + pageSize).append(" OFFSET ").append("" + offset);
         List<DevVO> newlist2 = baseDAO.getJdbcTemplate().query(sql.toString(), new BeanPropertyRowMapper<>(DevVO.class));
         System.out.println("end time :" + System.currentTimeMillis());
-        R r = JSONUtil.getSuccessMsg(null);
         r.data.put("resList", newlist2);
         return r;
     }