bug修改

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

@@ -26,6 +26,7 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.entity.excel.NameListExcel;
 import org.jeecg.modules.smscheck.entity.excel.ShowDownExcel;
+import org.jeecg.modules.smscheck.enums.PhoneType;
 import org.jeecg.modules.smscheck.mapper.SysSmsUserMapper;
 import org.jeecg.modules.smscheck.service.*;
 import org.jeecg.modules.smscheck.util.HttpClientUtil;
@@ -44,6 +45,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -67,6 +69,10 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
     @Autowired
     private PhonePurposeService phonePurposeService;
 
+    @Autowired
+    private SysSmsUserMapper sysSmsUserMapper;
+
+
     private static final String PHONE_PLACE_API_URL="https://cx.shouji.360.cn/phonearea.php";
     @Resource
     private SysCompanyService sysCompanyService;
@@ -658,7 +664,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         for (String s : list) {
             BusinessReminderCard byId = businessReminderCardService.getById(s);
             if (!byId.getUserId().equals(sysUser.getId())){
-                return Result.error("证件号为:"+byId.getCardNo()+". 创建人跟修改人不一致。");
+                return Result.error(" 创建人跟修改人不一致。");
             }
             return Result.OK();
         }
@@ -678,14 +684,17 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             return Result.error("ID不能为空");
         }
         businessReminderCard.setDelFlag(CommonConstant.DEL_FLAG_0);
+        BusinessReminderCard byId = businessReminderCardService.getById(businessReminderCard.getId());
+        businessReminderCard.setCardNo(byId.getCardNo());
+        businessReminderCard.setCardName(byId.getCardName());
+        businessReminderCard.setPhone(byId.getPhone());
+        businessReminderCard.setStatus("0");
         boolean updateById = businessReminderCardService.updateById(businessReminderCard);
 
-
-        BusinessReminderCard byId = businessReminderCardService.getById(businessReminderCard.getId());
         BusinessReminderCardLog businessReminderCardLog =new BusinessReminderCardLog();
         businessReminderCardLog.setBusinessReminderCardId(businessReminderCard.getId());
         businessReminderCardLog.setUpdateTime(new Date());
-        businessReminderCardLog.setSysBusinessHall(null);//登陆人营业厅 等待
+        businessReminderCardLog.setSysBusinessHall(byId.getSysBusinessHall());//登陆人营业厅 等待
         businessReminderCardLog.setSysCompany(null);//登陆人区级 等待
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         businessReminderCardLog.setBusinessReminderCreateBy(byId.getCreateBy());
@@ -716,6 +725,13 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
 
         List<BusinessReminderCardLog> list = businessReminderCardLogService.list(queryWrapper);
 
+        Map<String, SysBusinessHall> collect = sysBusinessHallService.list().stream()
+                .collect(Collectors.toMap(v -> v.getId(), Function.identity(), (o, n) -> o));
+        for (BusinessReminderCardLog businessReminderCardLog : list) {
+            if (collect.get(businessReminderCardLog.getSysBusinessHall())!=null){
+                businessReminderCardLog.setSysBusinessHall(collect.get(businessReminderCardLog.getSysBusinessHall()).getName());
+            }
+        }
         return Result.OK(list);
     }
 
@@ -810,6 +826,27 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             }
 
         }
+        List<SysCompany> sysCompanyList =sysCompanyService.list();
+        List<SysBusinessHallAndSysCompany> dataSysBusinessHall = sysBusinessHallService.getDataSysBusinessHallAll(sysCompanyList);
+        Map<String,String>map = new HashMap<>();
+        for (SysBusinessHallAndSysCompany sysBusinessHallAndSysCompany : dataSysBusinessHall) {
+            for (SysBusinessHall sysBusinessHall : sysBusinessHallAndSysCompany.getSysBusinessHallList()) {
+                map.put(sysBusinessHall.getId(),sysBusinessHall.getName());
+            }
+        }
+        if (StringUtils.isBlank(id)){
+            for (BusinessReminderCard reminderCard : businessReminderCards) {
+                reminderCard.setSysBusinessHall(map.get(reminderCard.getSysBusinessHall()));
+                String[] split = reminderCard.getOperatorType().split(",");
+                String type=" ";
+                for (String s : split) {
+                    type+=PhoneType.findNameByValue(s)+" ";
+                }
+                reminderCard.setOperatorType(type);
+            }
+        }
+
+
         if (StringUtils.isBlank(id)){
             if (businessReminderCards.size()>=2){
                 businessReminderCards.stream().forEach(u->u.setIsSizeNumberResults("is"));

tnc-sms/src/main/java/org/jeecg/modules/smscheck/enums/PhoneType.java

@@ -0,0 +1,50 @@
+package org.jeecg.modules.smscheck.enums;
+
+/* renamed from: org.jeecg.modules.online.cgform.enums.c */
+/* loaded from: hibernate-re-3.1.0-beta2.jar:org/jeecg/modules/online/cgform/enums/c.class */
+public enum PhoneType {
+    DianXin("电信","3"),
+    YiDong("移动","1"),
+    LianTong("联通","2"),
+    QiTa("其它","4");
+
+
+    /* renamed from: e */
+    private String name;
+
+    /* renamed from: f */
+    private String value;
+
+    PhoneType(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /* renamed from: b */
+    public static String findNameByValue(String value) {
+        PhoneType[] a;
+        for (PhoneType base : PhoneType.values()) {
+            if (base.value.equals(value)) {
+                return base.name;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -17,4 +17,5 @@ public interface SysBusinessHallService extends IService<SysBusinessHall> {
 
     List<SysBusinessHallAndSysCompany> getDataSysBusinessHall(List<SysCompany>list);
 
+    List<SysBusinessHallAndSysCompany> getDataSysBusinessHallAll(List<SysCompany>list);
 }

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

@@ -35,6 +35,17 @@ public class SysBusinessHallServiceImpl  extends ServiceImpl<SysBusinessHallMapp
     @Override
     public List<SysBusinessHallAndSysCompany> getDataSysBusinessHall(List<SysCompany> list) {
 
+        return getSysCompanies(list,"noAll");
+    }
+
+    @Override
+    public List<SysBusinessHallAndSysCompany> getDataSysBusinessHallAll(List<SysCompany> list) {
+
+        return getSysCompanies(list,"All");
+    }
+
+
+    public List<SysBusinessHallAndSysCompany> getSysCompanies(List<SysCompany> list,String info){
         List<SysBusinessHallAndSysCompany>sysBusinessHallAndSysCompanies = new ArrayList<>();
         for (SysCompany sysCompany : list) {
             SysBusinessHall sysBusinessHall = new SysBusinessHall();
@@ -42,7 +53,9 @@ public class SysBusinessHallServiceImpl  extends ServiceImpl<SysBusinessHallMapp
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
             QueryWrapper<SysBusinessHall> queryWrapper = QueryGenerator.initQueryWrapper(sysBusinessHall,null);
-            queryWrapper.likeRight("org_code",sysUser.getOrgCode());
+            if (!info.equals("All")){
+                queryWrapper.likeRight("org_code",sysUser.getOrgCode());
+            }
             List<SysBusinessHall> sysBusinessHalls = sysBusinessHallMapper.selectList(queryWrapper);
             SysBusinessHallAndSysCompany sysBusinessHallAndSysCompany =new SysBusinessHallAndSysCompany();
             sysBusinessHallAndSysCompany.setId(sysCompany.getId());