Merge remote-tracking branch 'origin/master'

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,10 +24,9 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.entity.*;
-import org.jeecg.modules.smscheck.service.BusinessReminderCardService;
-import org.jeecg.modules.smscheck.service.PhonePurposeService;
-import org.jeecg.modules.smscheck.service.SysBusinessHallService;
-import org.jeecg.modules.smscheck.service.SysCompanyService;
+import org.jeecg.modules.smscheck.entity.excel.NameListExcel;
+import org.jeecg.modules.smscheck.entity.excel.ShowDownExcel;
+import org.jeecg.modules.smscheck.service.*;
 import org.jeecg.modules.smscheck.util.HttpClientUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -35,11 +35,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-
+import org.springframework.beans.BeanUtils;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -55,9 +57,12 @@ import java.util.stream.Stream;
 @Slf4j
 public class BusinessReminderCardController  extends JeecgController<BusinessReminderCard, BusinessReminderCardService> {
     @Value("${jeecg.path.upload}")
-    private String upLoadPath;
+    private static String upLoadPath;
     @Autowired
     private BusinessReminderCardService businessReminderCardService;
+    @Autowired
+    private BusinessReminderCardLogService businessReminderCardLogService;
+
     @Autowired
     private PhonePurposeService phonePurposeService;
 
@@ -84,8 +89,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         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("*", "");
-        String numberResults = request.getParameterMap().get("numberResults")==null?"":
-                Arrays.toString(request.getParameterMap().get("numberResults")).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?"":
@@ -123,8 +127,13 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults_MultiString)){
             queryWrapper.like("number_results",numberResults_MultiString);
         }
-        if (StringUtils.isNotBlank(numberResults)){
-            queryWrapper.like("number_results",numberResults);
+        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);
@@ -180,8 +189,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         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("*", "");
-        String numberResults = request.getParameterMap().get("numberResults")==null?"":
-                Arrays.toString(request.getParameterMap().get("numberResults")).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?"":
@@ -214,8 +222,13 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults_MultiString)){
             queryWrapper.like("number_results",numberResults_MultiString);
         }
-        if (StringUtils.isNotBlank(numberResults)){
-            queryWrapper.like("number_results",numberResults);
+        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");
         return  queryWrapper;
@@ -227,7 +240,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         // Step.1 组装查询条件
 
         QueryWrapper<BusinessReminderCard> queryWrapper =getQueryWrapper( request,businessReminderCard);
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
 
         // Step.2 获取导出数据
         List<BusinessReminderCard> pageList = businessReminderCardService.list(queryWrapper);
@@ -294,24 +307,83 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             }
 
         }
