优化

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

@@ -1631,6 +1631,15 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return Result.ok(hashMap);
     }
 
+    @GetMapping(value = "/status/countGroupCheck")
+    public Result<?> countGroupCheck( @RequestParam Map<String, String> parameterMap) {
+
+        Map<String, Integer>   hashMap = customerInfoService.countGroupCheck(  parameterMap);
+
+        return Result.ok(hashMap);
+    }
+
+
     @GetMapping(value = "/status/getWarningCountOrg")
     public Result<?> getWarningCountOrg( @RequestParam Map<String, String> parameterMap) {
 

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

@@ -191,7 +191,7 @@ public class SmsLotCustomerController extends JeecgController<SmsLotCustomerData
         BeanUtils.copyProperties(lotCheckLog,smsLotCheckCustomerDataLogBill);
         smsLotCheckCustomerDataLogBill.setId(null);
         smsLotCheckCustomerDataLogBill.setCreateDate(new Date());
-        iSmsLotCustomerDataLogBillService.save(smsLotCheckCustomerDataLogBill);
+
 
         boolean saveData = lotCustomerService.saveOrUpdate(lotCustomerData);
 
@@ -207,6 +207,7 @@ public class SmsLotCustomerController extends JeecgController<SmsLotCustomerData
                 if (mapByResult.isEmpty()){
                     smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_5);
                 }else {
+                    iSmsLotCustomerDataLogBillService.save(smsLotCheckCustomerDataLogBill);
                     smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
                 }
             }

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

@@ -251,7 +251,7 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
         BeanUtils.copyProperties(truckCheckLog,smsTruckCheckCustomerDataLogBill);
         smsTruckCheckCustomerDataLogBill.setId(null);
         smsTruckCheckCustomerDataLogBill.setCreateDate(new Date());
-        iSmsTrcukCustomerDataLogBillService.save(smsTruckCheckCustomerDataLogBill);
+
 
         boolean saveData = smsTruckCustomerDataService.saveOrUpdate(truckCustomerData);
 
@@ -268,6 +268,7 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
                 if (mapByResult.isEmpty()){
                     smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_5);
                 }else {
+                    iSmsTrcukCustomerDataLogBillService.save(smsTruckCheckCustomerDataLogBill);
                     smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
                 }
             }

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

@@ -89,6 +89,9 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class, method = "warningCountGroup")
     List<Map<String, String>> warningCountGroup(  Map<String, String> parameterMap );
 
+    @SelectProvider(type = ProviderClass.class, method = "countGroupCheck")
+    List<Map<String, String>> countGroupCheck(  Map<String, String> parameterMap );
+
     @SelectProvider(type = ProviderClass.class, method = "selectMapGroupJb")
     List<Map<String, Integer>> selectMapGroupJb(  Map<String, String> parameterMap );
     @SelectProvider(type = ProviderClass.class, method = "selectHistoryListPage")
@@ -122,7 +125,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
                     "LEFT JOIN  sms_check_task task  on  task.id=info.task_id where info.del_flag =0  \n" +
                     "UNION all \n" +
                     "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" +
