报表

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

@@ -1758,11 +1758,47 @@ 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.selectCompanyListPage(pageNo, pageSize, smsCheckCustomerInfo,sysPermissionDataRuleModel,  username);
+        Page<SmsCheckCustomerInfoBecomeDueAndInfo> smsCheckCustomerInfoBecomeDueAndInfoPage= customerInfoService.selectCompanyListPage(pageNo, pageSize, smsCheckCustomerInfo,sysPermissionDataRuleModel,  username);
+
+
+        return Result.ok(smsCheckCustomerInfoBecomeDueAndInfoPage);
+    }
+
+
+    @ApiOperation(value = "客户信息-分页列表查询", notes = "客户信息-分页列表查询")
+    @GetMapping(value = "/warningPageList")
+    @PermissionData(pageComponent = "warningList/TaskCheckList")
+    public Result<IPage<SmsCheckCustomerInfoBecomeDueAndInfo>> TaskCheckPageList(SmsCheckCustomerInfo smsCheckCustomerInfo,
+                                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+//        String username = JwtUtil.getUserNameByToken(request);
+//        List<SysPermissionDataRuleModel> dataRules
+//                = commonApi.queryPermissionDataRule("warningList/TaskCheckList", "/smsCheck/customerInfo/warningList", username);
+//        SysPermissionDataRuleModel sysPermissionDataRuleModel = dataRules.get(0);
+
+        smsCheckCustomerInfo.setCustomerNo(smsCheckCustomerInfo.getCustomerNo() == null ? "" : smsCheckCustomerInfo.getCustomerNo().replace("*", ""));
+        smsCheckCustomerInfo.setUserNo(smsCheckCustomerInfo.getUserNo() == null ? "" : smsCheckCustomerInfo.getUserNo().replace("*", ""));
+        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);
     }
 
+    @GetMapping(value = "/infoListTopTable")
+    public   Result<Map<String,Object>>  infoListTopTable(HttpServletRequest request) {
+        Map<String,Object> stringListMap = customerInfoService.infoListTopTable();
+        return Result.OK(stringListMap);
+    }
+
+
+    @GetMapping(value = "/infoListTop")
+    public   Result<SmsCheckCustomerInfoBecomeDue>  warningById(HttpServletRequest request) {
+        List<CheckTopVo> checkTopVos = customerInfoService.infoListTop();
+        return Result.ok(checkTopVos);
+    }
+
 
     @ApiOperation(value = "预警信息", notes = "预警信息")
     @GetMapping(value = "/warningById")

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

@@ -143,7 +143,9 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
         map.put("taskId",byId.getTaskId());
         map.put("history",list);
         map.put("staffName",byId.getStaffName());
-
+        if (map.get("commitment")==null|| map.get("commitment").equals("[{}]")||map.get("commitment").equals("") ){
+            map.put("commitmentInfo","0");
+        }
         return Result.OK(map);
     }
 

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

@@ -0,0 +1,26 @@
+package org.jeecg.modules.smscheck.entity;
+
+import lombok.Data;
+
+@Data
+public class CheckTopVo {
+
+    private Integer type;
+
+    private String staffNo;
+
+    private Integer c;
+
+    private Integer staffCount;
+
+    private Integer typeCount;
+
+    private Integer shortCount;
+
+    private Integer lotCount;
+
+    private Integer truckCount;
+
+    private Integer specialCount;
+
+}

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

@@ -53,6 +53,22 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class, method = "selectListPage")
     List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, SysUser sysUser );
 
+    @SelectProvider(type = ProviderClass.class, method = "selectListPageCount")
+    Integer selectListPageCount(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, SysUser sysUser );
+
+
+    @SelectProvider(type = ProviderClass.class, method = "selectListCheckPage")
+    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectListCheckPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo );
+
+    @SelectProvider(type = ProviderClass.class, method = "selectGroupByStaffNo")
+    List<CheckTopVo> selectGroupByStaffNo();
+
+
+    @SelectProvider(type = ProviderClass.class, method = "infoListTopTable")
+    List<Map<String,String>> infoListTopTable();
+
+    @SelectProvider(type = ProviderClass.class, method = "selectGroupByStaffNoAndType")
+    List<CheckTopVo> selectGroupByStaffNoAndType();
 
     @SelectProvider(type = ProviderClass.class, method = "selectMapGroup")
     List<Map<String, Integer>> selectMapGroup(  Map<String, String> parameterMap );
@@ -380,6 +396,144 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
             return sql.toString();
         }
 
