|
@@ -466,7 +466,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
|
|
|
|
|
|
|
|
sql.append(" select dep.depart_name,CONCAT(info.type) type,CAST(count(*) AS CHAR) cc \n" +
|
|
sql.append(" select dep.depart_name,CONCAT(info.type) type,CAST(count(*) AS CHAR) cc \n" +
|
|
|
"from \n" +
|
|
"from \n" +
|
|
|
- "(select * from sms_check_customer_info )info\n" +
|
|
|
|
|
|
|
+ "(select * from sms_check_customer_info where sms_check_customer_info.del_flag=0 )info\n" +
|
|
|
"LEFT JOIN sys_user user on user.username=info.staff_no\n" +
|
|
"LEFT JOIN sys_user user on user.username=info.staff_no\n" +
|
|
|
"LEFT JOIN sys_user_depart ud on ud.user_id =user.id\n" +
|
|
"LEFT JOIN sys_user_depart ud on ud.user_id =user.id\n" +
|
|
|
"LEFT JOIN sys_depart dep on dep.id = ud.dep_id\n" +
|
|
"LEFT JOIN sys_depart dep on dep.id = ud.dep_id\n" +
|
|
@@ -480,7 +480,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
|
|
|
|
|
|
|
|
StringBuilder sql = new StringBuilder();
|
|
StringBuilder sql = new StringBuilder();
|
|
|
|
|
|
|
|
- sql.append(" select staff_no,count(*) c from sms_check_customer_info GROUP BY staff_no ORDER BY c limit 0,10 ");
|
|
|
|
|
|
|
+ sql.append(" select staff_no,count(*) c from sms_check_customer_info where sms_check_customer_info.del_flag =0 GROUP BY staff_no ORDER BY c limit 0,10 ");
|
|
|
|
|
|
|
|
return sql.toString();
|
|
return sql.toString();
|
|
|
}
|
|
}
|
|
@@ -488,7 +488,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
|
|
|
|
|
|
|
|
StringBuilder sql = new StringBuilder();
|
|
StringBuilder sql = new StringBuilder();
|
|
|
|
|
|
|
|
- sql.append(" select staff_no,type,count(*) c from sms_check_customer_info GROUP BY staff_no,type ");
|
|
|
|
|
|
|
+ sql.append(" select staff_no,type,count(*) c from sms_check_customer_info where sms_check_customer_info.del_flag =0 GROUP BY staff_no,type ");
|
|
|
|
|
|
|
|
return sql.toString();
|
|
return sql.toString();
|
|
|
}
|
|
}
|
|
@@ -582,10 +582,10 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
|
|
|
StringBuilder sql = new StringBuilder();
|
|
StringBuilder sql = new StringBuilder();
|
|
|
|
|
|
|
|
sql.append("SELECT COUNT(*) as count ,check_state as checkState " +
|
|
sql.append("SELECT COUNT(*) as count ,check_state as checkState " +
|
|
|
- "from sms_check_customer_info LEFT JOIN sms_check_task on sms_check_task.id =sms_check_customer_info.task_id ");
|
|
|
|
|
|
|
+ "from sms_check_customer_info LEFT JOIN sms_check_task on sms_check_task.id =sms_check_customer_info.task_id WHERE sms_check_customer_info.del_flag =0 ");
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
|
|
if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
|
|
|
- sql.append(" WHERE sms_check_customer_info.create_time >= '" + startDate + "'");
|
|
|
|
|
|
|
+ sql.append(" and sms_check_customer_info.create_time >= '" + startDate + "'");
|
|
|
sql.append(" and sms_check_customer_info.create_time <= '" + endDate + "'");
|
|
sql.append(" and sms_check_customer_info.create_time <= '" + endDate + "'");
|
|
|
|
|
|
|
|
}
|
|
}
|