新增坐标

tnc-sms/src/main/java/org/jeecg/modules/smscheck/configs/CheckStateCode.java

@@ -10,8 +10,7 @@ public final class CheckStateCode {
     public static final Integer CHECK_STSTE_1 = 1;
     /**待稽核*/
     public static final Integer CHECK_STSTE_2 = 2;
-    /**已整改*/
-    public static final Integer CHECK_STSTE_3 = 3;
+
     /**待整改*/
     public static final Integer CHECK_STSTE_4 = 4;
     /**稽核通过*/

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

@@ -24,6 +24,7 @@ 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.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -46,6 +47,7 @@ import java.util.Map;
 @RequestMapping("/smsCheck/customerData")
 @Slf4j
 public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCustomerData, ISmsCheckCustomerDataService> {
+    //0：未处理；1：未完善；2：待稽核； ；4：待整改；5：稽核通过；*/
     @Autowired
     private ISmsCheckCustomerDataLogService checkCustomerDataLogService;
     @Autowired
@@ -119,27 +121,44 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     /**
      * 稽核
      *
-     * @param smsCheckCustomerDataLog 对象
+     * @param smsCheckCustomerDataAndLog 对象
      * @return 结果
      */
     @AutoLog(value = "客户资料Log-添加")
     @ApiOperation(value = "客户资料Log-添加", notes = "客户资料Log-添加")
     @PostMapping(value = "/addLog")
-    public Result<String> addLog(@RequestBody SmsCheckCustomerDataLog smsCheckCustomerDataLog) {
+    public Result<String> addLog(@RequestBody SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog) {
+
+        SmsCheckCustomerDataLog smsCheckCustomerDataLog = new SmsCheckCustomerDataLog();
+        BeanUtils.copyProperties(smsCheckCustomerDataAndLog,smsCheckCustomerDataLog);
+
+        SmsCheckCustomerData smsCheckCustomerData =new SmsCheckCustomerData();
+        BeanUtils.copyProperties(smsCheckCustomerDataAndLog,smsCheckCustomerData);
+
+        smsCheckCustomerDataLog.setId(smsCheckCustomerDataAndLog.getLogId());
+
+        smsCheckCustomerData.setId(smsCheckCustomerDataAndLog.getDataId());
+
         SmsCheckCustomerInfo byId = iSmsCheckCustomerInfoService.getById(smsCheckCustomerDataLog.getInfoId());
         smsCheckCustomerDataLog.setDataId(byId.getDataId());
-        boolean save = checkCustomerDataLogService.saveOrUpdate(smsCheckCustomerDataLog);
-        if (save){
+        boolean saveLog = checkCustomerDataLogService.saveOrUpdate(smsCheckCustomerDataLog);
+        boolean saveData = customerDataService.saveOrUpdate(smsCheckCustomerData);
+        if (saveLog && saveData){
             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);
+            if (byId.getCheckState().equals(CheckStateCode.CHECK_STSTE_4)){
+                smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
             }else {
-                smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
+                if (mapByResult.isEmpty()){
+                    smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_5);
+                }else {
+                    smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_4);
+                }
             }
+            smsCheckCustomerInfo.setId(byId.getId());
+
             smsCheckCustomerInfo.setDataLogId(smsCheckCustomerDataLog.getId());
             infoService.updateState(smsCheckCustomerInfo);
             return Result.OK();
@@ -212,7 +231,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         if (save){
             // 修改客户状态为     未完善/未上传
             SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
-            /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； 6：未上传 */
+            /** 稽核状态 0：未处理；1：未完善；2：待稽核； ；4：待整改；5：稽核通过； 6：未上传 */
             smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
             smsCheckCustomerInfo.setId(smsCheckCustomerData.getInfoId());
             infoService.updateState(smsCheckCustomerInfo);
@@ -337,7 +356,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     //@AutoLog(value = "客户资料-通过id查询")
     @ApiOperation(value = "客户资料-通过id查询", notes = "客户资料-通过客户表id查询")
     @GetMapping(value = "/queryDataLogByInfoId")
-    public Result<SmsCheckCustomerData> queryDatalogByInfoId(@RequestParam(name = "infoId") String infoId) {
+    public Result<Map<String, Object>> queryDatalogByInfoId(@RequestParam(name = "infoId") String infoId) {
         Map<String, Object> map =new HashMap<>();
         LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
         queryWrapperData.eq(SmsCheckCustomerData::getInfoId, infoId);
@@ -349,13 +368,18 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
 
         Map<String, Object> stringObjectMap = BeanUtil.beanToMap(logServiceOne);
         Map<String, Object> stringObjectMap1 = BeanUtil.beanToMap(smsCheckCustomerData);
-        map.putAll(stringObjectMap);
-        map.putAll(stringObjectMap1);
-
+        if (smsCheckCustomerData!=null){
+            map.put("dataId",smsCheckCustomerData.getId());
+            map.putAll(stringObjectMap1);
+        }
+        if (logServiceOne!=null){
+            map.put("logId",logServiceOne.getId());
+            map.putAll(stringObjectMap);
+        }
         if (smsCheckCustomerData == null) {
             return Result.error("未找到对应数据");
         }
-        return Result.OK(smsCheckCustomerData);
+        return Result.OK(map);
     }
     /**
      * 导出excel

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

@@ -0,0 +1,273 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class SmsCheckCustomerDataAndLog  {
+
+    private String logId;
+
+    private String dataId;
+
+    /** 客户id */
+    @Excel(name = "客户id", width = 15)
+    @ApiModelProperty(value = "客户id")
+    private String infoId;
+
+    @Excel(name = "用户编号", width = 15)
+    @ApiModelProperty(value = "用户编号")
+    private String userNo;
+
+    /** 员工id */
+    @Excel(name = "员工id", width = 15)
+    @ApiModelProperty(value = "员工id")
+    private String staffId;
+    /** 员工编号 */
+    @Excel(name = "员工编号", width = 15)
+    @ApiModelProperty(value = "员工编号")
+    private String staffNo;
+    /** 创建人 */
+    @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;
+
+
+    @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;
+
+
+    private String  contractDateResult;
+    @ApiModelProperty(value = "合同到期时间结果备注")
+    private String contractDateResultRemark;
+
+    @ApiModelProperty(value = "营业执照到期时间结果")
+    private String businessLicenseDateResult;
+    @ApiModelProperty(value = "营业执照到期时间结果备注")
+    private String businessLicenseDateResultRemark;
+
+    @ApiModelProperty(value = "码号证书到期时间结果")
+    private String codeNumberDateResult;
+    @ApiModelProperty(value = "码号证书到期时间结果备注")
+    private String codeNumberDateResultRemark;
+
+    @ApiModelProperty(value = "备案通知到期时间结果备注")
+    private String filingsDateResultRemark;
+    @ApiModelProperty(value = "备案通知到期时间结果")
+    private String filingsDateResult;
+
+    @ApiModelProperty(value = "增值业务许可证到期时间结果备注")
+    private String permitDateResultRemark;
+    @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/SmsCheckCustomerDataLog.java

@@ -25,6 +25,8 @@ public class SmsCheckCustomerDataLog {
     @Excel(name = "客户id", width = 15)
     @ApiModelProperty(value = "客户id")
     private String infoId;
+    @ApiModelProperty(value = "基本信息稽核")
+    private String infoResult;
 
     @ApiModelProperty(value = "稽核资料ID")
     private String dataId;
@@ -32,25 +34,25 @@ public class SmsCheckCustomerDataLog {
     @ApiModelProperty(value = "合同到期时间结果")
     private String  contractDateResult;
     @ApiModelProperty(value = "合同到期时间结果备注")
-    private String contractDateRemarkResult;
+    private String contractDateResultRemark;
 
     @ApiModelProperty(value = "营业执照到期时间结果")
     private String businessLicenseDateResult;
      @ApiModelProperty(value = "营业执照到期时间结果备注")
-    private String businessLicenseDateRemarkResult;
+    private String businessLicenseDateResultRemark;
 
      @ApiModelProperty(value = "码号证书到期时间结果")
     private String codeNumberDateResult;
      @ApiModelProperty(value = "码号证书到期时间结果备注")
-    private String codeNumberDateRemarkResult;
+    private String codeNumberDateResultRemark;
 
      @ApiModelProperty(value = "备案通知到期时间结果备注")
-    private String filingsDateRemarkResult;
+    private String filingsDateResultRemark;
      @ApiModelProperty(value = "备案通知到期时间结果")
     private String filingsDateResult;
 
      @ApiModelProperty(value = "增值业务许可证到期时间结果备注")
-    private String permitDateRemarkResult;
+    private String permitDateResultRemark;
      @ApiModelProperty(value = "增值业务许可证到期时间结果")
     private String permitDateResult;