导出限制本次错误数据

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

@@ -65,6 +65,7 @@ public class SmsCheckCustomerInfoErrorController extends JeecgController<SmsChec
         LambdaQueryWrapper<SmsCheckCustomerInfoError> query = new LambdaQueryWrapper<SmsCheckCustomerInfoError>();
         query.eq(SmsCheckCustomerInfoError::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
         query.eq(SmsCheckCustomerInfoError::getTaskId, object.getTaskId());
+        query.eq(SmsCheckCustomerInfoError::getBatchNo, object.getBatchNo());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
         // Step.2 获取导出数据

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

@@ -260,6 +260,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
      */
     @PostMapping(value = "/{taskId}/importCustomerData")
     public Result<?> importCustomerData(@PathVariable String taskId, @RequestBody List<SmsCheckCustomerInfoVo> list) {
+        UUID uuid = UUID.randomUUID();
         //1同一个任务 用户编号不可一致
         //2 员工得存在
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -269,6 +270,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         int customerCount = 0;
         for (int i = 0; i < list.size(); i++) {
             SmsCheckCustomerInfoVo infoVo = list.get(i);
+            infoVo.setBatchNo(uuid.toString());
             infoVo.setTaskId(taskId);
             SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
             BeanUtil.copyProperties(infoVo, info, true);
@@ -311,17 +313,36 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
                             .eq(SmsCheckCustomerInfo::getTaskId, info.getTaskId())
                             .eq(SmsCheckCustomerInfo::getUserNo, info.getUserNo())
                             .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
-            if (count > 0) {
+
+            long counted = customerInfoService.count(
+                    new LambdaQueryWrapper<SmsCheckCustomerInfo>()
+                            .eq(SmsCheckCustomerInfo::getTaskId, info.getTaskId())
+                            .eq(SmsCheckCustomerInfo::getCustomerNo, info.getCustomerNo())
+                            .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0));
+
+            if (count > 0 && counted > 0) {
                 infoVo.setResult("0");
-                infoVo.setErrorMsg("用户编号重复");
+                infoVo.setErrorMsg("用户编号重复,客户编号重复");
                 listErro.add(infoVo);
-                // TODO 重复处理，放校验里面？
+            }else {
+                if (count > 0 && counted < 0) {
+                    infoVo.setResult("0");
+                    infoVo.setErrorMsg("用户编号重复");
+                    listErro.add(infoVo);
+                    // TODO 重复处理，放校验里面？
 //				 return Result.error("客户[" + info.getCustomerNo() + "]已存在！");
-            } else {
-                customerCount++;
-                customerInfoService.save(info);
-                infoVo.setResult("1");
-                listErro.add(infoVo);
+                } else if (count < 0 && counted > 0) {
+                    infoVo.setResult("0");
+                    infoVo.setErrorMsg("客户编号重复");
+                    listErro.add(infoVo);
+                    // TODO 重复处理，放校验里面？
+//				 return Result.error("客户[" + info.getCustomerNo() + "]已存在！");
+                } else {
+                    customerCount++;
+                    customerInfoService.save(info);
+                    infoVo.setResult("1");
+                    listErro.add(infoVo);
+                }
             }
 
             // 添加公司信息 start
@@ -373,12 +394,11 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
                     SmsCheckCustomerInfoError smsCheckCustomerInfoError =new SmsCheckCustomerInfoError();
                     BeanUtils.copyProperties(smsCheckCustomerInfoVo, smsCheckCustomerInfoError);
                     smsCheckCustomerInfoError.setDelFlag(0);
+                    smsCheckCustomerInfoError.setBatchNo(uuid.toString());
                     smsCheckCustomerInfoErrors.add(smsCheckCustomerInfoError);
                 }
 
             }
-
-
             boolean b = smsCheckCustomerInfoErrorService.saveOrUpdateBatch(smsCheckCustomerInfoErrors);
             int i=0;
         }

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

