1.特审复开导出

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

@@ -1,4 +1,5 @@
 package org.jeecg.modules.smscheck.controller;
+
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
@@ -7,6 +8,7 @@ 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 com.google.common.base.Joiner;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -16,7 +18,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
@@ -26,7 +27,9 @@ import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.configs.CheckTypeCode;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.entity.excel.SpecialExaminationExport;
+import org.jeecg.modules.smscheck.enums.SpecialExaminationReopen;
 import org.jeecg.modules.smscheck.service.*;
+import org.jeecg.modules.smscheck.service.impl.SmsCheckTaskServiceImpl;
 import org.jeecg.modules.smscheck.vo.SpecialExaminationCustomerVo;
 import org.jeecg.modules.smscheck.vo.SpecialExaminationVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -60,22 +63,23 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     @Autowired
     private ISmsCheckCustomerInfoService customerInfoService;
 
-    @Autowired
-    private ISmsCheckTaskService taskService;
 
     /**
      * 特审复开审批稽核业务
      */
     @Autowired
     private SmcSpecialCheckLogService smcSpecialCheckLogService;
+    /**特审复开稽核历史表*/
+    @Autowired
+    SmcSpecialCheckLogHistoryService smcSpecialCheckLogHistoryService;
     /**
      * 客户信息业务
      */
     @Autowired
     private ISmsCheckCustomerInfoService infoService;
 
-
-
+    @Autowired
+    ISmsCheckTaskService iSmsCheckTaskService;
 
 
     @ApiOperation(value = "客户资料-信息查询查询", notes = "客户资料-个人列表查询")
@@ -202,7 +206,6 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     }
 
 
-
     @AutoLog(value = "特审复开审批-资料批量上传")
     @ApiOperation(value = "特审复开审批-资料批量上传", notes = "特审复开审批-资料批量上传")
     @PostMapping(value = "/batch/edit/info")
@@ -261,6 +264,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         specialExaminationService.save(specialExamination);
         return Result.OK("添加成功！");
     }
+
     @AutoLog(value = "暂存特审复开审批数据")
     @ApiOperation(value = "暂存特审复开审批数据", notes = "暂存特审复开审批数据")
     @PostMapping(value = "/staging")
@@ -272,16 +276,16 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         // 互获取客户信息
         SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
         Integer checkState = customerInfo.getCheckState();
