1、稽核任务完善

2、修改表结构

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

@@ -7,11 +7,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 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 com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
@@ -91,6 +94,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 		smsCheckTask.setTaskState(0);
 		smsCheckTask.setCustomerCount(0);
 		smsCheckTask.setCheckCount(0);
+		smsCheckTask.setDelFlag(CommonConstant.DEL_FLAG_0);
 		taskService.save(smsCheckTask);
 		return Result.OK("添加成功!");
 	}
@@ -195,6 +199,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 		 ImportParams params = new ImportParams();
 		 params.setTitleRows(1);
 		 try {
+			 // 工具类缺陷，默认导入全部sheet页，会导致
 			 List<SmsCheckCustomerInfoVo> list = ExcelImportUtil.importExcel(
 					 file.getInputStream(), SmsCheckCustomerInfoVo.class, params);
 			 List<SmsCheckCustomerInfoVo> voList = new ArrayList<>();
@@ -230,15 +235,18 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	 /**
 	  * 通过excel导入数据
 	  *
+	  * @param taskId 任务id
 	  * @param list 数据
 	  * @return 导入结果
 	  */
-	 @PostMapping(value = "/importCustomerData")
-	 public Result<?> importCustomerData(@RequestBody List<SmsCheckCustomerInfoVo> list) {
+	 @PostMapping(value = "/{taskId}/importCustomerData")
+	 public Result<?> importCustomerData(@PathVariable String taskId, @RequestBody List<SmsCheckCustomerInfoVo> list) {
 		 List<SmsCheckCustomerInfo> dataList = new ArrayList<>();
+		 int customerCount = 0;
 		 for (int i = 0; i < list.size(); i++) {
 			 SmsCheckCustomerInfoVo infoVo = list.get(i);
 			 SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
+			 infoVo.setTaskId(taskId);
 			 BeanUtil.copyProperties(infoVo, info, true);
 			 info.setStaffInfo(infoVo.getStaffNo());
 			 dataList.add(info);
@@ -249,9 +257,16 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 			 if (count > 0) {
 				 return Result.error("客户[" + info.getCustomerNo() + "]已存在！");
 			 } else {
+				 customerCount++;
 				 customerInfoService.save(info);
 			 }
 		 }
+		 SmsCheckTask task = taskService.getById(taskId);
+		 // 更新导入
+		 if (customerCount > 0) {
+			 task.setCustomerCount(task.getCustomerCount() + customerCount);
+			 taskService.updateById(task);
+		 }
 		 return Result.OK("导入成功！");
 	 }
 
@@ -263,17 +278,37 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 	  * @return 客户信息
 	  */
 	 private SmsCheckCustomerInfoVo checkCustomerInfo(SmsCheckCustomerInfoVo vo, Tuple dictTuple) {
-		 // 过滤客户编号和用户编号为空的信息
+		 // 过滤客户编号和员工编号为空的信息
 		 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(1));
-			 vo.setStaffNumber(staffInfos.get(2));
+			 vo.setStaffNo(staffInfos.get(2));
+		 }
+
+		 // 拆分员工二级部门
+		 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;
@@ -291,10 +326,6 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
 			 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

@@ -65,14 +65,38 @@ public class SmsCheckCustomerInfo implements Serializable {
     @Excel(name = "用户发展员工", width = 15)
     @ApiModelProperty(value = "用户发展员工")
     private String staffInfo;
+    /** 员工姓名 */
+    @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;
 	/** 用户开通状态 */
     @Excel(name = "用户开通状态", width = 15)
     @ApiModelProperty(value = "用户开通状态")

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

@@ -72,7 +72,7 @@ public class SmsCheckTask implements Serializable {
     private Integer checkCount;
 	/** 删除标识 */
     @ApiModelProperty(value = "删除标识")
-    private String delFlag;
+    private Integer delFlag;
 	/** 创建人 */
     @ApiModelProperty(value = "创建人")
     private String createBy;

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

@@ -26,10 +26,10 @@ import java.io.Serializable;
 public class SmsCheckCustomerInfoVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/** 主键 */
-    @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private String id;
+	/** 序号 */
+    @Excel(name = "序号", width = 15)
+    @ApiModelProperty(value = "序号")
+    private String no;
 	/** 任务id */
     @Excel(name = "任务id", width = 15)
     @ApiModelProperty(value = "任务id")
@@ -62,27 +62,42 @@ public class SmsCheckCustomerInfoVo implements Serializable {
     @Excel(name = "用户发展员工", width = 15)
     @ApiModelProperty(value = "用户发展员工")
     private String staffInfo;
+    /** 员工姓名 */
+    @ApiModelProperty(value = "员工姓名")
+    private String staffName;
+    /** 员工工号 */
+    @ApiModelProperty(value = "员工工号")
+    private String staffNo;
+
 	/** 用户发展二级部门 */
     @Excel(name = "用户发展二级部门", width = 15)
     @ApiModelProperty(value = "用户发展二级部门")
     private String staffDeptLevel2;
+    /** 员工二级部门编号 */
+    @Excel(name = "员工二级部门编号", width = 15)
+    @ApiModelProperty(value = "员工二级部门编号")
+    private String staffDeptLevel2No;
+    /** 员工二级部门名称 */
+    @Excel(name = "员工二级部门名称", width = 15)
+    @ApiModelProperty(value = "员工二级部门名称")
+    private String staffDeptLevel2Name;
 	/** 用户发展三级部门 */
     @Excel(name = "用户发展三级部门", width = 15)
     @ApiModelProperty(value = "用户发展三级部门")
     private String staffDeptLevel3;
-
+    /** 员工三级部门编号 */
+    @Excel(name = "员工三级部门编号", width = 15)
+    @ApiModelProperty(value = "员工三级部门编号")
+    private String staffDeptLevel3No;
+    /** 员工三级部门名称 */
+    @Excel(name = "员工三级部门名称", width = 15)
+    @ApiModelProperty(value = "员工三级部门名称")
+    private String staffDeptLevel3Name;
     /** 错误信息 */
     @ApiModelProperty(value = "错误信息")
     private String errorMsg;
-    /** 员工姓名 */
-    @ApiModelProperty(value = "员工姓名")
-    private String staffName;
-    /** 员工编号 */
-    @ApiModelProperty(value = "员工编号")
-    private String staffNo;
-    /** 员工编号2 */
-    @ApiModelProperty(value = "员工编号2")
-    private String staffNumber;
+
+
 
 }