@@ -252,43 +252,46 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
     private Map<String,String>getMapByResult(SmcTruckCheckLog smsCheckCustomerDataLog){
         HashMap <String,String> map =new HashMap<>();
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getApplySignResult() ) && !smsCheckCustomerDataLog.getApplySignResult().equals("1")){
-            map.put("合同到期时间结果","未通过");
+            map.put("applySignResult","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getInfoResult() ) && !smsCheckCustomerDataLog.getInfoResult().equals("1")){
+            map.put("infoResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getThreePhotosResult() ) && !smsCheckCustomerDataLog.getThreePhotosResult().equals("1")){
-            map.put("营业执照到期时间结果","未通过");
+            map.put("getThreePhotosResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCommitmentBookResult() ) && !smsCheckCustomerDataLog.getCommitmentBookResult().equals("1")){
-            map.put("码号证书到期时间结果","未通过");
+            map.put("getCommitmentBookResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getIsPriceApprovalResult() ) && !smsCheckCustomerDataLog.getIsPriceApprovalResult().equals("1")){
-            map.put("备案通知到期时间结果","未通过");
+            map.put("getIsPriceApprovalResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getLegalIdCardResult() ) && !smsCheckCustomerDataLog.getLegalIdCardResult().equals("1")){
-            map.put("增值业务许可证到期时间结果","未通过");
+            map.put("getLegalIdCardResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getOperatorIdCardResult() ) && !smsCheckCustomerDataLog.getOperatorIdCardResult().equals("1")){
-            map.put("法人/责任人证件结果","未通过");
+            map.put("getOperatorIdCardResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getAuthorizeBookResult() ) && !smsCheckCustomerDataLog.getAuthorizeBookResult().equals("1")){
-            map.put("责任人授权书结果","未通过");
+            map.put("getAuthorizeBookResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getZZBusinessLicenseResult() ) && !smsCheckCustomerDataLog.getZZBusinessLicenseResult().equals("1")){
-            map.put("经办人证件结果","未通过");
+            map.put("getZZBusinessLicenseResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCenterBusinessResult() ) && !smsCheckCustomerDataLog.getCenterBusinessResult().equals("1")){
-            map.put("经办人手持身份证照片结果","未通过");
+            map.put("getCenterBusinessResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getContractOrProveResult() ) && !smsCheckCustomerDataLog.getContractOrProveResult().equals("1")){
-            map.put("机房设备照片结果","未通过");
+            map.put("getContractOrProveResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getRiskTableResult() ) && !smsCheckCustomerDataLog.getRiskTableResult().equals("1")){
-            map.put("短信模板结果","未通过");
+            map.put("getRiskTableResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTrunkTableResult() ) && !smsCheckCustomerDataLog.getTrunkTableResult().equals("1")){
-            map.put("端口类短信业务责任承诺书结果","未通过");
+            map.put("getTrunkTableResult","未通过");
         }
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTrunkContractResult() ) && !smsCheckCustomerDataLog.getTrunkContractResult().equals("1")){
-            map.put("信息安全责任承诺书结果","未通过");
+            map.put("getTrunkContractResult","未通过");
         }
 
         return map;

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

@@ -32,40 +32,62 @@ public class SmcTruckCheckLog implements Serializable {
     private String dataId;
     @ApiModelProperty(value = "基本信息稽核稽核结果")
     private String infoResult;
-    @ApiModelProperty(value = "基本信息结果备注")
+    @ApiModelProperty(value = "基本信息稽核稽核结果备注")
     private String infoResultRemark;
 
+    @ApiModelProperty(value = "入网申请签报稽核结果")
     private String applySignResult;
+    @ApiModelProperty(value = "入网申请签报稽核结果备注")
     private String applySignResultRemark;
     //三张现场照片 threePhotos
+    @ApiModelProperty(value = "三张现场照片稽核结果")
     private String threePhotosResult;
+    @ApiModelProperty(value = "三张现场照片稽核结果备注")
     private String threePhotosResultRemark;
     //责任承诺书
+    @ApiModelProperty(value = "责任承诺书稽核结果")
     private String commitmentBookResult;
+    @ApiModelProperty(value = "责任承诺书稽核结果备注")
     private String commitmentBookResultRemark;
     //突破客户经理管控价是否有固网价格审批
+    @ApiModelProperty(value = "突破客户经理管控价是否有固网价格审批稽核结果")
     private String isPriceApprovalResult;
+    @ApiModelProperty(value = "突破客户经理管控价是否有固网价格审批稽核结果备注")
     private String isPriceApprovalResultRemark;
     //法人身份证
+    @ApiModelProperty(value = "法人身份证稽核结果")
     private String legalIdCardResult;
+    @ApiModelProperty(value = "法人身份证稽核结果备注")
     private String legalIdCardResultRemark;
     //经办人身份证.
+    @ApiModelProperty(value = "经办人身份证稽核结果")
     private String operatorIdCardResult;
+    @ApiModelProperty(value = "经办人身份证稽核结果备注")
     private String operatorIdCardResultRemark;
     //授权函.
+    @ApiModelProperty(value = "授权函稽核结果")
     private String authorizeBookResult;
+    @ApiModelProperty(value = "授权函稽核结果备注")
     private String authorizeBookResultRemark;
     //经营性呼叫中心增值业务许可证.
+    @ApiModelProperty(value = "经营性呼叫中心增值业务许可证稽核结果")
     private String zZBusinessLicenseResult;
+    @ApiModelProperty(value = "经营性呼叫中心增值业务许可证稽核结果备注")
     private String zZBusinessLicenseResultRemark;
     //呼叫中心业务说明.
+    @ApiModelProperty(value = "呼叫中心业务说明稽核结果")
     private String centerBusinessResult;
+    @ApiModelProperty(value = "呼叫中心业务说明稽核结果备注")
     private String centerBusinessResultRemark;
     //房屋租赁合同或房产证明.
+    @ApiModelProperty(value = "房屋租赁合同或房产证明稽核结果")
     private String contractOrProveResult;
+    @ApiModelProperty(value = "房屋租赁合同或房产证明稽核结果备注")
     private String contractOrProveResultRemark;
     //风险评估表
+    @ApiModelProperty(value = "风险评估表稽核结果")
     private String riskTableResult;
+    @ApiModelProperty(value = "风险评估表稽核结果备注")
     private String riskTableResultRemark;
 
     @Override
@@ -82,10 +104,14 @@ public class SmcTruckCheckLog implements Serializable {
     }
 
     //中继线预审表
+    @ApiModelProperty(value = "中继线预审表上传资料稽核结果")
     private String trunkTableResult;
+    @ApiModelProperty(value = "中继线预审表上传资料稽核结果备注")
     private String trunkTableResultRemark;
     //中继线合同
+    @ApiModelProperty(value = "中继线合同稽核结果")
     private String trunkContractResult;
+    @ApiModelProperty(value = "中继线合同稽核结果备注")
     private String trunkContractResultRemark;
 
 

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

@@ -263,7 +263,7 @@ public class SmsCheckCustomerInfoError implements Serializable {
     @ApiModelProperty(value = "错误原因")
     private String errorMsg;
 
-
+    private String batchNo;
 
 }
 

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

@@ -189,6 +189,12 @@ public class SmsTruckCheckCustomerDataAndLog {
     private String trunkContract;
     //中继线合同备注
     private String trunkContractRemark;
+    //中继线预审表
+    private String trunkTableResult;
+    private String trunkTableResultRemark;
+    //中继线合同
+    private String trunkContractResult;
+    private String trunkContractResultRemark;
 
 
 }

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

@@ -72,96 +72,141 @@ public class SmsTruckCustomerData implements Serializable {
     private String staffNo;
 
     //客户经理手机号
+    @ApiModelProperty(value = "客户经理手机号")
     private String managePhone;
     //房屋租赁合同到期时间
+    @ApiModelProperty(value = "房屋租赁合同到期时间")
     private String houseDate;
     //经营型呼叫中心增值许可证到期日
+    @ApiModelProperty(value = "经营型呼叫中心增值许可证到期日")
     private String zZBusinessLicenseDate;
-    //营业执照到期时间 是否长期
+    //营业执照到期时间是否长期
+    @ApiModelProperty(value = "营业执照到期时间是否长期")
     private String businessLicenseDateIs;
     //营业执照到期时间
+    @ApiModelProperty(value = "营业执照到期时间")
     private String businessLicenseDate;
     //合同到期时间
+    @ApiModelProperty(value = "合同到期时间")
     private String contractDate;
     //风险评估等级（非办公自用需提供)
+    @ApiModelProperty(value = "风险评估等级")
     private String riskGrade;
     //实际装机地址
+    @ApiModelProperty(value = "实际装机地址")
     private String installationAddress;
     //楼宇名称
+    @ApiModelProperty(value = "楼宇名称")
     private String floorName;
     //首次激活时间
+    @ApiModelProperty(value = "首次激活时间")
     private String firstActivationDate;
     //客户编号
+    @ApiModelProperty(value = "客户编号")
     private String customerNo;
     //用户编号
+    @ApiModelProperty(value = "用户编号")
     private String userNo;
     //入网时间
+    @ApiModelProperty(value = "入网时间")
     private String networkAccessTime;
     //客户名称
+    @ApiModelProperty(value = "客户名称")
     private String customerName;
     //用户状态
+    @ApiModelProperty(value = "用户状态")
     private String userState;
     //合同到期时间是否长期
+    @ApiModelProperty(value = "合同到期时间是否长期")
     private String contractDateIs;
     //
     //private String codeNumber;
     //账户编码
+    @ApiModelProperty(value = "账户编码")
     private String accountCode;
     //楼宇编号
+    @ApiModelProperty(value = "楼宇编号")
     private String floorCode;
     //用户号码
+    @ApiModelProperty(value = "用户号码")
     private String userCode;
     //入网申请签报 applySign
+    @ApiModelProperty(value = "入网申请签报上传资料")
     private String applySign;
     //入网申请签报备注
+    @ApiModelProperty(value = "入网申请签报备注")
     private String applySignRemark;
     //三张现场照片 threePhotos
+    @ApiModelProperty(value = "三张现场照片上传资料")
     private String threePhotos;
     //三张现场照片备注
+    @ApiModelProperty(value = "三张现场照片备注")
     private String threePhotosRemark;
     //责任承诺书
+    @ApiModelProperty(value = "责任承诺书上传资料")
     private String commitmentBook;
     //责任承诺书备注
+    @ApiModelProperty(value = "中继线合同备注")
     private String commitmentBookRemark;
     //突破客户经理管控价是否有固网价格审批
+    @ApiModelProperty(value = "突破客户经理管控价是否有固网价格审批上传资料")
     private String isPriceApproval;
     //突破客户经理管控价是否有固网价格审批备注
+    @ApiModelProperty(value = "突破客户经理管控价是否有固网价格审批备注")
     private String isPriceApprovalRemark;
     //法人身份证
+    @ApiModelProperty(value = "法人身份证上传资料")
     private String legalIdCard;
     //法人身份证备注
+    @ApiModelProperty(value = "法人身份证备注")
     private String legalIdCardRemark;
     //经办人身份证.
+    @ApiModelProperty(value = "经办人身份证上传资料")
     private String operatorIdCard;
     //经办人身份证备注
+    @ApiModelProperty(value = "经办人身份证备注")
     private String operatorIdCardRemark;
     //授权函.
+    @ApiModelProperty(value = "授权函上传资料")
     private String authorizeBook;
     //授权函备注
+    @ApiModelProperty(value = "授权函备注")
     private String authorizeBookRemark;
     //经营性呼叫中心增值业务许可证
+    @ApiModelProperty(value = "经营性呼叫中心增值业务许可证上传资料")
     private String zZBusinessLicense;
     //经营性呼叫中心增值业务许可证备注
+    @ApiModelProperty(value = "经营性呼叫中心增值业务许可证备注")
     private String zZBusinessLicenseRemark;
     //呼叫中心业务说明.
+    @ApiModelProperty(value = "呼叫中心业务说明上传资料")
     private String centerBusiness;
     //呼叫中心业务说明备注
+    @ApiModelProperty(value = "呼叫中心业务说明备注")
     private String centerBusinessRemark;
     //房屋租赁合同或房产证明.
+    @ApiModelProperty(value = "房屋租赁合同或房产证明上传资料")
     private String contractOrProve;
     //房屋租赁合同或房产证明备注
+    @ApiModelProperty(value = "房屋租赁合同或房产证明备注")
     private String contractOrProveRemark;
     //风险评估表
+    @ApiModelProperty(value = "风险评估表上传资料")
     private String riskTable;
     //风险评估表备注
+    @ApiModelProperty(value = "风险评估表备注")
     private String riskTableRemark;
     //中继线预审表
+    @ApiModelProperty(value = "中继线预审表上传资料")
     private String trunkTable;
     //中继线预审表备注
+    @ApiModelProperty(value = "中继线预审表备注")
     private String trunkTableRemark;
     //中继线合同
+    @ApiModelProperty(value = "中继线合同上传资料")
     private String trunkContract;
     //中继线合同备注
+    @ApiModelProperty(value = "中继线合同备注")
     private String trunkContractRemark;
 
     @Override

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

@@ -120,5 +120,7 @@ public class SmsCheckCustomerInfoVo implements Serializable {
     @ApiModelProperty(value = "楼宇编号")
     private String floorCode;
 
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;
 }