稽核提交

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

@@ -54,7 +54,7 @@ public class SmsCheckCustomerInfoErrorController extends JeecgController<SmsChec
      * @return excel文件
      */
     @RequestMapping(value = "/exportXls")
-    @PermissionData(pageComponent = "smscheck/modules/TaskList")
+    @PermissionData(pageComponent = "smscheck/modules/TaskImportTruck")
     @RequiresPermissions("taskImportTruck:excelError")
     public ModelAndView exportXlsError(HttpServletRequest request, SmsCheckCustomerInfoError smsCheckCustomerInfoError) {
         return  exportXl(request, smsCheckCustomerInfoError, SmsCheckCustomerInfoError.class, "经分导出错误数据");

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.smscheck.annotation.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
@@ -11,17 +13,16 @@ 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.modules.smscheck.configs.CheckStateCode;
+import org.jeecg.modules.smscheck.configs.ObjectComparator;
 import org.jeecg.modules.smscheck.entity.*;
-import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
-import org.jeecg.modules.smscheck.service.SmcTruckCheckLogService;
-import org.jeecg.modules.smscheck.service.SmsTruckCustomerDataService;
+import org.jeecg.modules.smscheck.service.*;
+import org.jeecg.modules.smscheck.service.impl.ISmsTrcukCustomerDataLogBillServiceImpl;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 中继线
@@ -36,7 +37,10 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
      */
     @Autowired
     private ISmsCheckCustomerInfoService infoService;
-
+    @Autowired
+    private ISmsTrcukCustomerDataLogBillServiceImpl iSmsTrcukCustomerDataLogBillService;
+    @Autowired
+    private SmsCheckZGHistoryService smsCheckZGHistoryService;
     @Autowired
     private SmsTruckCustomerDataService smsTruckCustomerDataService;
     /**
@@ -44,7 +48,8 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
      */
     @Autowired
     private SmcTruckCheckLogService smcTruckCheckLogService;
-
+    @Autowired
+    private ISmsCheckTaskService taskService;
 
     //日志
     @AutoLog(value = "中继线客户资料-插入修改")
@@ -89,9 +94,239 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
         LambdaQueryWrapper<SmsTruckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
         queryWrapperData.eq(SmsTruckCustomerData::getInfoId, smsTruckCustomerData.getInfoId());
         SmsTruckCustomerData data = smsTruckCustomerDataService.getOne(queryWrapperData);
+        if (data == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK("查询完成", data);
+    }
+
+
+    @ApiOperation(value = "中继线资料-通过id查询", notes = "中继线资料-通过客户表id查询")
+    @GetMapping(value = "/queryDataLogByInfoId")
+    public Result<Map<String, Object>> queryDatalogByInfoId(@RequestParam(name = "infoId") String infoId) {
+        if (StringUtils.isEmpty(infoId)) {
+            return Result.error("客户编码不能为空");
+        }
+        Map<String, Object> map =new HashMap<>();
+        LambdaQueryWrapper<SmsTruckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(SmsTruckCustomerData::getInfoId, infoId);
+        SmsTruckCustomerData smsCheckCustomerData = smsTruckCustomerDataService.getOne(queryWrapperData);
+
+        //任务数据
+        SmsCheckCustomerInfo byId = infoService.getById(infoId);
+
+        //查询 稽核结果数据
+        LambdaQueryWrapper<SmcTruckCheckLog> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SmcTruckCheckLog::getInfoId, infoId);
+        SmcTruckCheckLog logServiceOne = smcTruckCheckLogService.getOne(queryWrapper);
+        LambdaQueryWrapper<SmsCheckZGHistory> var11 = new LambdaQueryWrapper<SmsCheckZGHistory>()
+                .eq(SmsCheckZGHistory::getDataId, smsCheckCustomerData.getId());
+        List<SmsCheckZGHistory> list = smsCheckZGHistoryService.list(var11);
+        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(logServiceOne);
+        Map<String, Object> stringObjectMap1 = BeanUtil.beanToMap(smsCheckCustomerData);
+        if (smsCheckCustomerData!=null){
+            map.put("dataId",smsCheckCustomerData.getId());
+            map.putAll(stringObjectMap1);
+        }
+        if (logServiceOne!=null){
+            map.put("logId",logServiceOne.getId());
+            stringObjectMap.remove("id");
+            map.putAll(stringObjectMap);
+        }
+        map.put("taskId",byId.getTaskId());
+        map.put("history",list);
+        if (smsCheckCustomerData == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(map);
+    }
+
+    @AutoLog(value = "查询taskID")
+    @ApiOperation(value = "查询taskID", notes = "查询taskID")
+    @PostMapping(value = "/query/getTask")
+    public Result<SmsCheckCustomerInfo> getTaskId(@RequestBody SmsTruckCustomerData smsTruckCustomerData) {
+        //客户ID
+        String infoId = smsTruckCustomerData.getInfoId();
+        if (StringUtils.isEmpty(infoId)) {
+            return Result.error("客户编码不能为空");
+        }
+        LambdaQueryWrapper<SmsCheckCustomerInfo> queryWrapperData = new LambdaQueryWrapper<>();
+        queryWrapperData.eq(SmsCheckCustomerInfo::getId, smsTruckCustomerData.getInfoId());
+        SmsCheckCustomerInfo data = infoService.getOne(queryWrapperData);
+        if (data == null) {
+            return Result.error("未找到对应数据");
+        }
         return Result.OK("查询完成", data);
     }
 
+    @AutoLog(value = "客户资料Log-添加")
+    @ApiOperation(value = "客户资料Log-添加", notes = "客户资料Log-添加")
+    @PostMapping(value = "/addLog")
+    public Result<String> addLog(@RequestBody JSONObject jsonObject) throws IllegalAccessException {
+
+        SmsTruckCheckCustomerDataAndLog smsTruckCheckCustomerDataAndLog = JSON.parseObject(jsonObject.toJSONString(), SmsTruckCheckCustomerDataAndLog.class);
+
+        SmcTruckCheckLog truckCheckLog = new SmcTruckCheckLog();
+        BeanUtils.copyProperties(smsTruckCheckCustomerDataAndLog,truckCheckLog);
+
+        SmsTruckCustomerData truckCustomerData =new SmsTruckCustomerData();
+        BeanUtils.copyProperties(smsTruckCheckCustomerDataAndLog,truckCustomerData);
+
+        truckCheckLog.setId(smsTruckCheckCustomerDataAndLog.getLogId());
+
+        truckCustomerData.setId(smsTruckCheckCustomerDataAndLog.getDataId());
+
+        SmsCheckCustomerInfo byId = infoService.getById(truckCheckLog.getInfoId());
+        truckCheckLog.setDataId(byId.getDataId());
+
+        List<SmsCheckZGHistory> smsCheckZGHistories = new ArrayList<>();
+
+        // SmsCheckCustomerDataLog  如果id不是空的 则存在以前数据
+        if (StringUtils.isNotBlank(truckCheckLog.getId())){
+            SmcTruckCheckLog logServiceById = smcTruckCheckLogService.getById(truckCheckLog.getId());
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(truckCheckLog, logServiceById);
+            for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
+                SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
+                checkZGHistory.setDataId(byId.getDataId());
+                checkZGHistory.setContext(entry.getValue().toString());
+                checkZGHistory.setUpdateField(entry.getKey());
+                Date date = new Date();
+                SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                checkZGHistory.setUpdateDate(dateFormat.format(date));
+                smsCheckZGHistories.add(checkZGHistory);
+                System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
+            }
+        }
+        //SmsCheckCustomerData 如果id不是空的 则存在以前数据
+        if (StringUtils.isNotBlank(truckCustomerData.getId())){
+            SmsTruckCustomerData dataServiceById = smsTruckCustomerDataService.getById(truckCustomerData.getId());
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(truckCustomerData, dataServiceById);
+            for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
+                SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
+                checkZGHistory.setDataId(byId.getDataId());
+                checkZGHistory.setContext(entry.getValue().toString());
+                checkZGHistory.setUpdateField(entry.getKey());
+                Date date = new Date();
+                SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                checkZGHistory.setUpdateDate(dateFormat.format(date));
+                smsCheckZGHistories.add(checkZGHistory);
+                System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
+            }
+        }
+        if (smsCheckZGHistories.size()>0){
+            smsCheckZGHistoryService.saveBatch(smsCheckZGHistories);
+        }
+        boolean saveLog = smcTruckCheckLogService.saveOrUpdate(truckCheckLog);
+
+        SmsTruckCheckCustomerDataLogBill smsTruckCheckCustomerDataLogBill = new SmsTruckCheckCustomerDataLogBill();
+        BeanUtils.copyProperties(truckCheckLog,smsTruckCheckCustomerDataLogBill);
+        smsTruckCheckCustomerDataLogBill.setId(null);
+        smsTruckCheckCustomerDataLogBill.setCreateDate(new Date());
+        iSmsTrcukCustomerDataLogBillService.save(smsTruckCheckCustomerDataLogBill);
+
+        boolean saveData = smsTruckCustomerDataService.saveOrUpdate(truckCustomerData);
+
+
+        if (saveLog && saveData){
+            Map<String, String> mapByResult = getMapByResult(truckCheckLog);
+            // 修改客户状态为     未完善/未上传
+            SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+            /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；  */
+            if (byId.getCheckState().equals(CheckStateCode.CHECK_STSTE_4)){
+                smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
+            }else {
+                if (mapByResult.isEmpty()){
+                    smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_5);
+                }else {
+                    smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
+                }
+            }
+            smsCheckCustomerInfo.setId(byId.getId());
+
+            smsCheckCustomerInfo.setDataLogId(truckCheckLog.getId());
+            infoService.updateState(smsCheckCustomerInfo);
+            return Result.OK();
+        }
+        return Result.error("新增失败");
+    }
+    private Map<String,String>getMapByResult(SmcTruckCheckLog smsCheckCustomerDataLog){
+        HashMap <String,String> map =new HashMap<>();
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getApplySignResult() ) && !smsCheckCustomerDataLog.getApplySignResult().equals("1")){
+            map.put("合同到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getThreePhotosResult() ) && !smsCheckCustomerDataLog.getThreePhotosResult().equals("1")){
+            map.put("营业执照到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCommitmentBookResult() ) && !smsCheckCustomerDataLog.getCommitmentBookResult().equals("1")){
+            map.put("码号证书到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getIsPriceApprovalResult() ) && !smsCheckCustomerDataLog.getIsPriceApprovalResult().equals("1")){
+            map.put("备案通知到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getLegalIdCardResult() ) && !smsCheckCustomerDataLog.getLegalIdCardResult().equals("1")){
+            map.put("增值业务许可证到期时间结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getOperatorIdCardResult() ) && !smsCheckCustomerDataLog.getOperatorIdCardResult().equals("1")){
+            map.put("法人/责任人证件结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getAuthorizeBookResult() ) && !smsCheckCustomerDataLog.getAuthorizeBookResult().equals("1")){
+            map.put("责任人授权书结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getZZBusinessLicenseResult() ) && !smsCheckCustomerDataLog.getZZBusinessLicenseResult().equals("1")){
+            map.put("经办人证件结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCenterBusinessResult() ) && !smsCheckCustomerDataLog.getCenterBusinessResult().equals("1")){
+            map.put("经办人手持身份证照片结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getContractOrProveResult() ) && !smsCheckCustomerDataLog.getContractOrProveResult().equals("1")){
+            map.put("机房设备照片结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getRiskTableResult() ) && !smsCheckCustomerDataLog.getRiskTableResult().equals("1")){
+            map.put("短信模板结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTrunkTableResult() ) && !smsCheckCustomerDataLog.getTrunkTableResult().equals("1")){
+            map.put("端口类短信业务责任承诺书结果","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTrunkContractResult() ) && !smsCheckCustomerDataLog.getTrunkContractResult().equals("1")){
+            map.put("信息安全责任承诺书结果","未通过");
+        }
+
+        return map;
+    }
+    @AutoLog(value = "客户资料-添加-暂存")
+    @ApiOperation(value = "客户资料-添加-暂存", notes = "客户资料-添加")
+    @PostMapping(value = "/addIsStaging")
+    public Result<String> addIsStaging(@RequestBody JSONObject jsonObject){
+        SmsTruckCustomerData smsTruckCustomerData = JSON.parseObject(jsonObject.toJSONString(), SmsTruckCustomerData.class);
+        boolean save = smsTruckCustomerDataService.saveOrUpdate(smsTruckCustomerData);
+        if (save){
+            // 修改客户状态为     未完善/未上传
+            SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+            /** 稽核状态 0：未处理；1：未完善；2：待稽核； ；4：待整改；5：稽核通过； 6：未上传 */
+            smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
+            smsCheckCustomerInfo.setId(smsTruckCustomerData.getInfoId());
+            infoService.updateState(smsCheckCustomerInfo);
+            return Result.OK();
+        }
+        return Result.error("暂存失败");
+    }
+
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody JSONObject jsonObject) {
+        SmsTruckCustomerData truckCustomerData = JSON.parseObject(jsonObject.toJSONString(), SmsTruckCustomerData.class);
+        boolean save = smsTruckCustomerDataService.saveOrUpdate(truckCustomerData);
+        if (save){
+            // 修改客户状态为     未完善/未上传
+            SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+            /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； 6：未上传 */
+            smsCheckCustomerInfo.setId(truckCustomerData.getInfoId());
+            smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
+            smsCheckCustomerInfo.setDataId(truckCustomerData.getId());
+            infoService.updateState(smsCheckCustomerInfo);
+            return Result.OK();
+        }
+        return Result.error("新增失败");
+    }
     @AutoLog(value = "物联网客户资料-插入修改")
     @ApiOperation(value = "物联网客户资料-插入修改", notes = "物联网客户资料-插入修改")
     @PostMapping(value = "/check/info")

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

@@ -0,0 +1,194 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SmsTruckCheckCustomerDataAndLog {
+
+
+    private String id;
+    /** 任务id */
+    private String taskId;
+    /** 客户信息id */
+    private String infoId;
+    /** 客户资料ID */
+    private String dataId;
+    @ApiModelProperty(value = "基本信息稽核稽核结果")
+    private String infoResult;
+    @ApiModelProperty(value = "基本信息结果备注")
+    private String infoResultRemark;
+
+    private String applySignResult;
+    private String applySignResultRemark;
+    //三张现场照片 threePhotos
+    private String threePhotosResult;
+    private String threePhotosResultRemark;
+    //责任承诺书
+    private String commitmentBookResult;
+    private String commitmentBookResultRemark;
+    //突破客户经理管控价是否有固网价格审批
+    private String isPriceApprovalResult;
+    private String isPriceApprovalResultRemark;
+    //法人身份证
+    private String legalIdCardResult;
+    private String legalIdCardResultRemark;
+    //经办人身份证.
+    private String operatorIdCardResult;
+    private String operatorIdCardResultRemark;
+    //授权函.
+    private String authorizeBookResult;
+    private String authorizeBookResultRemark;
+    //经营性呼叫中心增值业务许可证.
+    private String zZBusinessLicenseResult;
+    private String zZBusinessLicenseResultRemark;
+    //呼叫中心业务说明.
+    private String centerBusinessResult;
+    private String centerBusinessResultRemark;
+    //房屋租赁合同或房产证明.
+    private String contractOrProveResult;
+    private String contractOrProveResultRemark;
+    //风险评估表
+    private String riskTableResult;
+    private String riskTableResultRemark;
+    private String logId;
+    /** 客户类型;0:一类客户 ，1:二类客户 */
+    private Integer customType;
+    /** 使用场景;0:办公自用，1:自用型呼叫中心，2:经营型呼叫中心，3:经济型会议电话 */
+    private Integer scene;
+    /** 客户营业执照 */
+    private String businessLicense;
+    /** 经办人介绍信和身份证复印件 */
+    private String idCard;
+    /** 标准文本合同 */
+    private String contract;
+    /** 中继线业务预审表 */
+    private String prequaliFication;
+    /** 风险评估表 */
+    private String risk;
+    /** 呼叫中心/会议电话业务说明函 */
+    private String coverLetter;
+    /** 办公现场和装机地址现场拍照（需客户经理入镜） */
+    private String takePhotos;
+    /** 增值业务许可证 */
+    private String addedLicense;
+    /** 注册资金不低于50万 */
+    private String registeredCapital;
+    /** 屋租赁合同或房屋产权证明 */
+    private String ownershipCertificate;
+    /** 客户信用查询截屏 */
+    private String creditInquiry;
+    /** 企业法人身份证复印件 */
+    private String legalPersonality;
+    /** 创建人 */
+    private String createBy;
+    /** 创建时间 */
+    private Date createTime;
+    /** 更新人 */
+    private String updateBy;
+    /** 所属部门 */
+    private String sysOrgCode;
+    /** 更新时间 */
+    private Date updateTime;
+    /**员工编号*/
+    private String staffNo;
+
+    //客户经理手机号
+    private String managePhone;
+    //房屋租赁合同到期时间
+    private String houseDate;
+    //经营型呼叫中心增值许可证到期日
+    private String zZBusinessLicenseDate;
+    //营业执照到期时间 是否长期
+    private String businessLicenseDateIs;
+    //营业执照到期时间
+    private String businessLicenseDate;
+    //合同到期时间
+    private String contractDate;
+    //风险评估等级（非办公自用需提供)
+    private String riskGrade;
+    //实际装机地址
+    private String installationAddress;
+    //楼宇名称
+    private String floorName;
+    //首次激活时间
+    private String firstActivationDate;
+    //客户编号
+    private String customerNo;
+    //用户编号
+    private String userNo;
+    //入网时间
+    private String networkAccessTime;
+    //客户名称
+    private String customerName;
+    //用户状态
+    private String userState;
+    //合同到期时间是否长期
+    private String contractDateIs;
+    //
+    //private String codeNumber;
+    //账户编码
+    private String accountCode;
+    //楼宇编号
+    private String floorCode;
+    //用户号码
+    private String userCode;
+    //入网申请签报 applySign
+    private String applySign;
+    //入网申请签报备注
+    private String applySignRemark;
+    //三张现场照片 threePhotos
+    private String threePhotos;
+    //三张现场照片备注
+    private String threePhotosRemark;
+    //责任承诺书
+    private String commitmentBook;
+    //责任承诺书备注
+    private String commitmentBookRemark;
+    //突破客户经理管控价是否有固网价格审批
+    private String isPriceApproval;
+    //突破客户经理管控价是否有固网价格审批备注
+    private String isPriceApprovalRemark;
+    //法人身份证
+    private String legalIdCard;
+    //法人身份证备注
+    private String legalIdCardRemark;
+    //经办人身份证.
+    private String operatorIdCard;
+    //经办人身份证备注
+    private String operatorIdCardRemark;
+    //授权函.
+    private String authorizeBook;
+    //授权函备注
+    private String authorizeBookRemark;
+    //经营性呼叫中心增值业务许可证
+    private String zZBusinessLicense;
+    //经营性呼叫中心增值业务许可证备注
+    private String zZBusinessLicenseRemark;
+    //呼叫中心业务说明.
+    private String centerBusiness;
+    //呼叫中心业务说明备注
+    private String centerBusinessRemark;
+    //房屋租赁合同或房产证明.
+    private String contractOrProve;
+    //房屋租赁合同或房产证明备注
+    private String contractOrProveRemark;
+    //风险评估表
+    private String riskTable;
+    //风险评估表备注
+    private String riskTableRemark;
+    //中继线预审表
+    private String trunkTable;
+    //中继线预审表备注
+    private String trunkTableRemark;
+    //中继线合同
+    private String trunkContract;
+    //中继线合同备注
+    private String trunkContractRemark;
+
+
+}

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

@@ -0,0 +1,81 @@
+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;
+
+import java.util.Date;
+import java.util.Objects;
+
+@Data
+@TableName("sms_truck_customer_data_log_bill")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_truck_customer_data_log_bill", description="客户资料稽核稽核结果bill")
+public class SmsTruckCheckCustomerDataLogBill {
+
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /** 任务id */
+    private String taskId;
+    /** 客户信息id */
+    private String infoId;
+    /** 客户资料ID */
+    private String dataId;
+    @ApiModelProperty(value = "基本信息稽核稽核结果")
+    private String infoResult;
+    @ApiModelProperty(value = "基本信息结果备注")
+    private String infoResultRemark;
+
+    private String applySignResult;
+    private String applySignResultRemark;
+    //三张现场照片 threePhotos
+    private String threePhotosResult;
+    private String threePhotosResultRemark;
+    //责任承诺书
+    private String commitmentBookResult;
+    private String commitmentBookResultRemark;
+    //突破客户经理管控价是否有固网价格审批
+    private String isPriceApprovalResult;
+    private String isPriceApprovalResultRemark;
+    //法人身份证
+    private String legalIdCardResult;
+    private String legalIdCardResultRemark;
+    //经办人身份证.
+    private String operatorIdCardResult;
+    private String operatorIdCardResultRemark;
+    //授权函.
+    private String authorizeBookResult;
+    private String authorizeBookResultRemark;
+    //经营性呼叫中心增值业务许可证.
+    private String zZBusinessLicenseResult;
+    private String zZBusinessLicenseResultRemark;
+    //呼叫中心业务说明.
+    private String centerBusinessResult;
+    private String centerBusinessResultRemark;
+    //房屋租赁合同或房产证明.
+    private String contractOrProveResult;
+    private String contractOrProveResultRemark;
+    //风险评估表
+    private String riskTableResult;
+    private String riskTableResultRemark;
+
+
+
+    //中继线预审表
+    private String trunkTableResult;
+    private String trunkTableResultRemark;
+    //中继线合同
+    private String trunkContractResult;
+    private String trunkContractResultRemark;
+    private Date createDate;
+
+}

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

@@ -0,0 +1,7 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.smscheck.entity.SmsTruckCheckCustomerDataLogBill;
+
+public interface SmsTruckCheckCustomerDataLogBillMapper extends BaseMapper<SmsTruckCheckCustomerDataLogBill> {
+}

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

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

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/ISmsTrcukCustomerDataLogBillServiceImpl.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.SmsCheckCustomerDataLogBill;
+import org.jeecg.modules.smscheck.entity.SmsTruckCheckCustomerDataLogBill;
+import org.jeecg.modules.smscheck.mapper.SmsCheckCustomerDataLogBillMapper;
+import org.jeecg.modules.smscheck.mapper.SmsTruckCheckCustomerDataLogBillMapper;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataLogBillService;
+import org.jeecg.modules.smscheck.service.ISmsTrcukCustomerDataLogBillService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ISmsTrcukCustomerDataLogBillServiceImpl extends ServiceImpl<SmsTruckCheckCustomerDataLogBillMapper, SmsTruckCheckCustomerDataLogBill> implements ISmsTrcukCustomerDataLogBillService {
+}