瀏覽代碼

稽核二次修改

sunyize 2 年之前
父節點
當前提交
d94badfb61
共有 15 個文件被更改,包括 586 次插入58 次删除
  1. 3 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerDataController.java
  2. 6 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java
  3. 83 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoErrorController.java
  4. 110 28
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java
  5. 16 1
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerData.java
  6. 21 1
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerDataAndLog.java
  7. 2 1
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerDataLog.java
  8. 26 27
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerInfo.java
  9. 249 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerInfoError.java
  10. 10 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoErrorMapper.java
  11. 14 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java
  12. 22 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISmsCheckCustomerInfoErrorService.java
  13. 4 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISmsCheckCustomerInfoService.java
  14. 14 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/ISmsCheckCustomerInfoErrorServiceImpl.java
  15. 6 0
      tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsCheckCustomerInfoServiceImpl.java

+ 3 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerDataController.java

@@ -219,6 +219,9 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getGroupPriceApprovalResult() ) && !smsCheckCustomerDataLog.getGroupPriceApprovalResult().equals("1")){
             map.put("集团价格审批结果","未通过");
         }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getInfoResult() ) && !smsCheckCustomerDataLog.getInfoResult().equals("1")){
+            map.put("基本信息稽核","未通过");
+        }
         return map;
     }
 

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

@@ -11,6 +11,7 @@ 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.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.api.vo.Result;
@@ -22,12 +23,16 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.BeanCopyUtil;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.configs.CheckTypeCode;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.service.*;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
 import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -36,6 +41,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author jeecg-boot

+ 83 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoErrorController.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.smscheck.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+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.SmsCheckCustomerInfoError;
+import org.jeecg.modules.smscheck.entity.SmsCheckTask;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoErrorService;
+import org.jeecg.modules.smscheck.service.ISmsCheckTaskService;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Api(tags = "稽核任务")
+@RestController
+@RequestMapping("/smsCheckError/task")
+@Slf4j
+public class SmsCheckCustomerInfoErrorController extends JeecgController<SmsCheckCustomerInfoError, ISmsCheckCustomerInfoErrorService> {
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
+    @Autowired
+    private ISmsCheckCustomerInfoErrorService smsCheckCustomerInfoErrorService;
+    /**
+     * 导出excel
+     *
+     * @param request      请求
+     * @param smsCheckCustomerInfoError 对象
+     * @return excel文件
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXlsError(HttpServletRequest request, SmsCheckCustomerInfoError smsCheckCustomerInfoError) {
+        return  exportXl(request, smsCheckCustomerInfoError, SmsCheckCustomerInfoError.class, "经分导出错误数据");
+    }
+
+    protected ModelAndView exportXl(HttpServletRequest request, SmsCheckCustomerInfoError object, Class<SmsCheckCustomerInfoError> clazz, String title) {
+        // Step.1 组装查询条件
+        LambdaQueryWrapper<SmsCheckCustomerInfoError> query = new LambdaQueryWrapper<SmsCheckCustomerInfoError>();
+        query.eq(SmsCheckCustomerInfoError::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+        query.eq(SmsCheckCustomerInfoError::getTaskId, object.getTaskId());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        // Step.2 获取导出数据
+         List<SmsCheckCustomerInfoError> exportList =smsCheckCustomerInfoErrorService.list(query);
+        for (SmsCheckCustomerInfoError smsCheckCustomerInfoError : exportList) {
+            smsCheckCustomerInfoError.setDelFlag(1);
+        }
+        smsCheckCustomerInfoErrorService.saveOrUpdateBatch(exportList);
+        for (SmsCheckCustomerInfoError smsCheckCustomerInfoError : exportList) {
+            smsCheckCustomerInfoError.setNetworkAccessTime(smsCheckCustomerInfoError.getNetworkAccessTime().replace("-",""));
+        }
+         // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for:图片导出报错,ImageBasePath未设置--------------------
+        ExportParams exportParams=new ExportParams(title + "报表", title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for:图片导出报错,ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
+}

+ 110 - 28
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java

@@ -10,6 +10,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,6 +25,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.system.vo.SysDepartModel;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.entity.currency.DataYearMonth;
@@ -32,6 +34,7 @@ import org.jeecg.modules.smscheck.service.impl.DataYearMonthImpl;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -39,10 +42,9 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author jeecg-boot
@@ -71,7 +73,8 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 
     @Autowired
     private DataYearMonthImpl dataYearMonth;
-
+    @Autowired
+    private ISmsCheckCustomerInfoErrorService smsCheckCustomerInfoErrorService;
     /**
      * 分页列表查询
      *
@@ -90,6 +93,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest request) {
         QueryWrapper<SmsCheckTask> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckTask, request.getParameterMap());
+        queryWrapper.orderByDesc("create_time");
         Page<SmsCheckTask> page = new Page<>(pageNo, pageSize);
         IPage<SmsCheckTask> pageList = taskService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -185,7 +189,6 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckTask smsCheckTask) {
         return super.exportXls(request, smsCheckTask, SmsCheckTask.class, "稽核任务");
     }
-
     /**
      * 通过excel导入数据
      *
@@ -257,6 +260,8 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
      */
     @PostMapping(value = "/{taskId}/importCustomerData")
     public Result<?> importCustomerData(@PathVariable String taskId, @RequestBody List<SmsCheckCustomerInfoVo> list) {
+        //1同一个任务 用户编号不可一致
+        //2 员工得存在
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<SmsCheckCustomerInfo> dataList = new ArrayList<>();
         //导入失败数据
@@ -267,15 +272,34 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
             infoVo.setTaskId(taskId);
             SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
             BeanUtil.copyProperties(infoVo, info, true);
-            SysUser user = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
-                    .eq(SysUser::getWorkNo, infoVo.getStaffNo()));
+            List<SysUser> userList = sysUserService.list(new LambdaQueryWrapper<SysUser>()
+                    .eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0));
+
+            Map<String, SysUser> userMap
+                    = userList.stream().collect(Collectors.toMap(SysUser::getWorkNo, Function.identity(), (o, n) -> o));
+//            SysUser user = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+//                    .eq(SysUser::getWorkNo, infoVo.getStaffNo()));
             //放入用户信息
