1、完善稽核任务导入功能

2、添加稽核客户信息功能

pom.xml

@@ -40,7 +40,7 @@
 		<ojdbc6.version>11.2.0.3</ojdbc6.version>
 		<sqljdbc4.version>4.0</sqljdbc4.version>
 		<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
-		<hutool.version>5.3.8</hutool.version>
+		<hutool.version>5.8.3</hutool.version>
 		<redisson.version>3.16.1</redisson.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<guava.version>29.0-jre</guava.version>

tnc-sms/pom.xml

@@ -16,6 +16,10 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>tnc-base-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>tnc-system-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -0,0 +1,156 @@
+package org.jeecg.modules.smscheck.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @description 客户信息
+ * @author jeecg-boot
+ * @date 2022-06-22
+ * @version V1.0
+ */
+@Api(tags="客户信息")
+@RestController
+@RequestMapping("/smsCheck/customerInfo")
+@Slf4j
+public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCustomerInfo, ISmsCheckCustomerInfoService> {
+	@Autowired
+	private ISmsCheckCustomerInfoService smsCheckCustomerInfoService;
+
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param smsCheckCustomerInfo 对象
+	  * @param pageNo 页码
+	  * @param pageSize 每页条数
+	  * @param request 请求
+	  * @return 结果
+	  */
+	//@AutoLog(value = "客户信息-分页列表查询")
+	@ApiOperation(value="客户信息-分页列表查询", notes="客户信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<SmsCheckCustomerInfo>> queryPageList(SmsCheckCustomerInfo smsCheckCustomerInfo,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest request) {
+		QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckCustomerInfo, request.getParameterMap());
+		Page<SmsCheckCustomerInfo> page = new Page<>(pageNo, pageSize);
+		IPage<SmsCheckCustomerInfo> pageList = smsCheckCustomerInfoService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 添加
+	  *
+	  * @param smsCheckCustomerInfo 对象
+	  * @return 结果
+	  */
+	@AutoLog(value = "客户信息-添加")
+	@ApiOperation(value="客户信息-添加", notes="客户信息-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+		smsCheckCustomerInfoService.save(smsCheckCustomerInfo);
+		return Result.OK("添加成功！");
+	}
+
+	 /**
+	  * 编辑
+	  *
+	  * @param smsCheckCustomerInfo 对象
+	  * @return 结果
+	  */
+	@AutoLog(value = "客户信息-编辑")
+	@ApiOperation(value="客户信息-编辑", notes="客户信息-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+		smsCheckCustomerInfoService.updateById(smsCheckCustomerInfo);
+		return Result.OK("编辑成功!");
+	}
+	
+	 /**
+	  * 通过id删除
+	  *
+	  * @param id 主键
+	  * @return 结果
+	  */
+	@AutoLog(value = "客户信息-通过id删除")
+	@ApiOperation(value="客户信息-通过id删除", notes="客户信息-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id") String id) {
+		smsCheckCustomerInfoService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	 /**
+	  * 批量删除
+	  *
+	  * @param ids 主键
+	  * @return 结果
+	  */
+	@AutoLog(value = "客户信息-批量删除")
+	@ApiOperation(value="客户信息-批量删除", notes="客户信息-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids") String ids) {
+		this.smsCheckCustomerInfoService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	 /**
+	  * 通过id查询
+	  *
+	  * @param id 主键
+	  * @return 数据
+	  */
+	//@AutoLog(value = "客户信息-通过id查询")
+	@ApiOperation(value="客户信息-通过id查询", notes="客户信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<SmsCheckCustomerInfo> queryById(@RequestParam(name="id") String id) {
+		SmsCheckCustomerInfo smsCheckCustomerInfo = smsCheckCustomerInfoService.getById(id);
+		if(smsCheckCustomerInfo==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(smsCheckCustomerInfo);
+	}
+
+	 /**
+	  * 导出excel
+	  *
+	  * @param request 请求
+	  * @param smsCheckCustomerInfo 对象
+	  * @return excel文件
+	  */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        return super.exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerInfo.class, "客户信息");
+    }
+
+	 /**
+	  * 通过excel导入数据
+	  *
+	  * @param request 请求
+	  * @param response 响应
+	  * @return 导入结果
+	  */
+    @PostMapping(value = "/importExcel")
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, SmsCheckCustomerInfo.class);
+    }
+
+}

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