+        public String selectListPageCount(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo,SysPermissionDataRuleModel sysPermissionDataRuleModel,  SysUser sysUser ){
+
+
+            StringBuilder sql = new StringBuilder();
+
+            sql.append("SELECT    count(*)   from sms_check_customer_info_become_due   \n" +
+                    "LEFT JOIN sms_check_customer_info   on sms_check_customer_info_become_due.info_id = sms_check_customer_info.id \n" +
+                    " where 1=1 and  sms_check_customer_info_become_due.del_flag=0    ");
+            if (StringUtils.isNotBlank(smsCheckCustomerInfo.getCustomerNo())){
+                sql.append(" and  sms_check_customer_info.customer_no  ='"+smsCheckCustomerInfo.getCustomerNo()+"' ");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerInfo.getUserNo())){
+                sql.append(" and  sms_check_customer_info.user_no  ='"+smsCheckCustomerInfo.getUserNo()+"' ");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerInfo.getStaffNo())){
+                sql.append(" and  sms_check_customer_info_become_due.staff_no  ='"+smsCheckCustomerInfo.getStaffNo()+"' ");
+            }
+            if (smsCheckCustomerInfo.getCheckState()!=null){
+                sql.append(" and  sms_check_customer_info_become_due.check_state  ="+smsCheckCustomerInfo.getCheckState()+" ");
+            }
+            if (smsCheckCustomerInfo.getType()!=null){
+                sql.append(" and  sms_check_customer_info_become_due.type  ="+smsCheckCustomerInfo.getType()+" ");
+            }
+            if (sysPermissionDataRuleModel!=null && StringUtils.isNotBlank(sysPermissionDataRuleModel.getRuleName())){
+                if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerOrg")){
+                    sql.append("and sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"%'");
+                }
+                if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerCreateBy")){
+                    sql.append("and sms_check_customer_info_become_due.staff_no like  '"+sysUser.getUsername() +"'");
+                }
+                if (sysPermissionDataRuleModel.getRuleName().equals("sysPowerThisOrg")){
+                    sql.append("and sms_check_customer_info_become_due.sys_org_code like  '"+sysUser.getOrgCode() +"'");
+                }
+            }
+            return sql.toString();
+        }
+
+
+        public String infoListTopTable(){
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" select dep.depart_name,CONCAT(info.type) type,CAST(count(*) AS CHAR)   cc \n" +
+                    "from \n" +
+                    "(select * from  sms_check_customer_info   )info\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_depart dep  on dep.id = ud.dep_id\n" +
+                    "group by dep.depart_name,info.type  order by type   ");
+
+            return sql.toString();
+        }
+
+
+        public String selectGroupByStaffNo(){
+
+            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 ");
+
+            return sql.toString();
+        }
+        public String selectGroupByStaffNoAndType(){
+
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" select  staff_no,type,count(*) c from sms_check_customer_info GROUP BY staff_no,type   ");
+
+            return sql.toString();
+        }
+
+        public String selectListCheckPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo  ){
+
+
+            StringBuilder sql = new StringBuilder();
+
+            sql.append("SELECT  sms_check_customer_info.`type`, "+
+                    "sms_check_customer_info.`customer_no`,\n" +
+                    "sms_check_customer_info.`customer_name`,\n" +
+                    "sms_check_customer_info.`sms_number`,\n" +
+                    "sms_check_customer_info.`user_no`,\n" +
+                    "sms_check_customer_info.`network_access_time`,\n" +
+                    "sms_check_customer_info.`user_state`,\n" +
+                    "sms_check_customer_info.`staff_info`,\n" +
+                    "sms_check_customer_info.`staff_id`,\n" +
+                    "sms_check_customer_info.`staff_username`,\n" +
+                    "sms_check_customer_info.`staff_name`,\n" +
+                    "sms_check_customer_info.`staff_no`,\n" +
+                    "sms_check_customer_info.`staff_dept_level2`,\n" +
+                    "sms_check_customer_info.`staff_dept_level2_name`,\n" +
+                    "sms_check_customer_info.`staff_dept_level2_no`,\n" +
+                    "sms_check_customer_info.`staff_dept_level3`,\n" +
+                    "sms_check_customer_info.`staff_dept_level3_name`,\n" +
+                    "sms_check_customer_info.`staff_dept_level3_no`,\n" +
+                    "sms_check_customer_info.`staff_dept_level4_name`,\n" +
+                    "sms_check_customer_info.`user_open_state`,\n" +
+                    "sms_check_customer_info.`sms_number_prefix`,\n" +
+                    "sms_check_customer_info.`sms_number_usage`,\n" +
+                    "sms_check_customer_info.`account_manager`,\n" +
+                    "sms_check_customer_info.`account_manager_phone`,\n" +
+                    "sms_check_customer_info.`customer_contacts`,\n" +
+                    "sms_check_customer_info.`customer_contacts_phone`,\n" +
+                    "sms_check_customer_info.`contract_expire_time`,\n" +
+                    "sms_check_customer_info.`sms_number_certificate_expire_time`,\n" +
+                    "sms_check_customer_info.`record_notice_expire_time`,\n" +
+                    "sms_check_customer_info.`value_added_licence_expire_time`,\n" +
+                    "sms_check_customer_info.`business_licence_expire_time`,\n" +
+                    "sms_check_customer_info.`contract_open_customer_same`,\n" +
+                    "sms_check_customer_info.`group_price_approval`,\n" +
+                    "sms_check_customer_info.`data_complete`,\n" +
+                    "sms_check_customer_info.`rectify_reform_over`,\n" +
+                    "sms_check_customer_info.`check_state`,\n" +
+                    "sms_check_customer_info.`description`,\n" +
+                    "sms_check_customer_info.`sys_org_code`,\n" +
+                    "sms_check_customer_info.`shutdown_label`,\n" +
+                    "sms_check_customer_info.`shutdown_label_other`,\n" +
+                    "sms_check_customer_info.`shutdown_label_date`,\n" +
+                    "sms_check_customer_info.`submit_special_date`,\n" +
+                    "sms_check_customer_info.`reopen_time`,\n" +
+                    "sms_check_customer_info.`material_label`,\n" +
+                    "sms_check_customer_info.`name_find_compliance`,\n" +
+                    "sms_check_customer_info.`data_id`,\n" +
+                    "sms_check_customer_info.`data_log_id`,\n" +
+                    "sms_check_customer_info.`first_activation_date`,\n" +
+                    "sms_check_customer_info.`account_code`,\n" +
+                    "sms_check_customer_info.`floor_name`,\n" +
+                    "sms_check_customer_info.`floor_code`,\n" +
+                    "sms_check_customer_info.`notes`   from     \n" +
+                    " 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()+"' ");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerInfo.getUserNo())){
+                sql.append(" and  sms_check_customer_info.user_no  ='"+smsCheckCustomerInfo.getUserNo()+"' ");
+            }
+            sql.append(" ORDER BY sms_check_customer_info.create_time DESC  LIMIT " + (pageNo - 1) * pageSize + "," + pageSize);
+            return sql.toString();
+        }
 
         public String selectSysDepartModel(){
 

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.smscheck.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.system.vo.SysDepartModel;
 import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
@@ -36,7 +37,13 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
     List<SysDepartModel> getSysDepartModel();
 
 
-    List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, String username);
+    Page<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo, SysPermissionDataRuleModel sysPermissionDataRuleModel, String username);
+
+    List<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 );
 

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.smscheck.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.checkerframework.checker.units.qual.A;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.SysDepartModel;
@@ -16,9 +17,9 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @description 客户信息
@@ -66,16 +67,128 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
     }
 
     @Override