+            SysUser user =userMap.get( infoVo.getStaffNo());
             if (user == null) {
                 infoVo.setResult("0");
-                infoVo.setErrorMsg("系统无相关用户");
+                infoVo.setErrorMsg("系统无此员工");
                 listErro.add(infoVo);
                 continue;
             }
+            if (info.getStaffDeptLevel2Name()==null || info.getStaffDeptLevel2No()==null) {
+                infoVo.setResult("0");
+                infoVo.setErrorMsg("二级部门信息为空");
+                listErro.add(infoVo);
+                continue;
+            }
+            if (info.getStaffDeptLevel3Name()==null || info.getStaffDeptLevel3No()==null) {
+                infoVo.setResult("0");
+                infoVo.setErrorMsg("三级部门信息为空");
+                listErro.add(infoVo);
+                continue;
+            }
+
             info.setStaffUsername(user.getUsername());
             info.setDelFlag(CommonConstant.DEL_FLAG_0);
             // 0:未处理;1:未完善;2:待稽核;3:待整改;4:已整改;5:稽核通过 6 未上传;
@@ -289,7 +313,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
                             .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
             if (count > 0) {
                 infoVo.setResult("0");
-                infoVo.setErrorMsg("公司信息已存在");
+                infoVo.setErrorMsg("用户编号重复");
                 listErro.add(infoVo);
                 // TODO 重复处理,放校验里面?
 //				 return Result.error("客户[" + info.getCustomerNo() + "]已存在!");
@@ -342,6 +366,22 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
             task.setCustomerCount(task.getCustomerCount() + customerCount);
             taskService.updateById(task);
         }
+        if (listErro!=null && listErro.size()>0){
+            List<SmsCheckCustomerInfoError> smsCheckCustomerInfoErrors = new ArrayList<>();
+            for (SmsCheckCustomerInfoVo smsCheckCustomerInfoVo : listErro) {
+                if (StringUtils.isNotBlank(smsCheckCustomerInfoVo.getResult())&&smsCheckCustomerInfoVo.getResult().equals("0")){
+                    SmsCheckCustomerInfoError smsCheckCustomerInfoError =new SmsCheckCustomerInfoError();
+                    BeanUtils.copyProperties(smsCheckCustomerInfoVo, smsCheckCustomerInfoError);
+                    smsCheckCustomerInfoError.setDelFlag(0);
+                    smsCheckCustomerInfoErrors.add(smsCheckCustomerInfoError);
+                }
+
+            }
+
+
+            boolean b = smsCheckCustomerInfoErrorService.saveOrUpdateBatch(smsCheckCustomerInfoErrors);
+            int i=0;
+        }
         return Result.OK("导入成功!导入条数" + customerCount, listErro);
     }
 
@@ -358,34 +398,76 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         if (StrUtil.isBlank(vo.getCustomerNo()) && StrUtil.isBlank(vo.getUserNo())) {
             return null;
         }
