Merge remote-tracking branch 'origin/master'

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

@@ -189,6 +189,84 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         return Result.OK(pageList);
     }
 
+
+    @ApiOperation(value = "入网信息业务-分页列表查询不脱敏", notes = "入网信息业务-分页列表查询")
+    @GetMapping(value = "/listAll")
+    @PermissionData(pageComponent = "networkAccess/userStatistics")
+    public Result<IPage<BusinessReminderCard>> queryPageListAll(BusinessReminderCard businessReminderCard,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest request) {
+        String sql = QueryGenerator.installAuthJdbc(BusinessReminderCard.class);
+        String businessAddress = request.getParameterMap().get("businessAddress")==null?"":
+                Arrays.toString(request.getParameterMap().get("businessAddress")).replace("[", "").replace("]", "").replace("*", "");
+        String upTimeStart = request.getParameterMap().get("upTimeStart")==null?"":Arrays.toString(request.getParameterMap().get("upTimeStart")).replace("[", "").replace("]", "").replace("*", "");
+        String upTimeEnd = request.getParameterMap().get("upTimeEnd")==null?"":Arrays.toString(request.getParameterMap().get("upTimeEnd")).replace("[", "").replace("]", "").replace("*", "");
+        businessReminderCard.setDelFlag( CommonConstant.DEL_FLAG_0);
+        String numberResults_MultiString = request.getParameterMap().get("numberResults_MultiString")==null?"":
+                Arrays.toString(request.getParameterMap().get("numberResults_MultiString")).replace("[", "").replace("]", "").replace("*", "");
+        List<String> numberResults = request.getParameterMap().get("numberResults[]")==null?new ArrayList<>():  new ArrayList<>(Arrays.asList(request.getParameterMap().get("numberResults[]")));
+        businessReminderCard.setNumberResults(null);
+        businessReminderCard.setSysBusinessHall(null);
+        String createDateStart = request.getParameterMap().get("createDateStart")==null?"":
+                Arrays.toString(request.getParameterMap().get("createDateStart")).replace("[", "").replace("]", "").replace("*", "");
+        String createDateEnd = request.getParameterMap().get("createDateEnd")==null?"":
+                Arrays.toString(request.getParameterMap().get("createDateEnd")).replace("[", "").replace("]", "").replace("*", "");
+
+
+        QueryWrapper<BusinessReminderCard> queryWrapper = QueryGenerator.initQueryWrapper(businessReminderCard, null);
+        queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0);
+
+        if (StringUtils.isNotBlank(createDateStart) && StringUtils.isNotBlank(createDateEnd) ){
+            queryWrapper.between("create_time",createDateStart,createDateEnd);
+        }
+        if (StringUtils.isNotBlank(createDateStart) && StringUtils.isBlank(createDateEnd) ){
+            queryWrapper.ge("create_time",createDateStart);
+        }
+        if ( StringUtils.isNotBlank(createDateEnd) && StringUtils.isBlank(createDateStart)){
+            queryWrapper.le("create_time",createDateEnd);
+        }
+        if (StringUtils.isNotBlank(numberResults_MultiString)){
+            queryWrapper.like("number_results",numberResults_MultiString);
+        }
+        if (numberResults.size()!=0){
+            List<Integer> collect = numberResults.stream().map(Integer::valueOf)
+                    .collect(Collectors.toList());
+            if (collect.contains(3)){
+                collect.add(4);
+            }
+            queryWrapper.in("number_results",collect);
+        }
+        queryWrapper.orderByDesc("create_time");
+        Page<BusinessReminderCard> page = new Page<>(pageNo, pageSize);
+        IPage<BusinessReminderCard> pageList = businessReminderCardService.page(page, queryWrapper);
+        List<Map<String, String>> orgName = businessReminderCardService.getOrgName();
+        Map<String, Map<String, String>> orgCode = orgName.stream().collect(Collectors.toMap(v -> v.get("orgCode"), Function.identity(), (o, n) -> o));
+        List<BusinessReminderCard> records = pageList.getRecords();
+
+        for (BusinessReminderCard record : records) {
+            Map<String, String> stringStringMap = orgCode.get(record.getSysOrgCode().substring(0, 3));
+            Map<String, String> stringString = orgCode.get(record.getSysOrgCode());
+            // 0 当前处理部门     1 一上报分公司   2 已完成
+            if (record.getStatus()!=null && record.getStatus().equals("0")){
+                record.setCurrentDept(stringString.get("departName"));
+            }else if (record.getStatus()!=null && record.getStatus().equals("1")){
+                record.setCurrentDept("已上报"+stringStringMap.get("departName"));
+            }else if (record.getStatus()!=null && record.getStatus().equals("2")){
+                record.setCurrentDept("已完成");
+            }
+            record.setCardNo(record.getCardNo()+"all");
+            record.setNewPhone(record.getNewPhone()+"all");
+            record.setCardName(record.getCardName()+"all");
+            record.setPhone(record.getPhone()+"all");
+        }
+
+
+        return Result.OK(pageList);
+    }
+
+
+
     @ApiOperation(value = "入网信息业务-分页列表查询", notes = "入网信息业务-分页列表查询")
     @GetMapping(value = "/delete/list")
     public Result<IPage<BusinessReminderCard>> queryPageDeleteList(BusinessReminderCard businessReminderCard,

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

@@ -216,6 +216,6 @@ public class BusinessReminderCardVo {
     @Excel(name = "上报状态", width = 15)
     private String upStatus;
 
-
+    private String currentDept;
 
 }

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

@@ -158,22 +158,44 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
         public String selectCustomerList(BusinessReminderCard businessReminderCard){
             StringBuilder sql = new StringBuilder();
-            sql.append("SELECT t1.* FROM as_business_reminder_card t1 INNER JOIN \n" +
-                    "(SELECT MIN(id) AS min_id FROM as_business_reminder_card GROUP BY card_no)t2 ON \n" +
-                    "t1.id=t2.min_id ");
+            //取最新的  并合并某个字段
+            sql.append("SELECT\n" +
+                    "\t`id`,t1. `address`,t1. `phone`,t1. `calltest_results`,t1. `id_card_address`,t1. `current_address`,\n" +
+                    "         `operator`,t1. `operator_type`,t1. `operator_type_note`,t1. `use_life`,t1. `phone_purpose`,\n" +
+                    "         `is_dx_number`,t1. `is_dx_number_note`,t1. `is_broadband`,t1. `is_broadband_note`,\n" +
+                    "         `is_use_to`,t1. `is_use_to_note`,t1. `is_refund`,t1. `is_refund_note`,t1. `is_shut_down`,\n" +
+                    "         `is_shut_down_note`,t1. `is_newly`,t1. `is_newly_note`,t1. `is_channel`,t1. `is_channel_note`,\n" +
+                    "         `is_involving_fraud`,t1. `is_involving_fraud_note`,t1. `number_results`,t1. `del_flag`,\n" +
+                    "         `create_by`,t1. `create_time`,t1. `update_by`,t1. `update_time`,t1. `sys_org_Code`,t1. `card_no`,\n" +
+                    "         `card_start_time`,t1. `card_end_time`,t1. `card_name`,t1. `business_address`,t1. `word_address`,\n" +
+                    "         `position_information`,t1. `is_size_number_results`,t1. `industry`,t1. `company`,\n" +
+                    "         `sys_business_hall`,t1. `judgment_research`,t1. `yidong`,t1. `dianxin`,t1. `liantong`,t1. `qita`,\n" +
+                    "         `new_business_address`,t1. `card_start_time_and_end`,t1. `staff_no`,t1. `judgment_research_address`,\n" +
+                    "         `status`,t1. `user_id`,t1. `direct_requirements`,t1. `pass_one`,t1. `non_conformance`,t1. `direct_requirements_node`,\n" +
+                    "         `non_conformance_node`,t1. `pass_one_node`,t1. `age`,t1. `up_time`,t1. `current_dept` ,t3.new_phone\n" +
+                    "FROM\n" +
+                    "\tas_business_reminder_card t1\n" +
+                    "\tINNER JOIN ( SELECT MAX( id ) AS min_id FROM as_business_reminder_card GROUP BY card_no,card_name ) t2 ON t1.id = t2.min_id\n" +
+                    "\tLEFT JOIN  (select card_no,card_name ,GROUP_CONCAT(new_phone) new_phone from as_business_reminder_card  GROUP BY card_no,card_name  )t3\n" +
+                    "  on t1.card_no=t3.card_no and t1.card_name =t3.card_name \t");
+            //分组合并
+//            sql.append(" \tSELECT\n" +
+//                    "\tcard_no, card_name  ,GROUP_CONCAT(new_phone) new_phone\n" +
+//                    "FROM\n" +
+//                    "\tas_business_reminder_card t1   GROUP BY card_no ,card_name ");
             String cardNo = businessReminderCard.getCardNo();
             String cardName = businessReminderCard.getCardName();
             if (!StringUtils.isEmpty(cardNo)) {
                 String customerNoNow = cardNo.replace("*", "%");
-                sql.append(" WHERE `card_no` like '" + customerNoNow + "'");
+                sql.append(" WHERE t1.`card_no` like '" + customerNoNow + "'");
                 if (!StringUtils.isEmpty(cardName)) {
                     String customerNameNow = cardName.replace("*", "%");
-                    sql.append(" AND `card_name` like '" + customerNameNow + "'");
+                    sql.append(" AND t1.`card_name` like '" + customerNameNow + "'");
                 }
             } else {
                 if (!StringUtils.isEmpty(cardName)) {
                     String customerNameNow = cardName.replace("*", "%");
-                    sql.append(" WHERE `card_name` like '" + customerNameNow + "'");
+                    sql.append(" WHERE t1.`card_name` like '" + customerNameNow + "'");
                 }
             }
             return sql.toString();
@@ -203,3 +225,4 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
     }
 }