-    public List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo , SysPermissionDataRuleModel sysPermissionDataRuleModel, String username) {
+    public  Page<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo , SysPermissionDataRuleModel sysPermissionDataRuleModel, String username) {
         LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>();
         query.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).eq(SysUser::getUsername,  username);
         List<SysUser> list = service.list(query);
         SysUser sysUser = list.get(0);
 
         List<SmsCheckCustomerInfoBecomeDueAndInfo> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectListPage(pageNo, pageSize, smsCheckCustomerInfo,sysPermissionDataRuleModel,sysUser);
+
+        Integer i = smsCheckCustomerInfoMapper.selectListPageCount(pageNo, pageSize, smsCheckCustomerInfo, sysPermissionDataRuleModel, sysUser);
+        Page<SmsCheckCustomerInfoBecomeDueAndInfo> smsCheckCustomerInfoBecomeDueAndInfoPage = new Page<SmsCheckCustomerInfoBecomeDueAndInfo>(pageNo, pageSize).setRecords(smsCustomerInfoGroupByCheckStates);
+
+        smsCheckCustomerInfoBecomeDueAndInfoPage.setTotal(i);
+
+        return smsCheckCustomerInfoBecomeDueAndInfoPage;
+    }
+
+    @Override
+    public List<SmsCheckCustomerInfoBecomeDueAndInfo> selectCompanyCheckListPage(Integer pageNo, Integer pageSize, SmsCheckCustomerInfo smsCheckCustomerInfo ) {
+        LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>();
+
+
+        List<SmsCheckCustomerInfoBecomeDueAndInfo> smsCustomerInfoGroupByCheckStates = smsCheckCustomerInfoMapper.selectListCheckPage(pageNo, pageSize, smsCheckCustomerInfo );
         return smsCustomerInfoGroupByCheckStates;
     }
 
