1.预警分析相关

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

@@ -161,7 +161,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 
     @AutoLog(value = "客户信息-编辑")
     @ApiOperation(value = "客户信息-编辑", notes = "客户信息-编辑")
-    @RequestMapping(value = "/edit/", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
         customerInfoService.updateById(smsCheckCustomerInfo);
         return Result.OK("编辑成功!");
@@ -418,4 +418,14 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         List<SmsCheckTaskVo> smsCheckTaskVos = smsCheckCustomerInfoService.checkInfoWarningCountStaff(smsCheckCustomerInfo);
         return Result.ok(smsCheckTaskVos);
     }
+
+    @GetMapping(value = "/warning/list")
+    public Result<IPage<SmsCheckCustomerInfo>> queryWarningPageList(SmsCheckCustomerInfo smsCheckCustomerInfo,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest request) {
+        List<SmsCheckCustomerInfoVo> smsCheckCustomerInfoVos = smsCheckCustomerInfoService.checkInfoWarningPageList(pageNo,pageSize);
+        return Result.ok(smsCheckCustomerInfoVos);
+    }
+
  }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerInfoVo.java

@@ -11,4 +11,9 @@ public class SmsCheckCustomerInfoVo {
     private Integer checkState1;
     private Integer checkState4;
     private List<SmsCheckTaskVo> list;
+
+
+    private String taskEndTime;
+    private String taskName;
+
 }

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

@@ -26,6 +26,9 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class,method = "checkInfoWarningCountStaff")
     List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
+    @SelectProvider(type = ProviderClass.class,method = "checkInfoWarningCountStaff")
+    List<SmsCheckCustomerInfoVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
+
     class ProviderClass{
         public String checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo){
             StringBuilder sql = new StringBuilder();
@@ -49,9 +52,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             sql.append(" FROM sms_check_customer_info scci");
             sql.append(" LEFT JOIN sms_check_task sct ON sct.id = scci.task_id");
             sql.append(" WHERE NOW() > sct.task_end_time");
-            if (smsCheckCustomerInfo.getCheckState() != null){
-                sql.append(" AND scci.check_state = " + smsCheckCustomerInfo.getCheckState());
-            }
+            sql.append(" AND scci.check_state IN (0,1,4)");
             if(StringUtils.isNotBlank(smsCheckCustomerInfo.getStaffNo())){
                 sql.append(" AND scci.staff_no = '" + smsCheckCustomerInfo.getStaffNo() + "'");
             }
@@ -61,7 +62,6 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             return sql.toString();
         }
 
-
         public String checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo){
             StringBuilder sql = new StringBuilder();
             sql.append(" SELECT COUNT(1) count,scci.staff_info staffInfo");
@@ -71,6 +71,19 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             sql.append(" AND scci.check_state IN (0,1,4)");
             sql.append(" GROUP BY scci.staff_info");
             return sql.toString();
+        }
+
+        private String checkInfoWarningCountStaff(Integer pageNo, Integer pageSize){
+            StringBuilder sql = new StringBuilder();
+            sql.append("SELECT sct.task_name taskName,sct.task_end_time taskEndTime," +
+                    "scci.customer_no customerNo,scci.customer_name customerName," +
+                    "scci.staff_info staffInfo,scci.user_open_state userOpenState scci.check_state checkState ");
+            sql.append(" FROM sms_check_customer_info scci");
+            sql.append(" LEFT JOIN sms_check_task sct ON sct.id=scci.task_id ");
+            sql.append(" WHERE NOW()> sct.task_end_time");
+            sql.append(" AND scci.check_state IN (0,1,4)");
+            sql.append(" LIMIT "+ (pageNo-1)*pageSize + ","+pageSize);
+            return sql.toString();
 
         }
 

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

@@ -20,4 +20,6 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
     List<SmsCheckTaskVo> checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
     List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo);
+
+    List<SmsCheckCustomerInfoVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
 }

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

@@ -36,4 +36,9 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
     public List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo) {
         return smsCheckCustomerInfoMapper.checkInfoWarningCountStaff(smsCheckCustomerInfo);
     }
+
+    @Override
+    public List<SmsCheckCustomerInfoVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize) {
+        return smsCheckCustomerInfoMapper.checkInfoWarningPageList(pageNo,pageSize);
+    }
 }