-        if (!CheckStateCode.CHECK_STSTE_0.equals(checkState) && !CheckStateCode.CHECK_STSTE_1.equals(checkState)){
+        if (!CheckStateCode.CHECK_STSTE_0.equals(checkState) && !CheckStateCode.CHECK_STSTE_1.equals(checkState)) {
             return Result.error("暂存失败，该客户状态不允许暂存");
         }
         SpecialExamination specialExamination = new SpecialExamination();
-        BeanUtil.copyProperties(specialExaminationVo,specialExamination);
+        BeanUtil.copyProperties(specialExaminationVo, specialExamination);
         // 暂存特审复开数据
         SpecialExamination specialByInfoId = specialExaminationService.getSpecialByInfoId(infoId);
-        if (null == specialByInfoId){
+        if (null == specialByInfoId) {
             specialExaminationService.save(specialExamination);
-        }else {
+        } else {
             specialExamination.setId(specialByInfoId.getId());
             specialExaminationService.updateById(specialExamination);
         }
@@ -299,7 +303,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     @PostMapping(value = "/staging/list")
     public Result<String> stagingList(@RequestBody SpecialExaminationVo specialExaminationVo) {
         List<String> infoIds = specialExaminationVo.getInfoIds();
-        if (infoIds == null || infoIds.size() == 0){
+        if (infoIds == null || infoIds.size() == 0) {
             return Result.error("客户未选择");
         }
         infoIds.forEach(infoId -> {
@@ -307,15 +311,15 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
                 // 查看当前客户信息
                 SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
                 Integer checkState = customerInfo.getCheckState();
-                if (CheckStateCode.CHECK_STSTE_0.equals(checkState) || CheckStateCode.CHECK_STSTE_1.equals(checkState)){
+                if (CheckStateCode.CHECK_STSTE_0.equals(checkState) || CheckStateCode.CHECK_STSTE_1.equals(checkState)) {
                     SpecialExamination specialExamination = new SpecialExamination();
-                    BeanUtil.copyProperties(specialExaminationVo,specialExamination);
+                    BeanUtil.copyProperties(specialExaminationVo, specialExamination);
                     // 暂存特审复开数据
                     SpecialExamination specialByInfoId = specialExaminationService.getSpecialByInfoId(infoId);
-                    if (null == specialByInfoId){
+                    if (null == specialByInfoId) {
                         specialExamination.setInfoId(infoId);
                         specialExaminationService.save(specialExamination);
-                    }else {
+                    } else {
                         specialExamination.setInfoId(infoId);
                         specialExamination.setId(specialByInfoId.getId());
                         specialExaminationService.updateById(specialExamination);
@@ -333,7 +337,6 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     }
 
 
-
     @PostMapping(value = "/status/adopt")
     public Result<?> adopt(@RequestBody SpecialExamination specialExamination) {
         String infoId = specialExamination.getInfoId();
@@ -432,7 +435,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             // 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过；
             info.setCheckState(CheckStateCode.CHECK_STSTE_0);
             info.setType(CheckTypeCode.CHECK_TYPE_3);
-            if (saveLogMap.get(info.getSmsNumber()) != null){
+            if (saveLogMap.get(info.getSmsNumber()) != null) {
                 infoVo.setResult("0");
                 infoVo.setErrorMsg("本次已导入过此号码");
 
@@ -441,6 +444,18 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
                     && StringUtils.isNotEmpty(info.getMaterialLabel())
                     && StringUtils.isNotEmpty(info.getNameFindCompliance())
             ) {
+                List<String> deptName2 = iSmsCheckTaskService.getDeptNameByWorkNo("1", sysUser.getWorkNo());
+                List<String> deptName3 = iSmsCheckTaskService.getDeptNameByWorkNo("2", sysUser.getWorkNo());
+                List<String> deptName4 = iSmsCheckTaskService.getDeptNameByWorkNo("3", sysUser.getWorkNo());
+                if (deptName2 != null){
+                    info.setStaffDeptLevel2Name( Joiner.on(",").join(deptName2));
+                }
+                if (deptName3 != null){
+                    info.setStaffDeptLevel3Name( Joiner.on(",").join(deptName3));
+                }
+                if (deptName4 != null){
+                    info.setStaffDeptLevel4Name( Joiner.on(",").join(deptName4));
+                }
                 infoVo.setResult("1");
                 customerCount++;
                 // 存入客户信息表
@@ -452,7 +467,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
                     String materialLabel = info.getMaterialLabel();
                     specialExamination.setMaterialLabel("有".equals(materialLabel) ? 0 : 1);
                     specialExaminationService.save(specialExamination);
-                    saveLogMap.put(info.getSmsNumber(),infoVo);
+                    saveLogMap.put(info.getSmsNumber(), infoVo);
                 }
             } else {
                 infoVo.setResult("0");
@@ -486,6 +501,10 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             LambdaQueryWrapper<SmcSpecialCheckLog> queryWrapperData = new LambdaQueryWrapper<>();
             queryWrapperData.eq(SmcSpecialCheckLog::getDataId, smcSpecialCheckLog.getDataId());
             List<SmcSpecialCheckLog> lotList = smcSpecialCheckLogService.list(queryWrapperData);
+            SmcSpecialCheckLogHistory smcSpecialCheckLogHistory = new SmcSpecialCheckLogHistory();
+            BeanUtil.copyProperties(smcSpecialCheckLog,smcSpecialCheckLogHistory);
+            smcSpecialCheckLogHistory.setId(null);
+            smcSpecialCheckLogHistoryService.save(smcSpecialCheckLogHistory);
             if (lotList.size() == 0) {
                 smcSpecialCheckLogService.save(smcSpecialCheckLog);
             } else {
@@ -499,8 +518,8 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             int lotStatus = stateBoolean ? 5 : 4;
             //修改客户信息稽核结果
             info.setCheckState(lotStatus);
-            if (5 == lotStatus){
-                info.setReopenTime( new Date());
+            if (5 == lotStatus) {
+                info.setReopenTime(new Date());
             }
             infoService.updateById(info);
             return Result.OK("稽核成功!");
@@ -595,7 +614,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
         smsCheckCustomerInfo.setType(3);
-        return  exportXls(request, smsCheckCustomerInfo, SpecialExaminationExport.class, "特审复开信息");
+        return exportXls(request, smsCheckCustomerInfo, SpecialExaminationExport.class, "特审复开信息");
     }
 
     protected ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo object, Class<SpecialExaminationExport> clazz, String title) {
@@ -608,63 +627,74 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         // 获取上传资料数据
         List<SpecialExamination> logList = specialExaminationService.list();
         Map<String, SpecialExamination> logMap
-                = logList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+                = logList.stream().collect(Collectors.toMap(v -> v.getInfoId(), Function.identity(), (o, n) -> o));
 
         // 获取稽核资料数据
         List<SmcSpecialCheckLog> dataList = smcSpecialCheckLogService.list();
         Map<String, SmcSpecialCheckLog> dataMap
-                = dataList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+                = dataList.stream().collect(Collectors.toMap(v -> v.getInfoId(), Function.identity(), (o, n) -> o));
 
         List<SpecialExaminationExport> pageList = new ArrayList<>();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        // 组装复开数据
         for (SmsCheckCustomerInfo smsCheckCustomerInfo : infoList) {
             SpecialExamination specialExamination = logMap.get(smsCheckCustomerInfo.getId());
             SmcSpecialCheckLog smcSpecialCheckLog = dataMap.get(smsCheckCustomerInfo.getId());
             SpecialExaminationExport specialExaminationExport = new SpecialExaminationExport();
-            BeanUtil.copyProperties(specialExamination,specialExaminationExport);
-            BeanUtil.copyProperties(smcSpecialCheckLog,specialExaminationExport);
-            BeanUtil.copyProperties(smsCheckCustomerInfo,specialExaminationExport);
+            BeanUtil.copyProperties(specialExamination, specialExaminationExport);
+            BeanUtil.copyProperties(smcSpecialCheckLog, specialExaminationExport);
+            BeanUtil.copyProperties(smsCheckCustomerInfo, specialExaminationExport);
             String shutdownLabel = specialExaminationExport.getShutdownLabel();
-            if (StringUtils.isNotEmpty(shutdownLabel)){
-                String name = "";
+            if (StringUtils.isNotEmpty(shutdownLabel)) {
+                StringBuilder name = new StringBuilder();
                 String[] split = shutdownLabel.split(",");
-                for (String lable:split){
-                    if (lable.equals("0")){
-                        name = name + " " + "安防停机（高危漫游地）";
+                for (String lable : split) {
+                    String nameByValue = SpecialExaminationReopen.findNameByValue(lable);
+                    name.append(" ").append(nameByValue);
+                }
+                specialExaminationExport.setShutdownLabel(name.toString());
+            }
+
+            List<SmcSpecialCheckLogHistory> historyList = smcSpecialCheckLogHistoryService.list(new LambdaQueryWrapper<SmcSpecialCheckLogHistory>().eq(SmcSpecialCheckLogHistory::getInfoId, specialExamination.getInfoId()));
+            if (historyList != null){
+                for (SmcSpecialCheckLogHistory smcSpecialCheckLogHistory : historyList){
+                    if (smcSpecialCheckLog.getNameFindComplianceState() != null && !smcSpecialCheckLog.getNameFindComplianceState().equals(smcSpecialCheckLogHistory.getNameFindComplianceState())){
+                        specialExaminationExport.setNameFindComplianceStateIs(1);
+                    }
+                    if (smcSpecialCheckLog.getSpecialReviewFormState() != null && !smcSpecialCheckLog.getSpecialReviewFormState().equals(smcSpecialCheckLogHistory.getSpecialReviewFormState())){
+                        specialExaminationExport.setSpecialReviewFormStateIs(1);
                     }
-                    if (lable.equals( "1")){
-                        name = name + " " + "安防关停（紫名单）";
+                    if (smcSpecialCheckLog.getIdCardState() != null && !smcSpecialCheckLog.getIdCardState().equals(smcSpecialCheckLogHistory.getIdCardState())){
+                        specialExaminationExport.setIdCardStateIs(1);
                     }
-                    if (lable.equals("2")){
-                        name = name + " " + "安防停机（专班研判）";
+                    if (smcSpecialCheckLog.getHandCertificateState() != null && !smcSpecialCheckLog.getHandCertificateState().equals(smcSpecialCheckLogHistory.getHandCertificateState())){
+                        specialExaminationExport.setHandCertificateStateIs(1);
                     }
-                    if (lable.equals("3")){
-                        name = name + " " + "安防停机（可复开）";
+                    if (smcSpecialCheckLog.getNumberCardState() != null &&  !smcSpecialCheckLog.getNumberCardState().equals(smcSpecialCheckLogHistory.getNumberCardState())){
+                        specialExaminationExport.setNumberCardStateIs(1);
                     }
-                    if (lable.equals("4")){
-                        name = name + " " + "沉默移动卡保护性单停";
+                    if (smcSpecialCheckLog.getLetterCommitmentState() != null && !smcSpecialCheckLog.getLetterCommitmentState().equals(smcSpecialCheckLogHistory.getLetterCommitmentState())){
+                        specialExaminationExport.setLetterCommitmentStateIs(1);
                     }
-                    if (lable.equals("5")){
-                        name = name + " " + "集团一点停复机（单停）";
+                    if (smcSpecialCheckLog.getNumberCardState() != null && !smcSpecialCheckLog.getNumberCardState().equals(smcSpecialCheckLogHistory.getNumberCardState())){
+                        specialExaminationExport.setBusinessLicenseStateIs(1);
                     }
-                    if (lable.equals("6")){
-                        name = name + " " + "大数据保护停机单停 ";
+                    if (smcSpecialCheckLog.getLetterIntroductionState() != null && !smcSpecialCheckLog.getLetterIntroductionState().equals(smcSpecialCheckLogHistory.getLetterIntroductionState())){
+                        specialExaminationExport.setLetterIntroductionStateIs(1);
                     }
-                    if (lable.equals("7")){
-                        name = name + " " + "工信部断卡单停 ";
+                    if (smcSpecialCheckLog.getUserCertificateState() != null && !smcSpecialCheckLog.getUserCertificateState().equals(smcSpecialCheckLogHistory.getUserCertificateState())){
+                        specialExaminationExport.setUserCertificateStateIs(1);
                     }
-                    if (lable.equals("8")){
-                        name = name + " " + "实人核验未通过关停（单停）";
+                    if (smcSpecialCheckLog.getFraudPreventionState() != null && !smcSpecialCheckLog.getFraudPreventionState().equals(smcSpecialCheckLogHistory.getFraudPreventionState())){
+                        specialExaminationExport.setFraudPreventionStateIs(1);
                     }
-                    if (lable.equals("999")){
-                        name = name + " " + "其它 ";
+                    if (smcSpecialCheckLog.getConsumptionVoucherState() != null && !smcSpecialCheckLog.getConsumptionVoucherState().equals(smcSpecialCheckLogHistory.getConsumptionVoucherState())){
+                        specialExaminationExport.setConsumptionVoucherStateIs(1);
                     }
                 }
-                specialExaminationExport.setShutdownLabel(name);
             }
-            specialExaminationExport.setDataId(smsCheckCustomerInfo.getDataId());
-            //以dataid代替id
-            //smsCheckCustomerDataAndLog.setDataId(smsCheckCustomerInfo.getId());
+
+
+
             pageList.add(specialExaminationExport);
         }
 
@@ -685,10 +715,10 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         mv.addObject(NormalExcelConstants.FILE_NAME, title);
         mv.addObject(NormalExcelConstants.CLASS, clazz);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
         exportParams.setImageBasePath(upLoadPath);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }

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

@@ -0,0 +1,110 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 特审复开审批稽核表
+ */
+@Data
+@TableName("smc_special_check_log_history")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="smc_special_check_log_history", description="特审复开审批稽核历史表")
+public class SmcSpecialCheckLogHistory implements Serializable {
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /** 任务ID */
+    private String taskId;
+    /** 客户信息ID */
+    private String infoId;
+    /** 客户资料ID */
+    private String dataId;
+    /** 基础信息稽核结果 */
+    private Integer basicInfoState;
+    /**  */
+    private String basicInfoNote;
+    /** 系统实名制截图 */
+    private Integer nameFindComplianceState;
+    /**  */
+    private String nameFindComplianceNote;
+    /** 特审单 */
+    private Integer specialReviewFormState;
+    /**  */
+    private String specialReviewFormNote;
+    /** 身份证照片/正反面 */
+    private Integer idCardState;
+    /**  */
+    private String idCardNote;
+    /** 手持证件半身照片 */
+    private Integer handCertificateState;
+    /**  */
+    private String handCertificateNote;
+    /** 号卡 */
+    private Integer numberCardState;
+    /**  */
+    private String numberCardNote;
+    /** 防诈骗承诺函 */
+    private Integer letterCommitmentState;
+    /**  */
+    private String letterCommitmentNote;
+    /** 营业执照副本 */
+    private Integer businessLicenseState;
+    /**  */
+    private String businessLicenseNote;
+    /** 介绍信 */
+    private Integer letterIntroductionState;
+    /**  */
+    private String letterIntroductionNote;
+    /** 使用人证件 */
+    private Integer userCertificateState;
+    /**  */
+    private String userCertificateNote;
+    /** 防诈骗承诺 */
+    private Integer fraudPreventionState;
+    /**  */
+    private String fraudPreventionNote;
+    /** 消费凭证 */
+    private Integer consumptionVoucherState;
+    /**  */
+    private String consumptionVoucherNote;
+    /** 承诺视频 */
+    private Integer commitmentVideoState;
+    /**  */
+    private String commitmentVideoNote;
+    /** 员工编号 */
+    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;
+
+}

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

@@ -105,6 +105,8 @@ public class SmsCheckCustomerInfo implements Serializable {
     @Excel(name = "员工三级部门编号", width = 15)
     @ApiModelProperty(value = "员工三级部门编号")
     private String staffDeptLevel3No;
+    /**申请厅店/组别*/
+    private String staffDeptLevel4Name;
 	/** 用户开通状态 (1：开通；2：拆机)*/
     //@Excel(name = "用户开通状态", width = 15)
     @ApiModelProperty(value = "用户开通状态")

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

@@ -75,8 +75,16 @@ public class SmsCheckCustomerSpeciaInfo implements Serializable {
     private String nameFindCompliance;
     /** 负责人 */
     @Excel(name = "负责人", width = 15)
-    @ApiModelProperty(value = "负责人")
     private String staffName;
+
+    @ApiModelProperty(value = "申请人二级部门")
+    private String staffDeptLevel2Name;
+    @Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "申请人三级部门")
+    private String staffDeptLevel3Name;
+    @Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "申请人厅店/组别")
+    private String staffDeptLevel4Name;
     /** 负责人工号 */
     @Excel(name = "负责人工号", width = 15)
     @ApiModelProperty(value = "负责人工号")

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

@@ -116,6 +116,8 @@ public class SpecialExamination implements Serializable {
     @ApiModelProperty(value = "审核状态")
     private Integer status;
 
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "复开时间")
     private Date reopenTime;
 

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

@@ -14,30 +14,39 @@ public class SpecialExaminationExport {
     /** 客户资料ID */
     private String dataId;
     /**提交材料日期*/
-    @Excel(name = "提交材料日期", width = 15)
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private String createTime;
+    @Excel(name = "提交材料日期", width = 15,format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
     /** 客户名称 */
     @Excel(name = "机主姓名", width = 15)
     private String customerName;
-    @Excel(name = "服务号码（全）", width = 15)
+    @Excel(name = "号码", width = 15)
     @ApiModelProperty(value = "号码")
     private String smsNumber;
+    @Excel(name = "关停标签", width = 20)
+    private String shutdownLabel;
     @Excel(name = "最后一次关停时间", width = 15)
     private String shutdownLabelDate;
-    @Excel(name = "有无特审单", width = 15)
+    @Excel(name = "有无特审单/签报", width = 15)
     private String materialLabel;
     @Excel(name = "是否自查实名制合规", width = 20)
     private String nameFindCompliance;
-    @Excel(name = "负责人", width = 15)
+    @Excel(name = "申请二级部门", width = 20)
+    private String staffDeptLevel2Name;
+    @Excel(name = "申请三级部门", width = 20)
+    private String staffDeptLevel3Name;
+    @Excel(name = "申请厅店/组别", width = 20)
+    private String staffDeptLevel4Name;
+    @Excel(name = "工单创建人", width = 15)
     private String staffName;
-    @Excel(name = "负责人工号", width = 15)
+    @Excel(name = "创建人工号", width = 15)
     private String staffNo;
-    @Excel(name = "复开时间", width = 15)
-    private String reopenTime;
-    @Excel(name = "关停标签", width = 20)
-    private String shutdownLabel;
+
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "复开时间", width = 15,format = "yyyy-MM-dd HH:mm:ss")
+    private Date reopenTime;
     @Excel(name = "系统实名制截图稽核结果", width = 20 , dicCode = "special_check_state")
     private Integer nameFindComplianceState;
     @Excel(name = "系统实名制截图稽核备注", width = 20)
@@ -91,6 +100,37 @@ public class SpecialExaminationExport {
     private String consumptionVoucherNote;
 
 
+
+    @Excel(name = "系统实名制截图稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer nameFindComplianceStateIs;
+    @Excel(name = "特审单稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer specialReviewFormStateIs;
+    /** 身份证照片/正反面 */
+    @Excel(name = "身份证照片稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer idCardStateIs;
+    /** 手持证件半身照片 */
+    @Excel(name = "手持证件半身照片稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer handCertificateStateIs;
+    @Excel(name = "号卡稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer numberCardStateIs;
+    /** 防诈骗承诺函 */
+    @Excel(name = "防诈骗承诺函稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer letterCommitmentStateIs;
+    /** 营业执照副本 */
+    @Excel(name = "营业执照副本稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer businessLicenseStateIs;
+    /** 介绍信 */
+    @Excel(name = "介绍信稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer letterIntroductionStateIs;
+    @Excel(name = "使用人证件稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer userCertificateStateIs;
+    /** 防诈骗承诺 */
+    @Excel(name = "防诈骗承诺稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer fraudPreventionStateIs;
+    /** 消费凭证 */
+    @Excel(name = "消费凭证稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer consumptionVoucherStateIs;
+
     /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； */
     @Excel(name = "稽核状态", width = 15, dicCode = "sms_check_check_state")
     @Dict(dicCode = "sms_check_check_state")

tnc-sms/src/main/java/org/jeecg/modules/smscheck/enums/SpecialExaminationReopen.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.smscheck.enums;
+
+/* renamed from: org.jeecg.modules.online.cgform.enums.c */
+/* loaded from: hibernate-re-3.1.0-beta2.jar:org/jeecg/modules/online/cgform/enums/c.class */
+public enum SpecialExaminationReopen {
+    shutdownLabel0("安防停机（高危漫游地）","0"),
+    shutdownLabel1("安防关停（紫名单）","1"),
+    shutdownLabel2("安防停机（专班研判）","2"),
+    shutdownLabel3("安防停机（可复开）","3"),
+    shutdownLabel4("沉默移动卡保护性单停","4"),
+    shutdownLabel5("集团一点停复机（单停）","5"),
+    shutdownLabel6("大数据保护停机单停","6"),
+    shutdownLabel7("工信部断卡单停","7"),
+    shutdownLabel8("实人核验未通过关停（单停）","8"),
+    shutdownLabel999("其它","999");
+
+
+
+
+    /* renamed from: e */
+    private String name;
+
+    /* renamed from: f */
+    private String value;
+
+    SpecialExaminationReopen(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /* renamed from: b */
+    public static String findNameByValue(String value) {
+        SpecialExaminationReopen[] a;
+        for (SpecialExaminationReopen base : SpecialExaminationReopen.values()) {
+            if (base.value.equals(value)) {
+                return base.name;
+            }
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.smscheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.smscheck.entity.SmcSpecialCheckLogHistory;
+
+/**
+ * 特审复开稽核历史表
+ */
+@Mapper
+public interface SmcSpecialCheckLogHistoryMapper extends BaseMapper<SmcSpecialCheckLogHistory> {
+}

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

@@ -20,4 +20,13 @@ public interface SmsCheckTaskMapper extends BaseMapper<SmsCheckTask> {
 //            "and org_type = #{orgType} " +
             "and u.work_no = #{workNo} ")
     List<String> getDeptNameByUserId( String workNo);
+
+
+    @Select("SELECT d.depart_name " +
+            "FROM sys_user_depart ud,sys_depart d,sys_user u " +
+            "WHERE d.id = ud.dep_id " +
+            "and u.id = ud.user_id  " +
+            "and org_type = #{orgType} " +
+            "and u.work_no = #{workNo} ")
+    List<String> getDeptNameByWorkNo(String orgType,String workNo);
 }

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

@@ -14,4 +14,6 @@ import java.util.List;
 public interface ISmsCheckTaskService extends IService<SmsCheckTask> {
 
     List<String> getDeptNameByUserId( String workNo);
+
+    List<String> getDeptNameByWorkNo(String orgType, String workNo);
 }

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

@@ -0,0 +1,16 @@
+package org.jeecg.modules.smscheck.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.HdrHistogram.Histogram;
+import org.jeecg.modules.smscheck.entity.SmcSpecialCheckLog;
+import org.jeecg.modules.smscheck.entity.SmcSpecialCheckLogHistory;
+import org.jeecg.modules.smscheck.entity.SmcSpecialCheckLogStateVo;
+
+
+/**
+ *  特审复开审稽核业务历史
+ */
+public interface SmcSpecialCheckLogHistoryService extends IService<SmcSpecialCheckLogHistory> {
+
+
+}

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

@@ -9,12 +9,7 @@ import org.jeecg.modules.smscheck.entity.SmcSpecialCheckLogStateVo;
  *  特审复开审稽核业务
  */
 public interface SmcSpecialCheckLogService extends IService<SmcSpecialCheckLog> {
-    /**
-     * 特审复开审资料稽核
-     * @param SmcSpecialCheckLogStateVo
-     * @return
-     * @throws IllegalAccessException
-     */
+
     Boolean reflectCheck(SmcSpecialCheckLogStateVo smcSpecialCheckLogStateVo) throws IllegalAccessException;
 
     SmcSpecialCheckLogStateVo reflectCheckExcel(SmcSpecialCheckLogStateVo smcSpecialCheckLogStateVo) throws IllegalAccessException;

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

@@ -0,0 +1,21 @@
+package org.jeecg.modules.smscheck.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.smscheck.entity.SmcSpecialCheckLog;
+import org.jeecg.modules.smscheck.entity.SmcSpecialCheckLogHistory;
+import org.jeecg.modules.smscheck.entity.SmcSpecialCheckLogStateVo;
+import org.jeecg.modules.smscheck.mapper.SmcSpecialCheckLogHistoryMapper;
+import org.jeecg.modules.smscheck.mapper.SmcSpecialCheckLogMapper;
+import org.jeecg.modules.smscheck.service.SmcSpecialCheckLogHistoryService;
+import org.jeecg.modules.smscheck.service.SmcSpecialCheckLogService;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Field;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Service
+public class SmcSpecialCheckLogHistoryServiceImpl extends ServiceImpl<SmcSpecialCheckLogHistoryMapper, SmcSpecialCheckLogHistory> implements SmcSpecialCheckLogHistoryService {
+
+
+}

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

@@ -29,4 +29,12 @@ public class SmsCheckTaskServiceImpl extends ServiceImpl<SmsCheckTaskMapper, Sms
         }
         return checkTaskMapper.getDeptNameByUserId(workNo);
     }
+
+    @Override
+    public List<String> getDeptNameByWorkNo(String orgType,String workNo) {
+        if (StringUtils.isEmpty(workNo)){
+            return null;
+        }
+        return checkTaskMapper.getDeptNameByWorkNo(orgType,workNo);
+    }
 }