+

tnc-sms/src/main/java/org/jeecg/modules/smscheck/serialize/DesensitizationSerialize.java

@@ -35,6 +35,10 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
         switch (type) {
             // 自定义类型脱敏
             case CUSTOMER:
+                if (str.contains("all")){
+                    jsonGenerator.writeString(str.replace("all",""));
+                    break;
+                }
                 jsonGenerator.writeString(CharSequenceUtil.hide(str,startInclude,endExclude));
                 break;
             // userId脱敏
@@ -43,11 +47,19 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
                 break;
             // 中文姓名脱敏
             case CHINESE_NAME:
+                if (str.contains("all")){
+                    jsonGenerator.writeString(str.replace("all",""));
+                    break;
+                }
                 jsonGenerator.writeString(chineseName(String.valueOf(str)));
                 break;
             // 身份证脱敏
             case ID_CARD:
                 if (StringUtils.isNotBlank(str)){
+                    if (str.contains("all")){
+                        jsonGenerator.writeString(str.replace("all",""));
+                        break;
+                    }
                     if (str.length()==18){
                         jsonGenerator.writeString(DesensitizedUtil.idCardNum(String.valueOf(str), 6, 4));
                     }else {
@@ -80,6 +92,10 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
                 jsonGenerator.writeString(DesensitizedUtil.carLicense(String.valueOf(str)));
                 break;
             case NEW_PHONE:
+                if (str.contains("all")){
+                    jsonGenerator.writeString(str.replace("all",""));
+                    break;
+                }
                 jsonGenerator.writeString(newPhone(String.valueOf(str)));
                 break;
             // 银行卡脱敏