@@ -1,11 +1,25 @@
 package org.jeecg.modules.smscheck.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.lang.Tuple;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCheckTask;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
 import org.jeecg.modules.smscheck.service.ISmsCheckTaskService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,8 +28,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,8 +51,11 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 @Slf4j
 public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCheckTaskService> {
 	@Autowired
-	private ISmsCheckTaskService smsCheckTaskService;
-
+	private ISmsCheckTaskService taskService;
+	 @Autowired
+	 private ISmsCheckCustomerInfoService customerInfoService;
+    @Autowired
+	private ISysBaseAPI sysBaseApi;
 	 /**
 	  * 分页列表查询
 	  *
@@ -53,7 +74,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 								   HttpServletRequest request) {
 		QueryWrapper<SmsCheckTask> queryWrapper = QueryGenerator.initQueryWrapper(smsCheckTask, request.getParameterMap());
 		Page<SmsCheckTask> page = new Page<>(pageNo, pageSize);
-		IPage<SmsCheckTask> pageList = smsCheckTaskService.page(page, queryWrapper);
+		IPage<SmsCheckTask> pageList = taskService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 
@@ -68,7 +89,9 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody SmsCheckTask smsCheckTask) {
 		smsCheckTask.setTaskState(0);
-		smsCheckTaskService.save(smsCheckTask);
+		smsCheckTask.setCustomerCount(0);
+		smsCheckTask.setCheckCount(0);
+		taskService.save(smsCheckTask);
 		return Result.OK("添加成功!");
 	}
 
@@ -82,7 +105,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	@ApiOperation(value="稽核任务-编辑", notes="稽核任务-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody SmsCheckTask smsCheckTask) {
-		smsCheckTaskService.updateById(smsCheckTask);
+		taskService.updateById(smsCheckTask);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -96,7 +119,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	@ApiOperation(value="稽核任务-通过id删除", notes="稽核任务-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id") String id) {
-		smsCheckTaskService.removeById(id);
+		taskService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -110,7 +133,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	@ApiOperation(value="稽核任务-批量删除", notes="稽核任务-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids") String ids) {
-		this.smsCheckTaskService.removeByIds(Arrays.asList(ids.split(",")));
+		this.taskService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -124,7 +147,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	@ApiOperation(value="稽核任务-通过id查询", notes="稽核任务-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<SmsCheckTask> queryById(@RequestParam(name="id") String id) {
-		SmsCheckTask smsCheckTask = smsCheckTaskService.getById(id);
+		SmsCheckTask smsCheckTask = taskService.getById(id);
 		if(smsCheckTask==null) {
 			return Result.error("未找到对应数据");
 		}
@@ -155,4 +178,124 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         return super.importExcel(request, response, SmsCheckTask.class);
     }
 
-}
+	 /**
+	  * 通过excel导入数据
+	  *
+	  * @param file 请求
+	  * @return 导入结果
+	  */
+	 @PostMapping(value = "/importCustomerExcel")
+	 public Result<?> importCustomerExcel(@RequestPart("file") MultipartFile file) {
+		 String filename = file.getOriginalFilename();
+		 if (!filename.endsWith(".xlsx") && !filename.endsWith(".xls")) {
+			 return Result.error("文件类型不正确！请导入文件类型->.xlsx或.xls");
+		 }
+		 Dict dict = new Dict();
+
+		 ImportParams params = new ImportParams();
+		 params.setTitleRows(1);
+		 try {
+			 List<SmsCheckCustomerInfoVo> list = ExcelImportUtil.importExcel(
+					 file.getInputStream(), SmsCheckCustomerInfoVo.class, params);
+			 List<SmsCheckCustomerInfoVo> voList = new ArrayList<>();
+			 int errorCount = 0;
+
+			 // 获取所有字典值
+			 List<DictModel> dictModels = sysBaseApi.getDictItems("user_type");
+			 Dict dictItemMap = Dict.create();
+			 dictModels.forEach(model -> {
+				 dictItemMap.put(model.getValue(), model.getText());
+			 });
+
+			 Tuple dictTuple = new Tuple(dictItemMap);
+
+			 for (SmsCheckCustomerInfoVo vo : list) {
+				 SmsCheckCustomerInfoVo infoVo = checkCustomerInfo(vo, dictTuple);
+				 if (ObjectUtil.isNotNull(infoVo)) {
+					 if (StrUtil.isNotBlank(infoVo.getErrorMsg())) {
+						 errorCount++;
+					 }
+					 voList.add(infoVo);
+				 }
+			 }
+			 dict.put("errorCount", errorCount);
+			 dict.put("data", voList);
+		 } catch (Exception e) {
+			 log.error("客户信息导入失败", e);
+		 }
+
+		 return Result.ok(dict);
+	 }
+
+	 /**
+	  * 通过excel导入数据
+	  *
+	  * @param list 数据
+	  * @return 导入结果
+	  */
+	 @PostMapping(value = "/importCustomerData")
+	 public Result<?> importCustomerData(@RequestBody List<SmsCheckCustomerInfoVo> list) {
+		 List<SmsCheckCustomerInfo> dataList = new ArrayList<>();
+		 for (int i = 0; i < list.size(); i++) {
+			 SmsCheckCustomerInfoVo infoVo = list.get(i);
+			 SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
+			 BeanUtil.copyProperties(infoVo, info, true);
+			 info.setStaffInfo(infoVo.getStaffNo());
+			 dataList.add(info);
+			 long count = customerInfoService.count(
+					 new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+							 .eq(SmsCheckCustomerInfo::getCustomerNo, info.getCustomerNo())
+							 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+			 if (count > 0) {
+				 return Result.error("客户[" + info.getCustomerNo() + "]已存在！");
+			 } else {
+				 customerInfoService.save(info);
+			 }
+		 }
+		 return Result.OK("导入成功！");
+	 }
+
+	 /**
+	  * 校验客户信息
+	  *
+	  * @param vo 客户信息
+	  * @param dictTuple 字典转换
+	  * @return 客户信息
+	  */
+	 private SmsCheckCustomerInfoVo checkCustomerInfo(SmsCheckCustomerInfoVo vo, Tuple dictTuple) {
+		 // 过滤客户编号和用户编号为空的信息
+		 if (StrUtil.isBlank(vo.getCustomerNo()) && StrUtil.isBlank(vo.getUserNo())) {
+			 return null;
+		 }
+		 // 拆分员工号
+		 String staffInfo = vo.getStaffInfo();
+		 List<String> staffInfos = removeBrackets(staffInfo);
+		 if (staffInfos.size() == 3) {
+			 vo.setStaffName(staffInfos.get(0));
+			 vo.setStaffNo(staffInfos.get(1));
+			 vo.setStaffNumber(staffInfos.get(2));
+		 }
+
+		 return vo;
+	 }
+
+	 /**
+	  * 移除括号并获取分段数据
+	  *
+	  * @param data 数据
+	  * @return 集合
+	  */
+	 private List<String> removeBrackets(String data) {
+		 List<String> dataList = new ArrayList<>();
+		 if (data.contains("(")) {
+			 data = StrUtil.removeAll(data,")");
+			 dataList = StrUtil.split(data, "(");
+		 }
+		 if (data.contains("（")) {
+			 data = StrUtil.removeAll(data,"）");
+			 dataList = StrUtil.split(data, "（");
+		 }
+		 return dataList;
+	 }
+
+ }

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

@@ -0,0 +1,179 @@
+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.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description 客户信息
+ * @author jeecg-boot
+ * @date 2022-06-22
+ * @version V1.0
+ */
+@Data
+@TableName("sms_check_customer_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_customer_info对象", description="客户信息")
+public class SmsCheckCustomerInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/** 任务id */
+    @Excel(name = "任务id", width = 15)
+    @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)
+    @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 staffDeptLevel2;
+	/** 用户发展三级部门 */
+    @Excel(name = "用户发展三级部门", width = 15)
+    @ApiModelProperty(value = "用户发展三级部门")
+    private String staffDeptLevel3;
+	/** 用户开通状态 */
+    @Excel(name = "用户开通状态", width = 15)
+    @ApiModelProperty(value = "用户开通状态")
+    private String 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 String contractOpenCustomerSame;
+	/** 是否有集团价格审批 */
+    @Excel(name = "是否有集团价格审批", width = 15)
+    @ApiModelProperty(value = "是否有集团价格审批")
+    private String groupPriceApproval;
+	/** 资料是否完整 */
+    @Excel(name = "资料是否完整", width = 15)
+    @ApiModelProperty(value = "资料是否完整")
+    private String dataComplete;
+	/** 是否完成整改 */
+    @Excel(name = "是否完成整改", width = 15)
+    @ApiModelProperty(value = "是否完成整改")
+    private String rectifyReformOver;
+	/** 描述 */
+    @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;
+
+}
+

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

