报表

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -1546,18 +1546,18 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     public Result<?> getHistory(@RequestParam Map<String, String> parameterMap, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
 
-        List<Map<String, String>> maps = customerInfoService.selectHistoryListPage(pageNo, pageSize, parameterMap);
-        Page<Map<String, String>> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<Map<String, String>>(pageNo, pageSize).setRecords(maps);
-        return Result.ok(smsCheckCustomerInfoBecomeDueAndInfoPage);
+        Page<Map<String, String>> maps = customerInfoService.selectHistoryListPage(pageNo, pageSize, parameterMap);
+
+        return Result.ok(maps);
     }
 
     @GetMapping(value = "/status/getBillList")
     public Result<?> getBillList(@RequestParam Map<String, String> parameterMap, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
 
-        List<Map<String, String>> maps = customerInfoService.selectBillsListPage(pageNo, pageSize, parameterMap);
-        Page<Map<String, String>> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<Map<String, String>>(pageNo, pageSize).setRecords(maps);
-        return Result.ok(smsCheckCustomerInfoBecomeDueAndInfoPage);
+
+
+        return Result.ok( customerInfoService.selectBillsListPage(pageNo, pageSize, parameterMap));
     }
 
 
@@ -1781,9 +1781,9 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         smsCheckCustomerInfo.setStaffName(smsCheckCustomerInfo.getStaffName() == null ? "" : smsCheckCustomerInfo.getStaffName().replace("*", ""));
         smsCheckCustomerInfo.setCheckState(smsCheckCustomerInfo.getCheckState() == null ? null : smsCheckCustomerInfo.getCheckState());
         smsCheckCustomerInfo.setType(smsCheckCustomerInfo.getType() == null ? null : smsCheckCustomerInfo.getType());
-        List<SmsCheckCustomerInfoBecomeDueAndInfo> infoList = customerInfoService.selectCompanyCheckListPage(pageNo, pageSize, smsCheckCustomerInfo );
-        Page<SmsCheckCustomerInfoBecomeDueAndInfo> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<SmsCheckCustomerInfoBecomeDueAndInfo>(pageNo, pageSize).setRecords(infoList);
-        return Result.ok(smsCheckCustomerInfoBecomeDueAndInfoPage);
+        Page<SmsCheckCustomerInfoBecomeDueAndInfo>  infoList = customerInfoService.selectCompanyCheckListPage(pageNo, pageSize, smsCheckCustomerInfo );
+      //  Page<SmsCheckCustomerInfoBecomeDueAndInfo> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<SmsCheckCustomerInfoBecomeDueAndInfo>(pageNo, pageSize).setRecords(infoList);
+        return Result.ok(infoList);
     }
 
     @GetMapping(value = "/infoListTopTable")

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java

@@ -58,7 +58,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
 
 
     @SelectProvider(type = ProviderClass.class, method = "selectListCheckPage")
-    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListCheckPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo );
+    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListCheckPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo ,String page);
 
     @SelectProvider(type = ProviderClass.class, method = "selectGroupByStaffNo")
     List<CheckTopVo> selectGroupByStaffNo();
@@ -86,16 +86,16 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class, method = "selectMapGroupJb")
     List<Map<String, Integer>> selectMapGroupJb(  Map<String, String> parameterMap );
     @SelectProvider(type = ProviderClass.class, method = "selectHistoryListPage")
-    List<Map<String, String>> selectHistoryListPage(Integer pageNo, Integer pageSize, Map<String, String> parameterMap);
+    List<Map<String, String>> selectHistoryListPage(Integer pageNo, Integer pageSize, Map<String, String> parameterMap,String page);
 
     @SelectProvider(type = ProviderClass.class, method = "selectBillsListPage")