+
         // 格式化入网时间
         String accessTime = vo.getNetworkAccessTime();
         DateTime accessTimeDate = DateUtil.parse(accessTime, "yyyyMMdd");
         vo.setNetworkAccessTime(accessTimeDate.toDateStr());
 
-        // 拆分员工工号和员工姓名
+        //  员工工号
         String staffInfo = vo.getStaffInfo();
-        List<String> staffInfos = removeBrackets(staffInfo);
-        if (staffInfos.size() == 3) {
-            vo.setStaffName(staffInfos.get(0));
-            vo.setStaffNo(staffInfos.get(2));
+        vo.setStaffNo(staffInfo);
+       // }
+
+        //用户状态
+        List<SysUser> userList = sysUserService.list(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0));
+        Map<String, SysUser> userMap
+                = userList.stream().collect(Collectors.toMap(SysUser::getWorkNo, Function.identity(), (o, n) -> o));
+        SysUser sysUser = userMap.get(vo.getStaffNo());
+        //  状态(1:正常  2:冻结 )
+        String orgCode="";
+        //员工姓名
+        if (sysUser!=null){
+            vo.setStaffName(sysUser.getRealname());
+            vo.setStaffUsername( sysUser.getUsername());
+            Integer status = sysUser.getStatus();
+            if (status==1){
+                vo.setUserState("冻结");
+            }else {
+                vo.setUserState("正常");
+            }
+              orgCode = sysUser.getOrgCode();
         }
 
-        // 拆分员工二级部门
-        String staffDeptLevel2 = vo.getStaffDeptLevel2();
-        List<String> staffDeptLevel2s = removeBrackets(staffDeptLevel2);
-        if (staffDeptLevel2s.size() == 2) {
-            vo.setStaffDeptLevel2Name(staffDeptLevel2s.get(0));
-            vo.setStaffDeptLevel2No(staffDeptLevel2s.get(1));
+        List<SysDepartModel> sysDepartModel = customerInfoService.getSysDepartModel();
+        Map<String, SysDepartModel> sysDepartModelMap
+                = sysDepartModel.stream().collect(Collectors.toMap(SysDepartModel::getOrgCode,Function.identity(), (o, n) -> o));
+        //员工二级部门
+        if (StringUtils.isNotBlank(orgCode) &&orgCode.length()>9){
+            String towString = orgCode.substring(0, 9);
+            SysDepartModel sysDepartModelTow= sysDepartModelMap.get(towString);
+            if (sysDepartModelTow!=null){
+                vo.setStaffDeptLevel2No(sysDepartModelTow.getOrgCode());
+                vo.setStaffDeptLevel2Name(sysDepartModelTow.getDepartName());
+                vo.setStaffDeptLevel2(sysDepartModelTow.getDepartName()+"("+sysDepartModelTow.getOrgCode()+")");
+            }
+            //员工三级部门
+            String threeString = orgCode.substring(0, 13);
+            SysDepartModel sysDepartModelThree = sysDepartModelMap.get(threeString);
+            if (sysDepartModelThree!=null){
+                vo.setStaffDeptLevel3No(sysDepartModelThree.getOrgCode());
+                vo.setStaffDeptLevel3Name(sysDepartModelThree.getDepartName());
+                vo.setStaffDeptLevel3(sysDepartModelThree.getDepartName()+"("+sysDepartModelThree.getOrgCode()+")");
+            }
         }
 
-        // 拆分员工三级部门
-        String staffDeptLevel3 = vo.getStaffDeptLevel3();
-        List<String> staffDeptLevel3s = removeBrackets(staffDeptLevel3);
-        if (staffDeptLevel3s.size() == 2) {
-            vo.setStaffDeptLevel3Name(staffDeptLevel3s.get(0));
-            vo.setStaffDeptLevel3No(staffDeptLevel3s.get(1));
-        }
+
+//        // 拆分员工二级部门
+//        String staffDeptLevel2 = vo.getStaffDeptLevel2();
+//        List<String> staffDeptLevel2s = removeBrackets(staffDeptLevel2);
+//        if (staffDeptLevel2s.size() == 2) {
+//            vo.setStaffDeptLevel2Name(staffDeptLevel2s.get(0));
+//            vo.setStaffDeptLevel2No(staffDeptLevel2s.get(1));
+//        }
+//
+//        // 拆分员工三级部门
+//        String staffDeptLevel3 = vo.getStaffDeptLevel3();
+//        List<String> staffDeptLevel3s = removeBrackets(staffDeptLevel3);
+//        if (staffDeptLevel3s.size() == 2) {
+//            vo.setStaffDeptLevel3Name(staffDeptLevel3s.get(0));
+//            vo.setStaffDeptLevel3No(staffDeptLevel3s.get(1));
+//        }
 
         return vo;
     }