@@ -65,13 +65,12 @@ public class SmsCheckTask implements Serializable {
 	/** 客户总数 */
     @Excel(name = "客户总数", width = 15)
     @ApiModelProperty(value = "客户总数")
-    private String customerCount;
+    private Integer customerCount;
 	/** 稽核数 */
     @Excel(name = "稽核数", width = 15)
     @ApiModelProperty(value = "稽核数")
-    private String checkCount;
+    private Integer checkCount;
 	/** 删除标识 */
-    @Excel(name = "删除标识", width = 15)
     @ApiModelProperty(value = "删除标识")
     private String delFlag;
 	/** 创建人 */

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+
+/**
+ * @description 客户信息
+ * @author jeecg-boot
+ * @date 2022-06-22
+ * @version V1.0
+ */
+public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerInfo> {
+
+}

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

@@ -0,0 +1,5 @@
+<?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.SmsCheckCustomerInfoMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+
+/**
+ * @description 客户信息
+ * @author jeecg-boot
+ * @date 2022-06-22
+ * @version V1.0
+ */
+public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerInfo> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerInfoMapper;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @description 客户信息
+ * @author jeecg-boot
+ * @date 2022-06-22
+ * @version V1.0
+ */
+@Service
+public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustomerInfoMapper, SmsCheckCustomerInfo> implements ISmsCheckCustomerInfoService {
+
+}

tnc-sms/src/main/java/org/jeecg/modules/smscheck/vo/SmsCheckCustomerInfoVo.java

@@ -0,0 +1,88 @@
+package org.jeecg.modules.smscheck.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @description 客户信息
+ * @author jeecg-boot
+ * @date 2022-06-22
+ * @version V1.0
+ */
+@Data
+@TableName("sms_check_customer_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_customer_info对象", description="客户信息")
+public class SmsCheckCustomerInfoVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/** 任务id */
+    @Excel(name = "任务id", width = 15)
+    @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)
+    @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 staffDeptLevel2;
+	/** 用户发展三级部门 */
+    @Excel(name = "用户发展三级部门", width = 15)
+    @ApiModelProperty(value = "用户发展三级部门")
+    private String staffDeptLevel3;
+
+    /** 错误信息 */
+    @ApiModelProperty(value = "错误信息")
+    private String errorMsg;
+    /** 员工姓名 */
+    @ApiModelProperty(value = "员工姓名")
+    private String staffName;
+    /** 员工编号 */
+    @ApiModelProperty(value = "员工编号")
+    private String staffNo;
+    /** 员工编号2 */
+    @ApiModelProperty(value = "员工编号2")
+    private String staffNumber;
+
+}
+