-    List<Map<String, String>> selectBillsListPage(Integer pageNo, Integer pageSize, Map<String, String> parameterMap);
+    List<Map<String, String>> selectBillsListPage(Integer pageNo, Integer pageSize, Map<String, String> parameterMap,String info);
 
 
     class ProviderClass {
 
 
-        public String selectBillsListPage(Integer pageNo, Integer pageSize,  Map<String, String>  parameterMap){
+        public String selectBillsListPage(Integer pageNo, Integer pageSize,  Map<String, String>  parameterMap,String info){
 
             StringBuilder sql = new StringBuilder();
 
@@ -118,10 +118,22 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                     "SELECT task.task_name,task.type,info.customer_no,info.user_no ,task.task_start_time,task.task_end_time,info.staff_no,a.c,info.check_state  from \n" +
                     "(SELECT data_id,count(*) c from sms_check_customer_data_log_bill group by data_id ) a \n" +
                     "LEFT JOIN  sms_check_customer_info  info  on info.data_id =a.data_id \n" +
-                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag is not null   ");
-
-            sql.append("  ) aa  ORDER BY aa.c DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
-
+                    "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag is not null   ) aa  where 1=1  ");
+                    if (StringUtils.isNotBlank(parameterMap.get("customerNo"))){
+                        sql.append(" and customer_no like '%"+parameterMap.get("customerNo").replace("*","")+"%' ");
+                    }
+                    if (StringUtils.isNotBlank(parameterMap.get("userNo"))){
+                        sql.append(" and user_no like '%"+parameterMap.get("userNo").replace("*","")+"%' ");
+                    }
+                    if (StringUtils.isNotBlank(parameterMap.get("taskName"))){
+                        sql.append(" and task_name like '%"+parameterMap.get("taskName").replace("*","")+"%' ");
+                    }
+                    if (StringUtils.isNotBlank(parameterMap.get("type"))){
+                        sql.append(" and type='"+parameterMap.get("type").replace("*","")+"' ");
+                    }
+            if (info.equals("page")){
+                sql.append("   ORDER BY aa.c DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
+            }
             return sql.toString();
         }
         public String getTaskCount(   Map<String, String>  parameterMap){
@@ -275,20 +287,32 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
 
 
-        public String selectHistoryListPage(Integer pageNo, Integer pageSize,  Map<String, String>  parameterMap){
+        public String selectHistoryListPage(Integer pageNo, Integer pageSize,  Map<String, String>  parameterMap,String page){
 
             StringBuilder sql = new StringBuilder();
 
-            sql.append("        \n" +
-                    "      select a.*,info.*,task.task_start_time,task_end_time,task.task_name from \n" +
+            sql.append("     select a.*,info.*,task.task_start_time,task_end_time,task.task_name from \n" +
                     "      (\n" +
                     "      select data_id,GROUP_CONCAT( update_field) filed from sms_check_zg_history   GROUP BY data_id \n" +
                     "      ) a\n" +
                     "      LEFT JOIN  sms_check_customer_info info  on info.data_id = a.data_id\n" +
                     "      LEFT JOIN  sms_check_task task    on task.id = info.task_id where 1=1 and info.del_flag =0" +
                     " ");
-
-            sql.append(" ORDER BY info.create_time DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
+            if (StringUtils.isNotBlank(parameterMap.get("customerNo"))){
+                sql.append(" and info.customer_no like '%"+parameterMap.get("customerNo").replace("*","")+"%' ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("userNo"))){
+                sql.append(" and info.user_no like '%"+parameterMap.get("userNo").replace("*","")+"%' ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("taskName"))){
+                sql.append(" and task.task_name like '%"+parameterMap.get("taskName").replace("*","")+"%' ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("type"))){
+                sql.append(" and info.type='"+parameterMap.get("type").replace("*","")+"' ");
+            }
+            if (page.equals("page")){
+                sql.append(" ORDER BY info.create_time DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
+            }
 
             return sql.toString();
         }
@@ -392,7 +416,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                     sql.append("and sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"'");
                 }
                 if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerOrgAll")){
-                    sql.append("and 1=1 ");
+                    //sql.append("and 1=1 ");
                 }
             }
             sql.append(" ORDER BY sms_check_customer_info_become_due.create_time DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
@@ -469,7 +493,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             return sql.toString();
         }
 
-        public String selectListCheckPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo  ){
+        public String selectListCheckPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo ,String page ){
 
 
             StringBuilder sql = new StringBuilder();
@@ -529,12 +553,18 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                     " sms_check_customer_info   \n" +
                     " where 1=1 and  sms_check_customer_info.del_flag=0    ");
             if (StringUtils.isNotBlank(smsCheckCustomerInfo.getCustomerNo())){
-                sql.append(" and  sms_check_customer_info.customer_no  ='"+smsCheckCustomerInfo.getCustomerNo()+"' ");
+                sql.append(" and  sms_check_customer_info.customer_no  like '%"+smsCheckCustomerInfo.getCustomerNo()+"%' ");
             }
             if (StringUtils.isNotBlank(smsCheckCustomerInfo.getUserNo())){
-                sql.append(" and  sms_check_customer_info.user_no  ='"+smsCheckCustomerInfo.getUserNo()+"' ");
+                sql.append(" and  sms_check_customer_info.user_no  like  '%'"+smsCheckCustomerInfo.getUserNo()+"%' ");
             }
-            sql.append(" ORDER BY sms_check_customer_info.create_time DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
+            if (smsCheckCustomerInfo.getType()!=null){
+                sql.append(" and  sms_check_customer_info.type like  '%"+smsCheckCustomerInfo.getType()+"%'  ");
+            }
+            if (page.equals("page")){
+                sql.append(" ORDER BY sms_check_customer_info.create_time DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
+            }
+
             return sql.toString();
         }
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISmsCheckCustomerInfoService.java

@@ -39,15 +39,15 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
 
     Page<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, String username);
 
-    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyCheckListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo  );
+    Page<SmsCheckCustomerInfoBecomeDueAndInfo>  selectCompanyCheckListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo  );
 
     List<CheckTopVo>infoListTop();
 
     Map<String,Object>infoListTopTable();
 
-    List<Map<String,String>> selectHistoryListPage(Integer pageNo, Integer pageSize,  Map<String, String>  parameterMap );
+    Page<Map<String, String>> selectHistoryListPage(Integer pageNo, Integer pageSize,  Map<String, String>  parameterMap );
 
-    List<Map<String,String>> selectBillsListPage(Integer pageNo, Integer pageSize,  Map<String, String>  parameterMap );
+    Page<Map<String, String>> selectBillsListPage(Integer pageNo, Integer pageSize,  Map<String, String>  parameterMap );
 
     Map<Object,Object>  getTaskCount(  Map<String, String>  parameterMap);
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsCheckCustomerInfoServiceImpl.java

@@ -84,12 +84,18 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
     }
 
     @Override
-    public List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyCheckListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo ) {
-        LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>();
+    public  Page<SmsCheckCustomerInfoBecomeDueAndInfo>  selectCompanyCheckListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo ) {
+
+
+
+        List<SmsCheckCustomerInfoBecomeDueAndInfo> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectListCheckPage(pageNo, pageSize, smsCheckCustomerInfo ,"page");
+        List<SmsCheckCustomerInfoBecomeDueAndInfo>count= smsCheckCustomerInfoMapper.selectListCheckPage(pageNo, pageSize, smsCheckCustomerInfo ,"count");
+
+        Page<SmsCheckCustomerInfoBecomeDueAndInfo> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<SmsCheckCustomerInfoBecomeDueAndInfo>(pageNo, pageSize).setRecords(smsCustomerInfoGroupByCheckStates);
 
+         smsCheckCustomerInfoBecomeDueAndInfoPage.setTotal(count.size());
 
-        List<SmsCheckCustomerInfoBecomeDueAndInfo> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectListCheckPage(pageNo, pageSize, smsCheckCustomerInfo );
-        return smsCustomerInfoGroupByCheckStates;
+        return smsCheckCustomerInfoBecomeDueAndInfoPage;
     }
 
     @Override
@@ -190,16 +196,21 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
 
 
     @Override
-    public List<Map<String, String>> selectHistoryListPage(Integer pageNo, Integer pageSize, Map<String, String>  parameterMap) {
-        List<Map<String, String>> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectHistoryListPage(pageNo, pageSize, parameterMap);
+    public Page<Map<String, String>> selectHistoryListPage(Integer pageNo, Integer pageSize, Map<String, String>  parameterMap) {
+        List<Map<String, String>> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectHistoryListPage(pageNo, pageSize, parameterMap,"page");
+        Page<Map<String, String>> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<Map<String, String>>(pageNo, pageSize).setRecords(smsCustomerInfoGroupByCheckStates);
 
-        return smsCustomerInfoGroupByCheckStates;
+        List<Map<String, String>> count = smsCheckCustomerInfoMapper.selectHistoryListPage(pageNo, pageSize, parameterMap,"count");
+        smsCheckCustomerInfoBecomeDueAndInfoPage.setTotal(count.size());
+        return smsCheckCustomerInfoBecomeDueAndInfoPage;
     }
     @Override
-    public List<Map<String, String>> selectBillsListPage(Integer pageNo, Integer pageSize, Map<String, String>  parameterMap) {
-        List<Map<String, String>> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectBillsListPage(pageNo, pageSize, parameterMap);
-
-        return smsCustomerInfoGroupByCheckStates;
+    public Page<Map<String, String>> selectBillsListPage(Integer pageNo, Integer pageSize, Map<String, String>  parameterMap ) {
+        List<Map<String, String>> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectBillsListPage(pageNo, pageSize, parameterMap,"page");
+        List<Map<String, String>> total = smsCheckCustomerInfoMapper.selectBillsListPage(pageNo, pageSize, parameterMap,"count");
+        Page<Map<String, String>> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<Map<String, String>>(pageNo, pageSize).setRecords(smsCustomerInfoGroupByCheckStates);
+        smsCheckCustomerInfoBecomeDueAndInfoPage.setTotal(total.size());
+        return smsCheckCustomerInfoBecomeDueAndInfoPage;
     }
 
     @Override