+                    "(SELECT data_id,count(*) c from smc_special_check_log_history 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 =0   ) aa  where 1=1  ");
                     if (StringUtils.isNotBlank(parameterMap.get("customerNo"))){
@@ -194,10 +197,50 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
 
 
+        public String countGroupCheck(   Map<String, String>  parameterMap){
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" SELECT count(*) from sms_check_customer_info  info where 1=1 and info.del_flag=0  ");
+
+            if (StringUtils.isNotBlank(parameterMap.get("startDate"))){
+                sql.append(" and  info.create_time>='"+parameterMap.get("startDate")+"'  ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("endDate")))  {
+                sql.append(" and  info.create_time<='"+parameterMap.get("endDate")+"'  ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("taskType")))  {
+                sql.append(" and  info.type ="+parameterMap.get("taskType")+"  ");
+            }
+            sql.append(" union all  ");
+
+
+            sql.append(" select count(*) from (\n" +
+                    "SELECT create_date,info.type,info.del_flag from sms_check_customer_data_log_bill bill left join sms_check_customer_info  info on bill.info_id=info.id  \n" +
+                    " \n" +
+                    "UNION all \n" +
+                    "SELECT create_date,info.type,info.del_flag from sms_lot_customer_data_log_bill bill left join sms_check_customer_info  info on bill.info_id=info.id  \n" +
+                    "  \n" +
+                    "UNION all \n" +
+                    "SELECT create_date,info.type,info.del_flag from sms_truck_customer_data_log_bill bill left join sms_check_customer_info  info on bill.info_id=info.id \n" +
+                    "UNION ALL\n" +
+                    "SELECT bill.create_time create_date,info.type,info.del_flag from  smc_special_check_log_history bill left join sms_check_customer_info  info on bill.info_id=info.id \n" +
+                    ") aa  where 1=1  and aa.del_flag=0  ");
+
+            if (StringUtils.isNotBlank(parameterMap.get("startDate"))){
+                sql.append(" and  aa.create_date>='"+parameterMap.get("startDate")+"'  ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("endDate")))  {
+                sql.append(" and  aa.create_date<='"+parameterMap.get("endDate")+"'  ");
+            }
+            if (StringUtils.isNotBlank(parameterMap.get("taskType")))  {
+                sql.append(" and  aa.type ="+parameterMap.get("taskType")+"  ");
+            }
+            return sql.toString();
+        }
         public String warningCountGroup(   Map<String, String>  parameterMap){
             StringBuilder sql = new StringBuilder();
 
-            sql.append(" SELECT count(*) from sms_check_customer_info_become_due  due where 1=1  ");
+            sql.append(" SELECT count(*) from sms_check_customer_info_become_due  due where 1=1 and due.del_flag=0 ");
 
             if (StringUtils.isNotBlank(parameterMap.get("startDate"))){
                 sql.append(" and  due.create_time>='"+parameterMap.get("startDate")+"'  ");
@@ -302,7 +345,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             if (StringUtils.isNotBlank(parameterMap.get("taskType")))  {
                 sql.append(" and  task.type ="+parameterMap.get("taskType")+"  ");
             }
-                sql.append(" ) a   GROUP BY a.update_field  HAVING a.update_field like '%资料%'   ");
+                sql.append(" ) a   GROUP BY a.update_field  HAVING a.update_field like '%资料%' or  a.update_field like '%备注%'  ");
             return sql.toString();
         }
         public String selectMapGroupJb(   Map<String, String>  parameterMap){
@@ -321,7 +364,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             if (StringUtils.isNotBlank(parameterMap.get("taskType")))  {
                 sql.append(" and  task.type ="+parameterMap.get("taskType")+"  ");
             }
-            sql.append(" ) a   GROUP BY a.update_field  HAVING a.update_field not like '%资料%'   ");
+            sql.append(" ) a   GROUP BY a.update_field  HAVING a.update_field not like '%资料%' and  a.update_field not like '%备注%'  ");
             return sql.toString();
         }
 

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

@@ -58,6 +58,8 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
 
     Map<String, Integer>  warningCountGroup(  Map<String, String>  parameterMap);
 
+    Map<String, Integer>  countGroupCheck(  Map<String, String>  parameterMap);
+
     Map<Object,Object>  getWarningCountOrg(  Map<String, String>  parameterMap);
 
     List<Map<String, Integer>>  selectMapGroup(  Map<String, String>  parameterMap);

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

@@ -293,6 +293,20 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
         return map;
     }
 
+
+    @Override
+    public Map<String, Integer> countGroupCheck(Map<String, String> parameterMap) {
+
+        Map<String, Integer> map =new HashMap<>();
+
+        List<Map<String, String>> maps = smsCheckCustomerInfoMapper.countGroupCheck(parameterMap);
+
+        map.put("his",Integer.parseInt(String.valueOf(maps.get(1).get("count(*)"))));
+        map.put("sum",Integer.parseInt(String.valueOf(maps.get(0).get("count(*)")))-Integer.parseInt(String.valueOf((maps.get(1).get("count(*)")))));
+
+        return map;
+    }
+
         @Override
     public Map<Object, Object> getWarningCount(Map<String, String> parameterMap) {
         List<Map<String, Integer>> maps = smsCheckCustomerInfoMapper.getWarningFiled( parameterMap);