+    @Override
+    public List<CheckTopVo> infoListTop() {
+
+        List<CheckTopVo> groupByStaffNo = smsCheckCustomerInfoMapper.selectGroupByStaffNo();
+
+        List<CheckTopVo> groupByStaffNoAndType = smsCheckCustomerInfoMapper.selectGroupByStaffNoAndType();
+
+        List<CheckTopVo> res =new ArrayList<>();
+        //客户信息所属类型：1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核'
+        for (CheckTopVo checkTopVo : groupByStaffNo) {
+            CheckTopVo checkTopVo1 = new CheckTopVo();
+            for (CheckTopVo topVo : groupByStaffNoAndType) {
+                if (checkTopVo.getStaffNo().equals(topVo.getStaffNo())){
+                    if (topVo.getType()==1){
+                        checkTopVo1.setC(checkTopVo.getC());
+                        checkTopVo1.setStaffNo(checkTopVo.getStaffNo());
+                        checkTopVo1.setType(1);
+                        checkTopVo1.setShortCount(topVo.getC());
+                    }
+                    if (topVo.getType()==2){
+                        checkTopVo1.setC(checkTopVo.getC());
+                        checkTopVo1.setStaffNo(checkTopVo.getStaffNo());
+                        checkTopVo1.setType(2);
+                        checkTopVo1.setLotCount(topVo.getC());
+                    }
+                    if (topVo.getType()==3){
+                        checkTopVo1.setC(checkTopVo.getC());
+                        checkTopVo1.setStaffNo(checkTopVo.getStaffNo());
+                        checkTopVo1.setType(3);
+                        checkTopVo1.setSpecialCount(topVo.getC());
+                    }
+                    if (topVo.getType()==4){
+                        checkTopVo1.setC(checkTopVo.getC());
+                        checkTopVo1.setStaffNo(checkTopVo.getStaffNo());
+                        checkTopVo1.setType(4);
+                        checkTopVo1.setTruckCount(topVo.getC());
+                    }
+                }
+            }
+            res.add(checkTopVo1);
+        }
+        return res;
+    }
+
+    @Override
+    public Map<String,Object> infoListTopTable() {
+
+        List<Map<String, String>> maps = smsCheckCustomerInfoMapper.infoListTopTable();
+
+        Map<String, Map<String, String>> collect = maps.stream().collect(Collectors.toMap(v -> v.get("depart_name") + "-" + v.get("type"), Function.identity(), (o, n) -> o));
+
+        Map<String,Object> mapResult =new HashMap<>();
+
+        List<String>  shortMap = new ArrayList<>();
+
+         List<String>  lotMap = new ArrayList<>();
+
+         List<String>  truckMap = new ArrayList<>();
+
+        List<String>  speMap = new ArrayList<>();
+        
+        Set<String> dep =new HashSet<>();
+        for (Map<String, String> map : maps) {
+            dep.add(map.get("depart_name"));
+        }
+        
+        for (String s : dep) {
+            if ( collect.get(s+ "-1")!=null){
+                shortMap.add(collect.get(s+ "-1").get("cc"));
+            }else {
+                shortMap.add("0");
+            }
+            if ( collect.get(s+ "-2")!=null){
+                lotMap.add(collect.get(s+ "-2").get("cc"));
+            }else {
+                lotMap.add("0");
+            }
+            if ( collect.get(s+ "-3")!=null){
+                speMap.add(collect.get(s+ "-3").get("cc"));
+            }else {
+                speMap.add("0");
+            }
+            if ( collect.get(s+ "-4")!=null){
+                truckMap.add(collect.get(s+ "-4").get("cc"));
+            }else {
+                truckMap.add("0");
+            }
+        }
+        mapResult.put("short",shortMap);
+        mapResult.put("lot",lotMap);
+        mapResult.put("truck",truckMap);
+        mapResult.put("spe",speMap);
+        mapResult.put("name",dep);
+        return mapResult;
+    }
+
+
     @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);