行短稽核

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

@@ -1,13 +1,16 @@
 package org.jeecg.modules.smscheck.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 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.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.exception.JeecgBootException;
@@ -17,8 +20,8 @@ import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.MinioUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
+import org.jeecg.modules.smscheck.entity.*;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataLogService;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataService;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +33,9 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description 客户资料
@@ -42,10 +47,13 @@ import java.util.List;
 @Slf4j
 public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCustomerData, ISmsCheckCustomerDataService> {
     @Autowired
-    private ISmsCheckCustomerDataService customerDataService;
+    private ISmsCheckCustomerDataLogService checkCustomerDataLogService;
     @Autowired
     private ISmsCheckCustomerInfoService infoService;
-
+    @Autowired
+    private ISmsCheckCustomerDataService customerDataService;
+    @Autowired
+    private ISmsCheckCustomerInfoService iSmsCheckCustomerInfoService;
     /**
      * 分页列表查询
      *
@@ -93,10 +101,125 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户资料-添加", notes = "客户资料-添加")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
-        customerDataService.save(smsCheckCustomerData);
-        return Result.OK("添加成功！");
+        boolean save = customerDataService.saveOrUpdate(smsCheckCustomerData);
+        if (save){
+            // 修改客户状态为     未完善/未上传
+            SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+            /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； 6：未上传 */
+            smsCheckCustomerInfo.setId(smsCheckCustomerData.getInfoId());
+            smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
+            smsCheckCustomerInfo.setDataId(smsCheckCustomerData.getId());
+            infoService.updateState(smsCheckCustomerInfo);
+            return Result.OK();
+        }
+        return Result.error("新增失败");
+    }
+
+
+    /**
+     * 稽核
+     *
+     * @param smsCheckCustomerDataLog 对象
+     * @return 结果
+     */
+    @AutoLog(value = "客户资料Log-添加")
+    @ApiOperation(value = "客户资料Log-添加", notes = "客户资料Log-添加")
+    @PostMapping(value = "/addLog")
+    public Result<String> addLog(@RequestBody SmsCheckCustomerDataLog smsCheckCustomerDataLog) {
+        SmsCheckCustomerInfo byId = iSmsCheckCustomerInfoService.getById(smsCheckCustomerDataLog.getInfoId());
+        smsCheckCustomerDataLog.setDataId(byId.getDataId());
+        boolean save = checkCustomerDataLogService.saveOrUpdate(smsCheckCustomerDataLog);
+        if (save){
+            Map<String, String> mapByResult = getMapByResult(smsCheckCustomerDataLog);
+            // 修改客户状态为     未完善/未上传
+            SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+            /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；  */
+            smsCheckCustomerInfo.setId(byId.getId());
+            if (mapByResult.isEmpty()){
+                smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_5);
+            }else {
+                smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
+            }
+            smsCheckCustomerInfo.setDataLogId(smsCheckCustomerDataLog.getId());
+            infoService.updateState(smsCheckCustomerInfo);
+            return Result.OK();
+        }
+        return Result.error("新增失败");
+    }
+
+
+
+
+    private Map<String,String>getMapByResult(SmsCheckCustomerDataLog smsCheckCustomerDataLog){
+        HashMap <String,String> map =new HashMap<>();
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getContractDateResult() ) && !smsCheckCustomerDataLog.getContractDateResult().equals("1")){
+            map.put("合同到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getBusinessLicenseDateResult() ) && !smsCheckCustomerDataLog.getBusinessLicenseDateResult().equals("1")){
+            map.put("营业执照到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCodeNumberDateResult() ) && !smsCheckCustomerDataLog.getCodeNumberDateResult().equals("1")){
+            map.put("码号证书到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getFilingsDateResult() ) && !smsCheckCustomerDataLog.getFilingsDateResult().equals("1")){
+            map.put("备案通知到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getPermitDateResult() ) && !smsCheckCustomerDataLog.getPermitDateResult().equals("1")){
+            map.put("增值业务许可证到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCorporationCardResult() ) && !smsCheckCustomerDataLog.getCorporationCardResult().equals("1")){
+            map.put("法人/责任人证件结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getPersonResponsibleResult() ) && !smsCheckCustomerDataLog.getPersonResponsibleResult().equals("1")){
+            map.put("责任人授权书结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getOperatorCardResult() ) && !smsCheckCustomerDataLog.getOperatorCardResult().equals("1")){
+            map.put("经办人证件结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getOperatorCardPhoneResult() ) && !smsCheckCustomerDataLog.getOperatorCardPhoneResult().equals("1")){
+            map.put("经办人手持身份证照片结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getDevicePhoneResult() ) && !smsCheckCustomerDataLog.getDevicePhoneResult().equals("1")){
+            map.put("机房设备照片结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTextMessageResult() ) && !smsCheckCustomerDataLog.getTextMessageResult().equals("1")){
+            map.put("短信模板结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTextMessageBookResult() ) && !smsCheckCustomerDataLog.getTextMessageBookResult().equals("1")){
+            map.put("端口类短信业务责任承诺书结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getSecureBookResult() ) && !smsCheckCustomerDataLog.getSecureBookResult().equals("1")){
+            map.put("信息安全责任承诺书结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getSpecialResult() ) && !smsCheckCustomerDataLog.getSpecialResult().equals("1")){
+            map.put("特殊资费审批结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getNetworkAccessResult() ) && !smsCheckCustomerDataLog.getNetworkAccessResult().equals("1")){
+            map.put("入网签报结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getGroupPriceApprovalResult() ) && !smsCheckCustomerDataLog.getGroupPriceApprovalResult().equals("1")){
+            map.put("集团价格审批结果","未通过");
+        }
+        return map;
     }
 
+
+    @AutoLog(value = "客户资料-添加-暂存")
+    @ApiOperation(value = "客户资料-添加-暂存", notes = "客户资料-添加")
+    @PostMapping(value = "/addIsStaging")
+    public Result<String> addIsStaging(@RequestBody  SmsCheckCustomerData smsCheckCustomerData) {
+        boolean save = customerDataService.saveOrUpdate(smsCheckCustomerData);
+        if (save){
+            // 修改客户状态为     未完善/未上传
+            SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+            /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； 6：未上传 */
+            smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
+            smsCheckCustomerInfo.setId(smsCheckCustomerData.getInfoId());
+            infoService.updateState(smsCheckCustomerInfo);
+            return Result.OK();
+        }
+        return Result.error("暂存失败");
+    }
     /**
      * 编辑
      *
@@ -133,7 +256,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
             infoService.updateById(customerInfo);
             return Result.OK("编辑成功!");
         }
-        customerData =  customerDataService.integration(customerData,list.get(0));
+       // customerData =  customerDataService.integration(customerData,list.get(0));
         boolean edit = customerDataService.updateById(customerData);
         if (!edit) {
             return Result.error("编辑失败");
@@ -186,7 +309,54 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         }
         return Result.OK(smsCheckCustomerData);
     }
+    /**
+     * 通过id查询
+     *
+     * @param infoId 主键
+     * @return 数据
+     */
+    //@AutoLog(value = "客户资料-通过id查询")
+    @ApiOperation(value = "客户资料-通过id查询", notes = "客户资料-通过客户id查询")
+    @GetMapping(value = "/queryByInfoId")
+    public Result<SmsCheckCustomerData> queryByInfoId(@RequestParam(name = "infoId") String infoId) {
+        LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(SmsCheckCustomerData::getInfoId, infoId);
+        SmsCheckCustomerData smsCheckCustomerData = customerDataService.getOne(queryWrapperData);
+        if (smsCheckCustomerData == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(smsCheckCustomerData);
+    }
+
+    /**
+     * 通过客户id查询Datalog 修改未稽核通过的资料
+     *
+     * @param infoId 主键
+     * @return 数据
+     */
+    //@AutoLog(value = "客户资料-通过id查询")
+    @ApiOperation(value = "客户资料-通过id查询", notes = "客户资料-通过客户表id查询")
+    @GetMapping(value = "/queryDataLogByInfoId")
+    public Result<SmsCheckCustomerData> queryDatalogByInfoId(@RequestParam(name = "infoId") String infoId) {
+        Map<String, Object> map =new HashMap<>();
+        LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(SmsCheckCustomerData::getInfoId, infoId);
+        SmsCheckCustomerData smsCheckCustomerData = customerDataService.getOne(queryWrapperData);
+        //查询 稽核结果数据
+        LambdaQueryWrapper<SmsCheckCustomerDataLog> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SmsCheckCustomerDataLog::getInfoId, infoId);
+        SmsCheckCustomerDataLog logServiceOne = checkCustomerDataLogService.getOne(queryWrapper);
 
+        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(logServiceOne);
+        Map<String, Object> stringObjectMap1 = BeanUtil.beanToMap(smsCheckCustomerData);
+        map.putAll(stringObjectMap);
+        map.putAll(stringObjectMap1);
+
+        if (smsCheckCustomerData == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(smsCheckCustomerData);
+    }
     /**
      * 导出excel
      *

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

@@ -318,7 +318,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         // 未处理数
         QueryWrapper<SmsCheckCustomerInfo> undoCountQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
         undoCountQueryWrapper.lambda().eq(SmsCheckCustomerInfo::getTaskId, id)
-                .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList(0, 1))
+                .in(SmsCheckCustomerInfo::getCheckState, Arrays.asList( 1))
                 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
         long undoCount = customerInfoService.count(undoCountQueryWrapper);
 
@@ -343,12 +343,18 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                 .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
         long passedCount = customerInfoService.count(passedCountQueryWrapper);
 
+        // 为上传
+        QueryWrapper<SmsCheckCustomerInfo> noUp = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());
+        noUp.lambda().eq(SmsCheckCustomerInfo::getTaskId, id)
+                .eq(SmsCheckCustomerInfo::getCheckState, 0)
+                .eq(SmsCheckCustomerInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
+        long noUpCount = customerInfoService.count(noUp);
         dict.put("count", count);
         dict.put("undoCount", undoCount);
         dict.put("uncheckCount", uncheckCount);
         dict.put("checkedCount", checkedCount);
         dict.put("passedCount", passedCount);
-
+        dict.put("noUpCount", noUpCount);
         return Result.OK(dict);
     }
 

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

@@ -24,6 +24,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.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.entity.currency.DataYearMonth;
 import org.jeecg.modules.smscheck.service.*;
@@ -277,8 +278,8 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
             }
             info.setStaffUsername(user.getUsername());
             info.setDelFlag(CommonConstant.DEL_FLAG_0);
-            // 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过；
-            info.setCheckState(0);
+            // 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过 6 未上传；
+            info.setCheckState(CheckStateCode.CHECK_STSTE_0);
             dataList.add(info);
             info.setTaskId(taskId);
             long count = customerInfoService.count(

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

@@ -43,46 +43,7 @@ public class SmsCheckCustomerData implements Serializable {
     @Excel(name = "用户编号", width = 15)
     @ApiModelProperty(value = "用户编号")
     private String userNo;
-	/** 业务合同 */
-    @Excel(name = "业务合同", width = 15)
-    @ApiModelProperty(value = "业务合同")
-    private String businessContract;
-	/** 号码证书 */
-    @Excel(name = "号码证书", width = 15)
-    @ApiModelProperty(value = "号码证书")
-    private String smsNumberCertificate;
-	/** 备案通知 */
-    @Excel(name = "备案通知", width = 15)
-    @ApiModelProperty(value = "备案通知")
-    private String recordNotice;
-	/** 集团政企价格审批单 */
-    @Excel(name = "集团政企价格审批单", width = 15)
-    @ApiModelProperty(value = "集团政企价格审批单")
-    private String groupPriceApproval;
-	/** 营业执照 */
-    @Excel(name = "营业执照", width = 15)
-    @ApiModelProperty(value = "营业执照")
-    private String businessLicence;
-	/** 客户介绍信 */
-    @Excel(name = "客户介绍信", width = 15)
-    @ApiModelProperty(value = "客户介绍信")
-    private String customerIntroductionLetter;
-	/** 经办人身份复印件 */
-    @Excel(name = "经办人身份复印件", width = 15)
-    @ApiModelProperty(value = "经办人身份复印件")
-    private String handlerIdNumberCopy;
-	/** CRM 没有行短业务截图 */
-    @Excel(name = "CRM 没有行短业务截图", width = 15)
-    @ApiModelProperty(value = "CRM 没有行短业务截图")
-    private String crmScreenshot;
-	/** 增值业务许可证 */
-    @Excel(name = "增值业务许可证", width = 15)
-    @ApiModelProperty(value = "增值业务许可证")
-    private String valueAddedLicence;
-    /** 其他资料 */
-    @Excel(name = "其他资料", width = 15)
-    @ApiModelProperty(value = "其他资料")
-    private String otherData;
+
 	/** 员工id */
     @Excel(name = "员工id", width = 15)
     @ApiModelProperty(value = "员工id")
@@ -111,5 +72,145 @@ public class SmsCheckCustomerData implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 
+
+    @ApiModelProperty(value = "合同到期时间资料")
+    private String contractDate;
+
+
+    @ApiModelProperty(value = " 营业执照到期时间资料")
+    private String businessLicenseDate;
+
+
+    @ApiModelProperty(value = " 码号证书到期时间资料")
+    private String codeNumberDate;
+
+
+    @ApiModelProperty(value = " 备案通知到期时间资料")
+    private String filingsDate;
+
+    @ApiModelProperty(value = " 增值业务许可证到期时间资料")
+    private String permitDate;
+
+    @ApiModelProperty(value = " 法人/责任人证件")
+    private String corporationCard;
+
+    @ApiModelProperty(value = " 责任人授权书")
+    private String personResponsible;
+
+    @ApiModelProperty(value = " 经办人证件")
+    private String operatorCard;
+
+    @ApiModelProperty(value = " 经办人手持身份证照片（背景需为电信营业厅或白墙）")
+    private String operatorCardPhone;
+
+    @ApiModelProperty(value = " 机房设备照片")
+    private String devicePhone;
+
+    @ApiModelProperty(value = " 短信模板")
+    private String textMessage;
+
+
+    @ApiModelProperty(value = " 端口类短信业务责任承诺书")
+    private String textMessageBook;
+
+    @ApiModelProperty(value = " 信息安全责任承诺书")
+    private String secureBook;
+
+    @ApiModelProperty(value = " 特殊资费审批（标准资费无需提供）")
+    private String special;
+
+    @ApiModelProperty(value = " 入网签报")
+    private String networkAccess;
+
+    @ApiModelProperty(value = " 集团价格审批")
+    private String groupPriceApproval;
+
+    @ApiModelProperty(value = " 码号")
+    private String codeNumber;
+
+    @ApiModelProperty(value = " 客户名称(全)")
+    private String customerName;
+
+    @ApiModelProperty(value = " 号码详细用途")
+    private String numberUse;
+
+    @ApiModelProperty(value = " 客户经理手机号")
+    private String managePhone;
+
+    @ApiModelProperty(value = " 码号使用单位联系人手机号")
+    private String codeNumberContactPhone;
+
+    @ApiModelProperty(value = " 是否为CSP商")
+    private String isCsp;
+
+
+    @ApiModelProperty(value = " 码号证书营业执照合同签约方主体是否一致")
+    private String codeNumberBusinessLicense;
+
+    @ApiModelProperty(value = " 签约号码与证书下发码号是否一致")
+    private String isSigningNumber;
+
+    @ApiModelProperty(value = " 资料是否完整")
+    private String isAll;
+
+    @ApiModelProperty(value = " 是否完成整改")
+    private String isComplete;
+    @ApiModelProperty(value = "合同到期时间资料备注")
+    private String contractDateRemark;
+
+
+    @ApiModelProperty(value = " 营业执照到期时间资料备注")
+    private String businessLicenseDateRemark;
+
+
+    @ApiModelProperty(value = " 码号证书到期时间资料备注")
+    private String codeNumberDateRemark;
+
+
+    @ApiModelProperty(value = " 备案通知到期时间资料备注")
+    private String filingsDateRemark;
+
+    @ApiModelProperty(value = " 增值业务许可证到期时间资料备注")
+    private String permitDateRemark;
+
+    @ApiModelProperty(value = " 法人/责任人证件备注")
+    private String corporationCardRemark;
+
+    @ApiModelProperty(value = " 责任人授权书备注")
+    private String personResponsibleRemark;
+
+    @ApiModelProperty(value = " 经办人证件备注")
+    private String operatorCardRemark;
+
+    @ApiModelProperty(value = " 经办人手持身份证照片（背景需为电信营业厅或白墙）备注")
+    private String operatorCardPhoneRemark;
+
+    @ApiModelProperty(value = " 机房设备照片备注")
+    private String devicePhoneRemark;
+
+    @ApiModelProperty(value = " 短信模板备注")
+    private String textMessageRemark;
+
+
+    @ApiModelProperty(value = " 端口类短信业务责任承诺书备注")
+    private String textMessageBookRemark;
+
+    @ApiModelProperty(value = " 信息安全责任承诺书备注")
+    private String secureBookRemark;
+
+    @ApiModelProperty(value = " 特殊资费审批（标准资费无需提供）备注")
+    private String specialRemark;
+
+    @ApiModelProperty(value = " 入网签报备注")
+    private String networkAccessRemark;
+
+    @ApiModelProperty(value = " 集团价格审批备注")
+    private String groupPriceApprovalRemark;
+
+
+
+
+
+
 }
 

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

@@ -0,0 +1,112 @@
+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 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;
+
+@Data
+@TableName("sms_check_customer_data_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_customer_data_log对象", description="客户资料稽核结果")
+public class SmsCheckCustomerDataLog {
+
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /** 客户id */
+    @Excel(name = "客户id", width = 15)
+    @ApiModelProperty(value = "客户id")
+    private String infoId;
+
+    @ApiModelProperty(value = "稽核资料ID")
+    private String dataId;
+
+    @ApiModelProperty(value = "合同到期时间结果")
+    private String  contractDateResult;
+    @ApiModelProperty(value = "合同到期时间结果备注")
+    private String contractDateRemarkResult;
+
+    @ApiModelProperty(value = "营业执照到期时间结果")
+    private String businessLicenseDateResult;
+     @ApiModelProperty(value = "营业执照到期时间结果备注")
+    private String businessLicenseDateRemarkResult;
+
+     @ApiModelProperty(value = "码号证书到期时间结果")
+    private String codeNumberDateResult;
+     @ApiModelProperty(value = "码号证书到期时间结果备注")
+    private String codeNumberDateRemarkResult;
+
+     @ApiModelProperty(value = "备案通知到期时间结果备注")
+    private String filingsDateRemarkResult;
+     @ApiModelProperty(value = "备案通知到期时间结果")
+    private String filingsDateResult;
+
+     @ApiModelProperty(value = "增值业务许可证到期时间结果备注")
+    private String permitDateRemarkResult;
+     @ApiModelProperty(value = "增值业务许可证到期时间结果")
+    private String permitDateResult;
+
+     @ApiModelProperty(value = "法人/责任人证件结果")
+    private String corporationCardResult;
+     @ApiModelProperty(value = "法人/责任人证件结果备注")
+    private String corporationCardResultRemark;
+
+
+     @ApiModelProperty(value = "责任人授权书结果备注")
+    private String personResponsibleResultRemark;
+     @ApiModelProperty(value = "责任人授权书结果")
+    private String personResponsibleResult;
+
+     @ApiModelProperty(value = "经办人证件结果")
+    private String operatorCardResult;
+     @ApiModelProperty(value = "经办人证件结果备注")
+    private String operatorCardResultRemark;
+
+     @ApiModelProperty(value = "经办人手持身份证照片结果备注")
+    private String operatorCardPhoneResultRemark;
+     @ApiModelProperty(value = "经办人手持身份证照片结果")
+    private String operatorCardPhoneResult;
+
+     @ApiModelProperty(value = "机房设备照片结果")
+    private String devicePhoneResult;
+     @ApiModelProperty(value = "机房设备照片结果备注")
+    private String devicePhoneResultRemark;
+
+     @ApiModelProperty(value = "短信模板结果")
+    private String textMessageResult;
+     @ApiModelProperty(value = "短信模板结果备注")
+    private String textMessageResultRemark;
+
+     @ApiModelProperty(value = "端口类短信业务责任承诺书结果")
+    private String textMessageBookResult;
+     @ApiModelProperty(value = "端口类短信业务责任承诺书结果备注")
+    private String textMessageBookResultRemark;
+
+     @ApiModelProperty(value = "信息安全责任承诺书结果")
+    private String secureBookResult;
+     @ApiModelProperty(value = "信息安全责任承诺书结果备注")
+    private String secureBookResultRemark;
+
+     @ApiModelProperty(value = "特殊资费审批结果")
+    private String specialResult;
+     @ApiModelProperty(value = "特殊资费审批结果备注")
+    private String specialResultRemark;
+
+     @ApiModelProperty(value = "入网签报结果")
+    private String networkAccessResult;
+     @ApiModelProperty(value = "入网签报结果备注")
+    private String networkAccessResultRemark;
+
+     @ApiModelProperty(value = "集团价格审批结果")
+    private String groupPriceApprovalResult;
+     @ApiModelProperty(value = "集团价格审批结果备注")
+    private String groupPriceApprovalResultRemark;
+}

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

@@ -34,6 +34,10 @@ public class SmsCheckCustomerInfo implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
+    @ApiModelProperty(value = "资料id")
+    private String dataId;
+    @ApiModelProperty(value = "资料稽核判断id")
+    private String dataLogId;
 	/** 任务id */
     @Excel(name = "任务id", width = 15)
     @ApiModelProperty(value = "任务id")

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

@@ -0,0 +1,13 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerDataLog;
+
+/**
+ * @description 客户资料
+ * @author jeecg-boot
+ * @date 2022-06-27
+ * @version V1.0
+ */
+public interface SmsCheckCustomerDataLogMapper  extends BaseMapper<SmsCheckCustomerDataLog> {
+}

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

@@ -2,7 +2,9 @@ package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCustomerInfoGroupByCheckState;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoTaskVo;
@@ -24,6 +26,10 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
     @SelectProvider(type = ProviderClass.class, method = "checkInfoWarningCount")
     Integer checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
+    @UpdateProvider(type = ProviderClass.class, method = "updateCheckState")
+    Integer updateCheckState(SmsCheckCustomerInfo smsCheckCustomerInfo);
+
+
     @SelectProvider(type = ProviderClass.class, method = "checkInfoWarningCountTime")
     List<SmsCheckTaskVo> checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
@@ -76,6 +82,19 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
 
         }
 
+        public String updateCheckState(SmsCheckCustomerInfo smsCheckCustomerInfo){
+
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append("update sms_check_customer_info set check_state="+smsCheckCustomerInfo.getCheckState()+" ");
+            if (StringUtils.isNotBlank(smsCheckCustomerInfo.getDataId())){
+                stringBuilder.append( "  ,data_id='"+smsCheckCustomerInfo.getDataId()+"' ");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerInfo.getDataLogId())){
+                stringBuilder.append( "  ,data_log_id='"+smsCheckCustomerInfo.getDataLogId()+"' ");
+            }
+            stringBuilder.append( "    where id ='"+smsCheckCustomerInfo.getId()+"' ");
+            return stringBuilder.toString();
+        }
         public String checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo) {
             StringBuilder sql = new StringBuilder();
             sql.append("SELECT COUNT(1) count,DATE_FORMAT( sct.task_end_time, '%Y%m%d' ) date");

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerDataLog;
+
+/**
+ * @description 客户资料Log
+ * @version V1.0
+ */
+public interface ISmsCheckCustomerDataLogService extends IService<SmsCheckCustomerDataLog> {
+
+//     SmsCheckCustomerData integration(SmsCheckCustomerData date1,SmsCheckCustomerData data2);
+
+}

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

@@ -11,6 +11,6 @@ import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
  */
 public interface ISmsCheckCustomerDataService extends IService<SmsCheckCustomerData> {
 
-     SmsCheckCustomerData integration(SmsCheckCustomerData date1,SmsCheckCustomerData data2);
+//     SmsCheckCustomerData integration(SmsCheckCustomerData date1,SmsCheckCustomerData data2);
 
 }

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

@@ -21,6 +21,7 @@ public interface ISmsCheckCustomerInfoService extends IService<SmsCheckCustomerI
     Integer checkInfoWarningCount(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
     List<SmsCheckTaskVo> checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo);
+    Integer updateState(SmsCheckCustomerInfo smsCheckCustomerInfo);
 
     List<SmsCheckTaskVo> checkInfoWarningCountStaff(SmsCheckCustomerInfo smsCheckCustomerInfo);
 

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

@@ -0,0 +1,11 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.smscheck.entity.SmsCheckCustomerDataLog;
+import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerDataLogMapper;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataLogService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ISmsCheckCustomerDataLogServiceImpl  extends ServiceImpl<SmsCheckCustomerDataLogMapper, SmsCheckCustomerDataLog> implements ISmsCheckCustomerDataLogService {
+}

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

@@ -16,46 +16,46 @@ import org.springframework.stereotype.Service;
 public class SmsCheckCustomerDataServiceImpl extends ServiceImpl<SmsCheckCustomerDataMapper, SmsCheckCustomerData> implements ISmsCheckCustomerDataService {
 
 
-    @Override
-    public SmsCheckCustomerData integration(SmsCheckCustomerData date1, SmsCheckCustomerData data2) {
-        date1.setId(data2.getId());
-        if (date1.getBusinessContract()!=null && data2.getBusinessContract() != null){
-            date1.setBusinessContract(date1.getBusinessContract() + ","+data2.getBusinessContract());
-        }
-
-        if (date1.getSmsNumberCertificate() != null && data2.getSmsNumberCertificate() != null){
-            date1.setSmsNumberCertificate(date1.getSmsNumberCertificate() + ","+ data2.getSmsNumberCertificate() );
-        }
-
-        if (date1.getRecordNotice() != null && data2.getRecordNotice() != null){
-            date1.setRecordNotice(date1.getRecordNotice() + ","+ data2.getRecordNotice() );
-        }
-
-        if (date1.getGroupPriceApproval() != null && data2.getGroupPriceApproval() != null){
-            date1.setGroupPriceApproval(date1.getGroupPriceApproval() + ","+ data2.getGroupPriceApproval() );
-        }
-
-        if (date1.getBusinessLicence() != null && data2.getBusinessLicence() != null){
-            date1.setBusinessLicence(date1.getBusinessLicence() + ","+ data2.getBusinessLicence() );
-        }
-
-        if (date1.getCustomerIntroductionLetter() != null && data2.getCustomerIntroductionLetter() != null){
-            date1.setCustomerIntroductionLetter(date1.getCustomerIntroductionLetter() + ","+ data2.getCustomerIntroductionLetter() );
-        }
-
-
-        if (date1.getHandlerIdNumberCopy() != null && data2.getHandlerIdNumberCopy() != null){
-            date1.setHandlerIdNumberCopy(date1.getHandlerIdNumberCopy() + ","+ data2.getHandlerIdNumberCopy() );
-        }
-
-        if (date1.getCrmScreenshot() != null && data2.getCrmScreenshot() != null){
-            date1.setCrmScreenshot(date1.getCrmScreenshot() + ","+ data2.getCrmScreenshot() );
-        }
-
-        if (date1.getValueAddedLicence() != null && data2.getValueAddedLicence() != null){
-            date1.setValueAddedLicence(date1.getValueAddedLicence() + ","+ data2.getValueAddedLicence() );
-        }
-
-        return date1;
-    }
+//    @Override
+//    public SmsCheckCustomerData integration(SmsCheckCustomerData date1, SmsCheckCustomerData data2) {
+//        date1.setId(data2.getId());
+//        if (date1.getBusinessContract()!=null && data2.getBusinessContract() != null){
+//            date1.setBusinessContract(date1.getBusinessContract() + ","+data2.getBusinessContract());
+//        }
+//
+//        if (date1.getSmsNumberCertificate() != null && data2.getSmsNumberCertificate() != null){
+//            date1.setSmsNumberCertificate(date1.getSmsNumberCertificate() + ","+ data2.getSmsNumberCertificate() );
+//        }
+//
+//        if (date1.getRecordNotice() != null && data2.getRecordNotice() != null){
+//            date1.setRecordNotice(date1.getRecordNotice() + ","+ data2.getRecordNotice() );
+//        }
+//
+//        if (date1.getGroupPriceApproval() != null && data2.getGroupPriceApproval() != null){
+//            date1.setGroupPriceApproval(date1.getGroupPriceApproval() + ","+ data2.getGroupPriceApproval() );
+//        }
+//
+//        if (date1.getBusinessLicence() != null && data2.getBusinessLicence() != null){
+//            date1.setBusinessLicence(date1.getBusinessLicence() + ","+ data2.getBusinessLicence() );
+//        }
+//
+//        if (date1.getCustomerIntroductionLetter() != null && data2.getCustomerIntroductionLetter() != null){
+//            date1.setCustomerIntroductionLetter(date1.getCustomerIntroductionLetter() + ","+ data2.getCustomerIntroductionLetter() );
+//        }
+//
+//
+//        if (date1.getHandlerIdNumberCopy() != null && data2.getHandlerIdNumberCopy() != null){
+//            date1.setHandlerIdNumberCopy(date1.getHandlerIdNumberCopy() + ","+ data2.getHandlerIdNumberCopy() );
+//        }
+//
+//        if (date1.getCrmScreenshot() != null && data2.getCrmScreenshot() != null){
+//            date1.setCrmScreenshot(date1.getCrmScreenshot() + ","+ data2.getCrmScreenshot() );
+//        }
+//
+//        if (date1.getValueAddedLicence() != null && data2.getValueAddedLicence() != null){
+//            date1.setValueAddedLicence(date1.getValueAddedLicence() + ","+ data2.getValueAddedLicence() );
+//        }
+//
+//        return date1;
+//    }
 }

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

@@ -28,6 +28,9 @@ public class SmsCheckCustomerInfoServiceImpl extends ServiceImpl<SmsCheckCustome
         return smsCheckCustomerInfoMapper.checkInfoWarningCount(smsCheckCustomerInfo)  ;
     }
 
+    public Integer updateState(SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        return smsCheckCustomerInfoMapper.updateCheckState(smsCheckCustomerInfo)  ;
+    }
     @Override
     public List<SmsCheckTaskVo> checkInfoWarningCountTime(SmsCheckCustomerInfo smsCheckCustomerInfo) {
         return smsCheckCustomerInfoMapper.checkInfoWarningCountTime(smsCheckCustomerInfo);

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

@@ -103,7 +103,9 @@ public class SmsCheckCustomerInfoVo implements Serializable {
     @ApiModelProperty(value = "错误信息")
     private String errorMsg;
 
-
+    @Excel(name = "稽核进度", width = 15)
+    @ApiModelProperty(value = "稽核进度")
+    private String checkState;
 
 }