+ 16 - 1
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerData.java

@@ -208,7 +208,22 @@ public class SmsCheckCustomerData implements Serializable {
     private String groupPriceApprovalRemark;
 
 
-
+    @ApiModelProperty(value = " 合同到期时间")
+    private String contractDateDate;
+    @ApiModelProperty(value = " 合同到期时间是否长期")
+    private String contractDateDateIs;
+    @ApiModelProperty(value = " 营业执照到期时间")
+    private String businessLicenseDateDate;
+    @ApiModelProperty(value = " 营业执照到期时间是否长期")
+    private String businessLicenseDateDateIs;
+    @ApiModelProperty(value = " 码号证书到期时间")
+    private String codeNumberDateDate;
+    @ApiModelProperty(value = " 码号证书到期时间是否长期")
+    private String codeNumberDateDateIs;
+    @ApiModelProperty(value = " 备案通知到期时间")
+    private String filingsDateDate;
+    @ApiModelProperty(value = " 备案通知到期时间是否长期")
+    private String filingsDateDateIs;
 
 
 

+ 21 - 1
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerDataAndLog.java

@@ -25,7 +25,10 @@ public class SmsCheckCustomerDataAndLog  {
     @Excel(name = "用户编号", width = 15)
     @ApiModelProperty(value = "用户编号")
     private String userNo;
-
+    @ApiModelProperty(value = "基本信息稽核")
+    private String infoResult;
+    @ApiModelProperty(value = "基本信息稽核结果备注")
+    private String infoResultRemark;
     /** 员工id */
     @Excel(name = "员工id", width = 15)
     @ApiModelProperty(value = "员工id")
@@ -270,4 +273,21 @@ public class SmsCheckCustomerDataAndLog  {
     @ApiModelProperty(value = "集团价格审批结果备注")
     private String groupPriceApprovalResultRemark;
 
+    @ApiModelProperty(value = " 合同到期时间是否")
+    private String contractDateDate;
+    @ApiModelProperty(value = " 合同到期时间是否长期")
+    private String contractDateDateIs;
+    @ApiModelProperty(value = " 营业执照到期时间")
+    private String businessLicenseDateDate;
+    @ApiModelProperty(value = " 营业执照到期时间是否长期")
+    private String businessLicenseDateDateIs;
+    @ApiModelProperty(value = " 码号证书到期时间")
+    private String codeNumberDateDate;
+    @ApiModelProperty(value = " 码号证书到期时间是否长期")
+    private String codeNumberDateDateIs;
+    @ApiModelProperty(value = " 备案通知到期时间")
+    private String filingsDateDate;
+    @ApiModelProperty(value = " 备案通知到期时间是否长期")
+    private String filingsDateDateIs;
+
 }

+ 2 - 1
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerDataLog.java

@@ -27,7 +27,8 @@ public class SmsCheckCustomerDataLog {
     private String infoId;
     @ApiModelProperty(value = "基本信息稽核")
     private String infoResult;
-
+    @ApiModelProperty(value = "基本信息稽核结果备注")
+    private String infoResultRemark;
     @ApiModelProperty(value = "稽核资料ID")
     private String dataId;
 

+ 26 - 27
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerInfo.java

@@ -39,7 +39,6 @@ public class SmsCheckCustomerInfo implements Serializable {
     @ApiModelProperty(value = "资料稽核判断id")
     private String dataLogId;
 	/** 任务id */
-    @Excel(name = "任务id", width = 15)
     @ApiModelProperty(value = "任务id")
     private String taskId;
 	/** 客户编号 */
@@ -47,11 +46,11 @@ public class SmsCheckCustomerInfo implements Serializable {
     @ApiModelProperty(value = "客户编号")
     private String customerNo;
 	/** 客户名称 */
-    @Excel(name = "客户名称", width = 15)
+    //@Excel(name = "客户名称", width = 15)
     @ApiModelProperty(value = "客户名称")
     private String customerName;
 	/** 服务号码(全) */
-    @Excel(name = "服务号码(全)", width = 15)
+   // @Excel(name = "服务号码(全)", width = 15)
     @ApiModelProperty(value = "服务号码(全)")
     private String smsNumber;
 	/** 用户编号 */
@@ -107,77 +106,77 @@ public class SmsCheckCustomerInfo implements Serializable {
     @ApiModelProperty(value = "员工三级部门编号")
     private String staffDeptLevel3No;
 	/** 用户开通状态 (1:开通;2:拆机)*/
-    @Excel(name = "用户开通状态", width = 15)
+    //@Excel(name = "用户开通状态", width = 15)
     @ApiModelProperty(value = "用户开通状态")
     private Integer userOpenState;
 	/** 码号 */
-    @Excel(name = "码号", width = 15)
+    //@Excel(name = "码号", width = 15)
     @ApiModelProperty(value = "码号")
     private String smsNumberPrefix;
 	/** 号码详细用途 */
-    @Excel(name = "号码详细用途", width = 15)
+    //@Excel(name = "号码详细用途", width = 15)
     @ApiModelProperty(value = "号码详细用途")
     private String smsNumberUsage;
 	/** 客户经理 */
-    @Excel(name = "客户经理", width = 15)
+    //@Excel(name = "客户经理", width = 15)
     @ApiModelProperty(value = "客户经理")
     private String accountManager;
 	/** 客户经理手机号 */
-    @Excel(name = "客户经理手机号", width = 15)
+    //@Excel(name = "客户经理手机号", width = 15)
     @ApiModelProperty(value = "客户经理手机号")
     private String accountManagerPhone;
 	/** 码号使用单位联系人 */
-    @Excel(name = "码号使用单位联系人", width = 15)
+    //@Excel(name = "码号使用单位联系人", width = 15)
     @ApiModelProperty(value = "码号使用单位联系人")
     private String customerContacts;
 	/** 码号使用单位联系人手机号 */
-    @Excel(name = "码号使用单位联系人手机号", width = 15)
+   // @Excel(name = "码号使用单位联系人手机号", width = 15)
     @ApiModelProperty(value = "码号使用单位联系人手机号")
     private String customerContactsPhone;
 	/** 合同到期时间(YYYY-MM-DD) */
-    @Excel(name = "合同到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    //@Excel(name = "合同到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "合同到期时间(YYYY-MM-DD)")
     private Date contractExpireTime;
 	/** 码号证书到期时间(YYYY-MM-DD) */
-    @Excel(name = "码号证书到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    //@Excel(name = "码号证书到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "码号证书到期时间(YYYY-MM-DD)")
     private Date smsNumberCertificateExpireTime;
 	/** 备案通知到期时间(YYYY-MM-DD) */
-    @Excel(name = "备案通知到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    //@Excel(name = "备案通知到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "备案通知到期时间(YYYY-MM-DD)")
     private Date recordNoticeExpireTime;
 	/** 增值业务许可证到期时间(YYYY-MM-DD) */
-    @Excel(name = "增值业务许可证到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    //@Excel(name = "增值业务许可证到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "增值业务许可证到期时间(YYYY-MM-DD)")
     private Date valueAddedLicenceExpireTime;
 	/** 营业执照到期时间(YYYY-MM-DD) */
-    @Excel(name = "营业执照到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    //@Excel(name = "营业执照到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "营业执照到期时间(YYYY-MM-DD)")
     private Date businessLicenceExpireTime;
 	/** 合同签署主体与实际开通客户是否一致 */
-    @Excel(name = "合同签署主体与实际开通客户是否一致", width = 15)
+    //@Excel(name = "合同签署主体与实际开通客户是否一致", width = 15)
     @ApiModelProperty(value = "合同签署主体与实际开通客户是否一致")
     private Integer contractOpenCustomerSame;
 	/** 是否有集团价格审批 */
-    @Excel(name = "是否有集团价格审批", width = 15)
+    //@Excel(name = "是否有集团价格审批", width = 15)
     @ApiModelProperty(value = "是否有集团价格审批")
     private Integer groupPriceApproval;
 	/** 资料是否完整 */
-    @Excel(name = "资料是否完整", width = 15)
+    //@Excel(name = "资料是否完整", width = 15)
     @ApiModelProperty(value = "资料是否完整")
     private Integer dataComplete;
 	/** 是否完成整改 */
-    @Excel(name = "是否完成整改", width = 15)
+    //@Excel(name = "是否完成整改", width = 15)
     @ApiModelProperty(value = "是否完成整改")
     private Integer rectifyReformOver;
     /** 稽核状态 0:未处理;1:未完善;2:待稽核;3:已整改;4:待整改;5:稽核通过; */
@@ -186,11 +185,11 @@ public class SmsCheckCustomerInfo implements Serializable {
     @ApiModelProperty(value = "稽核状态")
     private Integer checkState;
 	/** 描述 */
-    @Excel(name = "描述", width = 15)
+    //@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
     private String description;
 	/** 删除标识 */
-    @Excel(name = "删除标识", width = 15)
+   // @Excel(name = "删除标识", width = 15)
     @ApiModelProperty(value = "删除标识")
     private Integer delFlag;
 	/** 创建人 */
@@ -215,32 +214,32 @@ public class SmsCheckCustomerInfo implements Serializable {
 
 
     /**提交材料日期*/
-    @Excel(name = "提交材料日期", width = 15)
+   // @Excel(name = "提交材料日期", width = 15)
     @ApiModelProperty(value = "提交材料日期")
     private String submitSpecialDate;
 
     /**关停标签*/
-    @Excel(name = "关停标签", width = 15)
+   // @Excel(name = "关停标签", width = 15)
     @ApiModelProperty(value = "关停标签)")
     private String shutdownLabel;
 
     /**漫游被关停日期(ABM查询)*/
-    @Excel(name = "漫游被关停日期(ABM查询)", width = 15)
+   // @Excel(name = "漫游被关停日期(ABM查询)", width = 15)
     @ApiModelProperty(value = "漫游被关停日期(ABM查询))")
     private Date shutdownLabelDate;
 
     /** 复开时间 */
-    @Excel(name = "复开时间", width = 15)
+   // @Excel(name = "复开时间", width = 15)
     @ApiModelProperty(value = "复开时间")
     private Date reopenTime;
 
     /** 有无特审单 */
-    @Excel(name = "有无特审单", width = 15)
+    //@Excel(name = "有无特审单", width = 15)
     @ApiModelProperty(value = "有无特审单/签报")
     private String materialLabel;
 
     /** 有无特审单 */
-    @Excel(name = "是否自查实名制合规", width = 15)
+   // @Excel(name = "是否自查实名制合规", width = 15)
     @ApiModelProperty(value = "是否自查实名制合规")
     private String nameFindCompliance;
 

+ 249 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsCheckCustomerInfoError.java

@@ -0,0 +1,249 @@
+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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * syze
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_customer_info_error对象", description="客户错误信息")
+@TableName("sms_check_customer_data_error")
+public class SmsCheckCustomerInfoError implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    @ApiModelProperty(value = "资料id")
+    private String dataId;
+    @ApiModelProperty(value = "资料稽核判断id")
+    private String dataLogId;
+	/** 任务id */
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+	/** 客户编号 */
+    @Excel(name = "客户编号", width = 15)
+    @ApiModelProperty(value = "客户编号")
+    private String customerNo;
+	/** 客户名称 */
+    //@Excel(name = "客户名称", width = 15)
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+	/** 服务号码(全) */
+   // @Excel(name = "服务号码(全)", width = 15)
+    @ApiModelProperty(value = "服务号码(全)")
+    private String smsNumber;
+	/** 用户编号 */
+    @Excel(name = "用户编号", width = 15)
+    @ApiModelProperty(value = "用户编号")
+    private String userNo;
+	/** 入网时间 */
+    @Excel(name = "入网时间", width = 15)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyyMMdd")
+    @DateTimeFormat(pattern="yyyyMMdd")
+    @ApiModelProperty(value = "入网时间")
+    private String networkAccessTime;
+	/** 用户状态 */
+    //@Excel(name = "用户状态", width = 15)
+    @ApiModelProperty(value = "用户状态")
+    private String userState;
+	/** 用户发展员工 */
+    @Excel(name = "用户发展员工", width = 15)
+    @ApiModelProperty(value = "用户发展员工")
+    private String staffInfo;
+    /** 员工姓名 */
+   // @Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工姓名")
+    private String staffUsername;
+    /** 员工姓名 */
+    //@Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工姓名")
+    private String staffName;
+    /** 员工编号 */
+    //@Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工编号")
+    private String staffNo;
+	/** 用户发展二级部门 */
+   // @Excel(name = "用户发展二级部门", width = 15)
+    @ApiModelProperty(value = "用户发展二级部门")
+    private String staffDeptLevel2;
+    /** 员工二级部门 */
+   // @Excel(name = "员工二级部门", width = 15)
+    @ApiModelProperty(value = "员工二级部门")
+    private String staffDeptLevel2Name;
+    /** 员工二级部门编号 */
+ //   @Excel(name = "员工二级部门编号", width = 15)
+    @ApiModelProperty(value = "员工二级部门编号")
+    private String staffDeptLevel2No;
+	/** 用户发展三级部门 */
+   // @Excel(name = "用户发展三级部门", width = 15)
+    @ApiModelProperty(value = "用户发展三级部门")
+    private String staffDeptLevel3;
+    /** 员工三级部门 */
+   // @Excel(name = "员工三级部门", width = 15)
+    @ApiModelProperty(value = "员工三级部门")
+    private String staffDeptLevel3Name;
+    /** 员工三级部门编号 */
+    //@Excel(name = "员工三级部门编号", width = 15)
+    @ApiModelProperty(value = "员工三级部门编号")
+    private String staffDeptLevel3No;
+	/** 用户开通状态 (1:开通;2:拆机)*/
+    //@Excel(name = "用户开通状态", width = 15)
+    @ApiModelProperty(value = "用户开通状态")
+    private Integer userOpenState;
+	/** 码号 */
+    //@Excel(name = "码号", width = 15)
+    @ApiModelProperty(value = "码号")
+    private String smsNumberPrefix;
+	/** 号码详细用途 */
+    //@Excel(name = "号码详细用途", width = 15)
+    @ApiModelProperty(value = "号码详细用途")
+    private String smsNumberUsage;
+	/** 客户经理 */
+    //@Excel(name = "客户经理", width = 15)
+    @ApiModelProperty(value = "客户经理")
+    private String accountManager;
+	/** 客户经理手机号 */
+    //@Excel(name = "客户经理手机号", width = 15)
+    @ApiModelProperty(value = "客户经理手机号")
+    private String accountManagerPhone;
+	/** 码号使用单位联系人 */
+    //@Excel(name = "码号使用单位联系人", width = 15)
+    @ApiModelProperty(value = "码号使用单位联系人")
+    private String customerContacts;
+	/** 码号使用单位联系人手机号 */
+   // @Excel(name = "码号使用单位联系人手机号", width = 15)
+    @ApiModelProperty(value = "码号使用单位联系人手机号")
+    private String customerContactsPhone;
+	/** 合同到期时间(YYYY-MM-DD) */
+    //@Excel(name = "合同到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "合同到期时间(YYYY-MM-DD)")
+    private Date contractExpireTime;
+	/** 码号证书到期时间(YYYY-MM-DD) */
+    //@Excel(name = "码号证书到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "码号证书到期时间(YYYY-MM-DD)")
+    private Date smsNumberCertificateExpireTime;
+	/** 备案通知到期时间(YYYY-MM-DD) */
+    //@Excel(name = "备案通知到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "备案通知到期时间(YYYY-MM-DD)")
+    private Date recordNoticeExpireTime;
+	/** 增值业务许可证到期时间(YYYY-MM-DD) */
+    //@Excel(name = "增值业务许可证到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "增值业务许可证到期时间(YYYY-MM-DD)")
+    private Date valueAddedLicenceExpireTime;
+	/** 营业执照到期时间(YYYY-MM-DD) */
+    //@Excel(name = "营业执照到期时间(YYYY-MM-DD)", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "营业执照到期时间(YYYY-MM-DD)")
+    private Date businessLicenceExpireTime;
+	/** 合同签署主体与实际开通客户是否一致 */
+    //@Excel(name = "合同签署主体与实际开通客户是否一致", width = 15)
+    @ApiModelProperty(value = "合同签署主体与实际开通客户是否一致")
+    private Integer contractOpenCustomerSame;
+	/** 是否有集团价格审批 */
+    //@Excel(name = "是否有集团价格审批", width = 15)
+    @ApiModelProperty(value = "是否有集团价格审批")
+    private Integer groupPriceApproval;
+	/** 资料是否完整 */
+    //@Excel(name = "资料是否完整", width = 15)
+    @ApiModelProperty(value = "资料是否完整")
+    private Integer dataComplete;
+	/** 是否完成整改 */
+    //@Excel(name = "是否完成整改", width = 15)
+    @ApiModelProperty(value = "是否完成整改")
+    private Integer rectifyReformOver;
+    /** 稽核状态 0:未处理;1:未完善;2:待稽核;3:已整改;4:待整改;5:稽核通过; */
+    //@Excel(name = "稽核状态", width = 15, dicCode = "sms_check_check_state")
+    @Dict(dicCode = "sms_check_check_state")
+    @ApiModelProperty(value = "稽核状态")
+    private Integer checkState;
+	/** 描述 */
+    //@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private String description;
+	/** 删除标识 */
+   // @Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+    private Integer delFlag;
+	/** 创建人 */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/** 创建日期 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/** 更新人 */
+    @ApiModelProperty(value = "更新人")
+    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;
+	/** 所属部门 */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+
+    /**提交材料日期*/
+   // @Excel(name = "提交材料日期", width = 15)
+    @ApiModelProperty(value = "提交材料日期")
+    private String submitSpecialDate;
+
+    /**关停标签*/
+   // @Excel(name = "关停标签", width = 15)
+    @ApiModelProperty(value = "关停标签)")
+    private String shutdownLabel;
+
+    /**漫游被关停日期(ABM查询)*/
+   // @Excel(name = "漫游被关停日期(ABM查询)", width = 15)
+    @ApiModelProperty(value = "漫游被关停日期(ABM查询))")
+    private Date shutdownLabelDate;
+
+    /** 复开时间 */
+   // @Excel(name = "复开时间", width = 15)
+    @ApiModelProperty(value = "复开时间")
+    private Date reopenTime;
+
+    /** 有无特审单 */
+    //@Excel(name = "有无特审单", width = 15)
+    @ApiModelProperty(value = "有无特审单/签报")
+    private String materialLabel;
+
+    /** 有无特审单 */
+   // @Excel(name = "是否自查实名制合规", width = 15)
+    @ApiModelProperty(value = "是否自查实名制合规")
+    private String nameFindCompliance;
+
+    /**客户信息所属类型:1:行短稽核 2:物联网业务稽核 3.复开审批 4.中继线稽核*/
+    @ApiModelProperty(value = "客户信息所属稽核")
+    private Integer type;
+}
+

+ 10 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoErrorMapper.java

@@ -0,0 +1,10 @@
+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.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoError;
+
+@Mapper
+public interface SmsCheckCustomerInfoErrorMapper extends BaseMapper<SmsCheckCustomerInfoError> {
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.UpdateProvider;
+import org.jeecg.common.system.vo.SysDepartModel;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCustomerInfoGroupByCheckState;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
@@ -23,6 +24,9 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class, method = "selectCompanyList")
     List<SmsCheckCustomerInfo> selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
+    @SelectProvider(type = ProviderClass.class, method = "selectSysDepartModel")
+    List<SysDepartModel> selectSysDepartModel();
+
     @SelectProvider(type = ProviderClass.class, method = "checkInfoWarningCount")
     Integer checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
@@ -44,6 +48,16 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
 
     class ProviderClass {
 
+        public String selectSysDepartModel(){
+
+            StringBuilder sql = new StringBuilder();
+
+            sql.append(" select *  from sys_depart where del_flag =0 ");
+
+            return sql.toString();
+        }
+
+
         public String groupCheckState(String startDate, String endDate, String taskId) {
             StringBuilder sql = new StringBuilder();
 

+ 22 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISmsCheckCustomerInfoErrorService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.system.vo.SysDepartModel;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoError;
+import org.jeecg.modules.smscheck.entity.SmsCustomerInfoGroupByCheckState;
+import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
+import org.jeecg.modules.smscheck.vo.SmsCheckTaskVo;
+
+import java.util.List;
+
+/**
+ * @description 客户信息
+ * @author jeecg-boot
+ * @date 2022-06-22
+ * @version V1.0
+ */
+public interface ISmsCheckCustomerInfoErrorService extends IService<SmsCheckCustomerInfoError> {
+
+
+}

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.smscheck.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.system.vo.SysDepartModel;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCustomerInfoGroupByCheckState;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
@@ -28,4 +29,7 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
     List<SmsCheckCustomerInfoTaskVo> checkInfoWarningPageList(Integer pageNo, Integer pageSize);
 
     List<SmsCustomerInfoGroupByCheckState> groupCheckState(String startDate, String endDate,String taskId);
+
+    List<SysDepartModel> getSysDepartModel();
+
 }

+ 14 - 0
tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/ISmsCheckCustomerInfoErrorServiceImpl.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoError;
+import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerInfoErrorMapper;
+import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerInfoMapper;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoErrorService;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ISmsCheckCustomerInfoErrorServiceImpl  extends ServiceImpl<SmsCheckCustomerInfoErrorMapper, SmsCheckCustomerInfoError> implements ISmsCheckCustomerInfoErrorService {
+}

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.smscheck.service.impl;
 
+import org.jeecg.common.system.vo.SysDepartModel;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCustomerInfoGroupByCheckState;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
@@ -51,6 +52,11 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
         return smsCheckCustomerInfoMapper.groupCheckState( startDate,  endDate,id);
     }
 
+    @Override
+    public List<SysDepartModel> getSysDepartModel() {
+        return smsCheckCustomerInfoMapper.selectSysDepartModel();
+    }
+
     @Override
     public List<SmsCheckCustomerInfo> selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo) {
         return smsCheckCustomerInfoMapper.selectCompanyList(smsCheckCustomerInfo);