+        // 设置日期格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        // 格式化日期为字符串
+        String format = LocalDate.now().format(formatter);
+        //name list
+        List<NameListExcel> excels =new ArrayList<>();
+        //上报蓝紫 nameList
+        List<ShowDownExcel>excelList =new ArrayList<>();
+
+        List<String> numberResults = request.getParameterMap().get("numberResults[]")==null?new ArrayList<>():  new ArrayList<>(Arrays.asList(request.getParameterMap().get("numberResults[]")));
+
+        if (numberResults!=null && numberResults.size()==1){
+            if (numberResults.get(0).equals("3")){
+                copyList(exportList,excels,NameListExcel.class);
+                for (NameListExcel excel : excels) {
+                    excel.setApplicationDate(format);
+                }
+                return getModelAndView(excels,"骚扰电话\\诈骗电话管控申请表",NameListExcel.class);
+            }
+            //关停  shutDown
+            if (numberResults.get(0).equals("2")){
+                copyList(exportList,excelList,ShowDownExcel.class);
+                int i =1;
+                for (ShowDownExcel showDownExcel : excelList) {
+                    showDownExcel.setIndex(i);
+                    i++;
+                    if (showDownExcel.getStatus().equals("0")){
+                        showDownExcel.setIsNow("否");
+                        showDownExcel.setLabel("安防停机-不可复开");
+                    }
+                    if (showDownExcel.getStatus().equals("1")){
+                        showDownExcel.setIsNow("是");
+                        showDownExcel.setLabel("安防停机-不可复开");
+                    }
+                }
+                return getModelAndView(excelList,"上报关停号码列表",ShowDownExcel.class);
+            }
+        }
+
+         return getModelAndView(exportList,"入网信息业务",BusinessReminderCard.class);
+    }
+
+
+    public static <S,T> void copyList(Collection<S> sCollection,Collection<T> tCollection,Class<T> tClass) {
+        if (sCollection == null || tCollection == null || sCollection.size() == 0) {
+            return;
+        }
+        try {
+            for (S s : sCollection) {
+                T t = tClass.newInstance();
+                BeanUtils.copyProperties(s, t);
+                tCollection.add(t);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 
+    private static <S,T>   ModelAndView getModelAndView(Object data,String title,Class<T> tClass){
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         // Step.3 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject(NormalExcelConstants.FILE_NAME, "入网信息业务");
-        mv.addObject(NormalExcelConstants.CLASS, BusinessReminderCard.class);
+        mv.addObject(NormalExcelConstants.CLASS, tClass);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams  exportParams=new ExportParams(  "入网信息业务报表", "导出人:" + sysUser.getRealname(), "入网信息业务");
+        ExportParams  exportParams=new ExportParams(  title, "导出人:" + sysUser.getRealname(), "入网信息业务");
         exportParams.setImageBasePath(upLoadPath);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
         mv.addObject(NormalExcelConstants.PARAMS,exportParams);
-        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
-         return mv;
+        mv.addObject(NormalExcelConstants.DATA_LIST, data);
+        return mv;
     }
 
 
-
-
     /**
      * 通过id查询 入网信息统计数
      *
@@ -375,6 +447,10 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody BusinessReminderCard businessReminderCard) {
         businessReminderCard.setDelFlag(CommonConstant.DEL_FLAG_0);
+        businessReminderCard.setUpdateTime(new Date());
+        businessReminderCard.setStatus("0");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        businessReminderCard.setUserId(sysUser.getId());
         boolean save = businessReminderCardService.save(businessReminderCard);
         if (save) {
             return Result.OK();
@@ -382,6 +458,32 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         return Result.error("新增失败");
     }
 
+    /**
+     * 校验 是否同一人修改
+     *
+     * @param data
+     * @return
+     */
+    @PostMapping(value = "/check")
+    public Result<?> check(@RequestBody  Map<String, List<String>> data) {
+        if (data==null|| data.size()==0){
+            return Result.error("参数为空");
+        }
+        List<String> list = data.get("ids");
+        if (list==null  || list.isEmpty()){
+            return Result.error("Id为空");
+        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        for (String s : list) {
+            BusinessReminderCard byId = businessReminderCardService.getById(s);
+            if (!byId.getUserId().equals(sysUser.getId())){
+                return Result.error("证件号为:"+byId.getCardNo()+". 创建人跟修改人不一致。");
+            }
+            return Result.OK();
+        }
+        return Result.error("查询创建人有错");
+    }
+
     /**
      * 修改 入网用户信息
      *
@@ -396,12 +498,45 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         }
         businessReminderCard.setDelFlag(CommonConstant.DEL_FLAG_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.setSysCompany(null);//登陆人区级 等待
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        businessReminderCardLog.setBusinessReminderCreateBy(byId.getCreateBy());
+        businessReminderCardLog.setUpdateBy(sysUser.getUsername());
+        businessReminderCardLog.setDelFlag(0);
+        businessReminderCardLog.setUserId(sysUser.getId());
+        businessReminderCardLogService.save(businessReminderCardLog);
+
         if (updateById) {
             return Result.OK("修改成功");
         }
         return Result.error("修改失败");
     }
-
+    /**
+     * 查询log
+     *
+     * @param request
+     * @return
+     */
+    @GetMapping(value = "/getBusinessReminderCardLogs")
+    public Result<?> getBusinessReminderCardLogs(HttpServletRequest request) {
+        QueryWrapper<BusinessReminderCardLog> queryWrapper = QueryGenerator.initQueryWrapper(new BusinessReminderCardLog(), request.getParameterMap());
+        String businessReminderCardId = request.getParameterMap().get("businessReminderCardId")==null?"":
+                Arrays.toString(request.getParameterMap().get("businessReminderCardId")).replace("[", "").replace("]", "").replace("*", "");
+        queryWrapper.lambda()
+                .eq(BusinessReminderCardLog::getDelFlag, CommonConstant.DEL_FLAG_0)
+                .eq(BusinessReminderCardLog::getBusinessReminderCardId,businessReminderCardId).orderByDesc(BusinessReminderCardLog::getUpdateTime);
+
+        List<BusinessReminderCardLog> list = businessReminderCardLogService.list(queryWrapper);
+
+        return Result.OK(list);
+    }
 
     /**
      * 通过ID查询入网信息业务详情
@@ -477,7 +612,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         String cardNo = request.getParameterMap().get("cardNo")==null?"": Arrays.toString(request.getParameterMap().get("cardNo")).replace("[", "").replace("]", "").replace("*", "");
         String id = request.getParameterMap().get("id")==null?"": Arrays.toString(request.getParameterMap().get("id")).replace("[", "").replace("]", "").replace("*", "");
          LambdaQueryWrapper<BusinessReminderCard> queryWrapperData = new LambdaQueryWrapper<>();
-        queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo).eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getCreateTime);
+        queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo).eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getUpdateTime);
         if (StringUtils.isNotBlank(id)){
             queryWrapperData.eq(BusinessReminderCard::getId,id);
         }
@@ -618,6 +753,22 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         }
         return string;
     }
-
+    @PostMapping(value = "/escalation")
+    public Result<?> escalation(@RequestBody  Map<String, List<String>> data) {
+        if (data==null|| data.size()==0){
+            return Result.error("参数为空");
+        }
+        List<String> list = data.get("ids");
+        if (list==null|| list.size()==0){
+            return Result.error("Id为空");
+        }
+        UpdateWrapper<BusinessReminderCard> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", list).set("status", 1);
+        boolean update = businessReminderCardService.update(updateWrapper);
+        if (update) {
+            return Result.ok("上报成功");
+        }
+        return Result.error("上报失败");
+    }
 
 }

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

@@ -1,26 +1,25 @@
 package org.jeecg.modules.smscheck.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
-import org.jeecg.modules.smscheck.entity.SysBusinessHallAndSysCompany;
-import org.jeecg.modules.smscheck.entity.SysCompany;
+import org.jeecg.modules.smscheck.entity.*;
+import org.jeecg.modules.smscheck.mapper.SysCompanyMapper;
 import org.jeecg.modules.smscheck.service.SysBusinessHallService;
 import org.jeecg.modules.smscheck.service.SysCompanyService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -41,7 +40,8 @@ public class SysCompanyController {
     @Resource
     private SysBusinessHallService sysBusinessHallService;
 
-
+    @Resource
+    private SysCompanyMapper sysCompanyMapper;
 
     @ApiOperation(value = "营业厅与公司联动", notes = "营业厅与公司联动")
     @GetMapping(value = "/list")
@@ -52,7 +52,122 @@ public class SysCompanyController {
         return Result.OK(dataSysBusinessHall);
     }
 
+    @ApiOperation(value = "营业厅与公司-分页列表查询", notes = "营业厅与公司-分页列表查询")
+    @GetMapping(value = "/listPage")
+    public Result< Map<String, Object> > queryPageList(SysBusinessHall sysBusinessHall,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest request) {
+        Page<SmsStatisticsCheckVo> page = new Page<>(pageNo, pageSize);
+        String aname = request.getParameterMap().get("aname")==null?"":
+                Arrays.toString(request.getParameterMap().get("aname")).replace("[", "").replace("]", "").replace("*", "");
+
+        String bname = request.getParameterMap().get("bname")==null?"":
+                Arrays.toString(request.getParameterMap().get("bname")).replace("[", "").replace("]", "").replace("*", "");
+
+        String three_company_id = request.getParameterMap().get("three_company_id")==null?"":
+                Arrays.toString(request.getParameterMap().get("three_company_id")).replace("[", "").replace("]", "").replace("*", "");
+
+
+
+        Map<String, Object> sysCompanyListPage = sysCompanyService.getSysCompanyListPage(page,aname,bname,three_company_id);
+        return Result.OK(sysCompanyListPage);
+    }
+
+    @ApiOperation(value = "营业厅与公司-分页列表查询", notes = "营业厅与公司-分页列表查询")
+    @GetMapping(value = "/dataById")
+    public Result< Map<String, Object> > dataById(SysBusinessHall sysBusinessHall,
+                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                       HttpServletRequest request) {
+        Page<SmsStatisticsCheckVo> page = new Page<>(pageNo, pageSize);
+        Map<String, Object> sysCompanyListPage = sysCompanyService.getSysCompanyListPage(page,null,null,null);
+        return Result.OK(sysCompanyListPage);
+    }
+
+    @ApiOperation(value = "营业厅与公司-删除list", notes = "营业厅与公司-删除list")
+    @PostMapping(value = "/delAddressList")
+    public Result<?>  delAddressList(@RequestBody Map<String, List<String>> data) {
+        if (data==null|| data.size()==0){
+            return Result.error("参数为空");
+        }
+        List<String> list = data.get("ids");
+        if (list==null|| list.size()==0){
+            return Result.error("Id为空");
+        }
+        UpdateWrapper<SysBusinessHall> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", list).set("del_flag", 1);
+        boolean update = sysBusinessHallService.update(updateWrapper);
+        if (update){
+            return Result.OK("删除成功...");
+        }
+        return Result.error("删除失败...");
+    }
+
+
+    @ApiOperation(value = "营业厅与公司-add", notes = "营业厅与公司-add")
+    @PostMapping(value = "/add")
+    public Result<?>  addAddress(@RequestBody Map<String,Map<String,String>> data) {
+
+        if (data==null|| data.size()==0){
+            return Result.error("参数为空");
+        }
+        Map<String, String> map = data.get("data");
 
+        if (StringUtils.isBlank(map.get("aid"))){
+            String mes ="";
+            if (StringUtils.isBlank(map.get("aname"))){
+                mes+=" 二级部门名称不可为空！ ";
+            }
+            if (StringUtils.isBlank(map.get("three_company_id"))){
+                mes+=" 三级部门名称不可为空！ ";
+            }
+            if (StringUtils.isBlank(map.get("bname"))){
+                mes+=" 营业厅名称不可为空！ ";
+            }
+            if (StringUtils.isBlank(map.get("address"))){
+                mes+=" 营业厅地址不可为空！ ";
+            }
+            if (StringUtils.isBlank(map.get("coordinate"))){
+                mes+=" 坐标不可为空！ ";
+            }
+            if (!mes.equals("")){
+                return Result.error(mes);
+            }
+            SysCompany sysCompany = new SysCompany();
+            sysCompany.setName(map.get("aname"));
+            sysCompanyService.save(sysCompany);
+            SysBusinessHall sysBusinessHall = new SysBusinessHall();
+            sysBusinessHall.setName(map.get("bname"));
+            sysBusinessHall.setCompanyId(sysCompany.getId());
+            sysBusinessHall.setAddress(map.get("address"));
+            sysBusinessHall.setCoordinate(map.get("coordinate").trim());
+            sysBusinessHall.setThreeCompanyId(map.get("three_company_id"));
+            boolean save = sysBusinessHallService.save(sysBusinessHall);
+            if (save){
+                return Result.OK("增加成功...");
+            }
+            return Result.error("增加失败");
+        }else {
+            SysCompany sysCompany = new SysCompany();
+            sysCompany.setName(map.get("aname"));
 
+            UpdateWrapper<SysCompany> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("id",map.get("aid")).set("name",map.get("aname"));
+            boolean update = sysCompanyService.update(updateWrapper);
+
+            UpdateWrapper<SysBusinessHall> hallUpdateWrapper = new UpdateWrapper<>();
+            hallUpdateWrapper.eq("id",map.get("bid")).set("name",map.get("bname")).set("address",map.get("address"))
+                    .set("coordinate",map.get("coordinate")).set("three_company_id",map.get("three_company_id"));
+
+            boolean save = sysBusinessHallService.update(hallUpdateWrapper);
+            if (save && update){
+                return Result.OK("修改成功...");
+            }
+
+            return Result.error("修改失败");
+        }
+
+    }
 
 }

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

@@ -79,6 +79,15 @@ public class BusinessReminderCard {
     private Integer isInvolvingFraud;
     /** 黑名单到期客户新入网的高危疑似涉诈号码备注 */
     private String isInvolvingFraudNote;
+    //客户直接要求办理移动号码入网
+    private Integer directRequirements;
+    private String directRequirementsNode;
+    //客户主动申请一次性办理超过一个号码
+    private Integer passOne;
+    private String passOneNode;
+    //所办金额不符合客户消费能力
+    private Integer nonConformance;
+    private String nonConformanceNode;
 
 
     /** 删除标识 */
@@ -192,4 +201,8 @@ public class BusinessReminderCard {
     private String staffNo;
     //地址判研
     private String judgmentResearchAddress;
+
+    private String status;
+
+    private String userId;
 }

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

@@ -0,0 +1,57 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-21  20:38
+ */
+@Data
+@TableName("as_business_reminder_card_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="as_business_reminder_card_log", description="入网信息表log表")
+public class BusinessReminderCardLog {
+
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    private String createBy;
+
+    private String updateBy;
+
+
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+
+    private String sysCompany;
+
+
+    private String sysBusinessHall;
+    @ApiModelProperty(value = "主表外键")
+    private String businessReminderCardId;
+    /** 删除标识 */
+    //@Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+    private Integer delFlag;
+    @ApiModelProperty(value = "主表创建人")
+    private String businessReminderCreateBy;
+
+    private String userId;
+}

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

@@ -30,10 +30,12 @@ public class SysBusinessHall {
 
     private String companyId;
 
-    private String  standby;
+    private String threeCompanyId;
 
-    private String  standby2;
+    private String  address;
 
-    private String  standby3;
+    private String  coordinate;
+
+    private String  notes;
 
 }

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

@@ -0,0 +1,49 @@
+package org.jeecg.modules.smscheck.entity.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-24  19:53
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class NameListExcel {
+    /** 姓名 */
+    @Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private String cardName;
+
+    @ApiModelProperty(value = "服务号码")
+    @Excel(name = "服务号码", width = 15)
+    private String newPhone;
+
+
+    @ApiModelProperty(value = "管控类型")
+    @Excel(name = "管控类型", width = 15)
+    /** 是否将高危号码上报蓝、紫名单或不可复开关停 */
+    private String numberResults;
+
+    /** 创建日期 */
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "入网时间")
+    @Excel(name = "入网时间", width = 15)
+    private String staffNo;
+
+
+    @ApiModelProperty(value = "申请日期")
+    @Excel(name = "申请日期", width = 15)
+    private String applicationDate;
+}

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

@@ -0,0 +1,46 @@
+package org.jeecg.modules.smscheck.entity.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-24  20:02
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ShowDownExcel {
+
+
+    @ApiModelProperty(value = "序号")
+    @Excel(name = "序号", width = 15)
+    private Integer index;
+
+
+    @ApiModelProperty(value = "日期")
+    @Excel(name = "日期", width = 15)
+    private String staffNo;
+
+    @ApiModelProperty(value = "需关停号码")
+    @Excel(name = "服务号码", width = 15)
+    private String newPhone;
+
+    @ApiModelProperty(value = "关停标签")
+    @Excel(name = "关停标签", width = 15)
+    private String label;
+
+    @ApiModelProperty(value = "现是否为关停状态")
+    @Excel(name = "现是否为关停状态", width = 15)
+    private String isNow;
+
+    private String status;
+}

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardLog;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-21  20:42
+ */
+@Mapper
+public interface BusinessReminderCardLogMapper extends BaseMapper<BusinessReminderCardLog>{
+}

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

@@ -2,9 +2,13 @@ package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.smscheck.entity.SysBusinessHall;
 import org.jeecg.modules.smscheck.entity.SysCompany;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author: Syze
  * @description
@@ -12,4 +16,14 @@ import org.jeecg.modules.smscheck.entity.SysCompany;
  */
 @Mapper
 public interface SysCompanyMapper extends BaseMapper<SysCompany> {
+
+    /**
+     *  分页查询
+     * @param start
+     * @param size
+     * @return
+     */
+    List<Map<String,Object>> getSysCompanyListPage(@Param("size") Long size,@Param("start") Long start,@Param("aname")String aname ,@Param("bname")String bname,@Param("three_company_id")String three_company_id);
+
+    Long selectTotal(@Param("size") Long size,@Param("start") Long start,@Param("aname")String aname ,@Param("bname")String bname,@Param("three_company_id")String three_company_id);
 }

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.smscheck.mapper.SysCompanyMapper">
+
+
+    <select id="getSysCompanyListPage"   resultType="java.util.HashMap">
+        select  a.name aname ,a.id aid,b.id bid,b.name bname , address, coordinate ,three_company_id ,notes from  sys_company  a
+       left  JOIN  sys_business_hall b  on a.id=b.company_id
+        where   b.del_flag =0
+        <include refid="ifTest"/>
+            LIMIT #{start},#{size}
+    </select>
+
+
+    <select id="selectTotal" resultType="java.lang.Long">
+        select  count(*)   from  sys_company  a
+  left  JOIN  sys_business_hall b  on a.id=b.company_id where   b.del_flag =0
+        <include refid="ifTest"/>
+    </select>
+
+
+    <sql id="ifTest">
+        <if test="aname != null and aname != '' "> and  a.name LIKE  CONCAT('%', #{aname}, '%') </if>
+        <if test="bname != null and bname != '' "> and  b.name LIKE  CONCAT('%', #{bname}, '%') </if>
+        <if test="three_company_id != null and three_company_id != '' "> and   three_company_id LIKE  CONCAT('%', #{three_company_id}, '%') </if>
+    </sql>
+</mapper>

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

@@ -0,0 +1,13 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardLog;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-21  20:40
+ */
+public interface BusinessReminderCardLogService extends IService<BusinessReminderCardLog> {
+
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/SysCompanyService.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.modules.smscheck.entity.SysBusinessHall;
 import org.jeecg.modules.smscheck.entity.SysCompany;
@@ -7,6 +8,7 @@ import org.jeecg.modules.smscheck.mapper.SysCompanyMapper;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: Syze
@@ -17,4 +19,7 @@ public interface SysCompanyService extends IService<SysCompany> {
 
       List<SysCompany> getSysCompanyList();
 
+      Map<String,Object> getSysCompanyListPage( Page page,String aname ,String bname,String three_company_id);
+
+      Map<String,Object> getSysCompanyById( String id);
 }

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.smscheck.entity.BusinessReminderCardLog;
+import org.jeecg.modules.smscheck.mapper.BusinessReminderCardLogMapper;
+import org.jeecg.modules.smscheck.service.BusinessReminderCardLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: Syze
+ * @description
+ * @Date: 2023-08-21  20:41
+ */
+@Service
+public class BusinessReminderCardLogServiceImpl  extends ServiceImpl<BusinessReminderCardLogMapper, BusinessReminderCardLog> implements BusinessReminderCardLogService {
+}
+

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.smscheck.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.smscheck.entity.SysCompany;
 import org.jeecg.modules.smscheck.mapper.SysCompanyMapper;
@@ -7,7 +8,9 @@ import org.jeecg.modules.smscheck.service.SysCompanyService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: Syze
@@ -26,4 +29,42 @@ public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysComp
         List<SysCompany> sysCompanies = sysCompany.selectList(null);
         return sysCompanies;
     }
+
+    @Override
+    public Map<String,Object> getSysCompanyListPage( Page page,String aname ,String bname,String three_company_id) {
+        Map<String,Object> mapResult = new HashMap<>();
+        //计算page size  第几页
+        long current = page.getCurrent();//当前页数
+
+        long size = page.getSize();//每页显示数
+
+        long start = (current - 1) * size;//开始位置
+
+        List<Map<String, Object>> maps = sysCompany.getSysCompanyListPage(size, start, aname, bname, three_company_id);
+
+        Long total = sysCompany.selectTotal(size, start, aname, bname, three_company_id);
+
+        //构建返回对象内容
+        mapResult.put("current",current);
+
+        mapResult.put("records",maps);
+
+        mapResult.put("size",size);
+
+        mapResult.put("total",total);
+
+        long totalPages;//总页数
+        totalPages = total / size;
+        if (total % size != 0){
+            totalPages ++;
+        }
+        mapResult.put("pages",totalPages);
+
+        return mapResult;
+    }
+
+    @Override
+    public Map<String, Object> getSysCompanyById(String id) {
+        return null;
+    }
 }