稽核是否整改过

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

@@ -53,6 +53,8 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @Autowired
     private ISmsCheckCustomerDataLogService checkCustomerDataLogService;
     @Autowired
+    private ISmsCheckCustomerDataLogBillService iSmsCheckCustomerDataLogBillService;
+    @Autowired
     private ISmsCheckCustomerInfoService infoService;
     @Autowired
     private ISmsCheckCustomerDataService customerDataService;
@@ -189,6 +191,12 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
             smsCheckZGHistoryService.saveBatch(smsCheckZGHistories);
         }
         boolean saveLog = checkCustomerDataLogService.saveOrUpdate(smsCheckCustomerDataLog);
+
+        SmsCheckCustomerDataLogBill smsCheckCustomerDataLogBill = new SmsCheckCustomerDataLogBill();
+        BeanUtils.copyProperties(smsCheckCustomerDataLog,smsCheckCustomerDataLogBill);
+        smsCheckCustomerDataLogBill.setId(null);
+        iSmsCheckCustomerDataLogBillService.save(smsCheckCustomerDataLogBill);
+
         boolean saveData = customerDataService.saveOrUpdate(smsCheckCustomerData);
 
 

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

@@ -60,6 +60,8 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
     @Autowired
+    private ISmsCheckCustomerDataLogBillService iSmsCheckCustomerDataLogBillService;
+    @Autowired
     private ISmsCheckCustomerInfoService customerInfoService;
     @Autowired
     private ISmsCheckCustomerDataService customerDataService;
@@ -333,6 +335,68 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                 pageList.add(smsCheckCustomerDataAndLog);
 
 
+        }
+        // 判断是否整改过
+        for (SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog : pageList) {
+            LambdaQueryWrapper<SmsCheckCustomerDataLogBill> querySaWrapper = new LambdaQueryWrapper<SmsCheckCustomerDataLogBill>();
+            //全部人员
+            querySaWrapper.eq(SmsCheckCustomerDataLogBill::getInfoId,smsCheckCustomerDataAndLog.getInfoId());
+            List<SmsCheckCustomerDataLogBill> list = iSmsCheckCustomerDataLogBillService.list(querySaWrapper);
+            for (SmsCheckCustomerDataLogBill smsCheckCustomerDataLogBill : list) {
+                //不相等 说明整改
+                if (!smsCheckCustomerDataAndLog.getInfoResult().equals(smsCheckCustomerDataLogBill.getInfoResult())){
+                    smsCheckCustomerDataAndLog.setInfoResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getContractDateResult().equals(smsCheckCustomerDataLogBill.getContractDateResult())){
+                    smsCheckCustomerDataAndLog.setContractDateResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getBusinessLicenseDateResult().equals(smsCheckCustomerDataLogBill.getBusinessLicenseDateResult())){
+                    smsCheckCustomerDataAndLog.setBusinessLicenseDateResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getCodeNumberDateResult().equals(smsCheckCustomerDataLogBill.getCodeNumberDateResult())){
+                    smsCheckCustomerDataAndLog.setCodeNumberDateResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getFilingsDateResult().equals(smsCheckCustomerDataLogBill.getFilingsDateResult())){
+                    smsCheckCustomerDataAndLog.setFilingsDateResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getPermitDateResult().equals(smsCheckCustomerDataLogBill.getPermitDateResult())){
+                    smsCheckCustomerDataAndLog.setPermitDateResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getCorporationCardResult().equals(smsCheckCustomerDataLogBill.getCorporationCardResult())){
+                    smsCheckCustomerDataAndLog.setCorporationCardResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getPersonResponsibleResult().equals(smsCheckCustomerDataLogBill.getPersonResponsibleResult())){
+                    smsCheckCustomerDataAndLog.setPersonResponsibleResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getOperatorCardResult().equals(smsCheckCustomerDataLogBill.getOperatorCardResult())){
+                    smsCheckCustomerDataAndLog.setOperatorCardResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getOperatorCardPhoneResult().equals(smsCheckCustomerDataLogBill.getOperatorCardPhoneResult())){
+                    smsCheckCustomerDataAndLog.setOperatorCardPhoneResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getDevicePhoneResult().equals(smsCheckCustomerDataLogBill.getDevicePhoneResult())){
+                    smsCheckCustomerDataAndLog.setDevicePhoneResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getTextMessageResult().equals(smsCheckCustomerDataLogBill.getTextMessageResult())){
+                    smsCheckCustomerDataAndLog.setTextMessageResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getTextMessageBookResult().equals(smsCheckCustomerDataLogBill.getTextMessageBookResult())){
+                    smsCheckCustomerDataAndLog.setTextMessageBookResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getSecureBookResult().equals(smsCheckCustomerDataLogBill.getSecureBookResult())){
+                    smsCheckCustomerDataAndLog.setSecureBookResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getSpecialResult().equals(smsCheckCustomerDataLogBill.getSpecialResult())){
+                    smsCheckCustomerDataAndLog.setSpecialResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getNetworkAccessResult().equals(smsCheckCustomerDataLogBill.getNetworkAccessResult())){
+                    smsCheckCustomerDataAndLog.setNetworkAccessResultIs("是");
+                }
+                if (!smsCheckCustomerDataAndLog.getGroupPriceApprovalResult().equals(smsCheckCustomerDataLogBill.getGroupPriceApprovalResult())){
+                    smsCheckCustomerDataAndLog.setGroupPriceApprovalResultIs("是");
+                }
+            }
+
         }
 
         List<SmsCheckCustomerDataAndLog> exportList = null;

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

@@ -14,40 +14,42 @@ public class ObjectComparator {
         Field[] fields = clazz.getDeclaredFields();
 
         for (Field field : fields) {
-            if (!field.getAnnotation(ApiModelProperty.class).value().contains("上传资料")){
+
                 field.setAccessible(true);
                 Object value1 = field.get(obj1);
                 Object value2 = field.get(obj2);
                 if (value1!=null && value2!=null){
                     if (!value1.equals(value2)) {
-                        if (field.getAnnotation(ApiModelProperty.class).value().contains("是否")){
-                            if (value1.equals("1")){
-                                value1="是";
-                            }else {
-                                value1="否";
-                            }
-                            if (value2.equals("1")){
-                                value2="是";
-                            }else {
-                                value2="否";
-                            }
-                        }
-                        if (field.getAnnotation(ApiModelProperty.class).value().contains("稽核结果")){
-                            if (value1.equals("1")){
-                                value1="是";
-                            }else {
-                                value1="否";
-                            }
-                            if (value2.equals("1")){
-                                value2="是";
-                            }else {
-                                value2="否";
+                        if (!field.getAnnotation(ApiModelProperty.class).value().contains("上传资料") && !field.getAnnotation(ApiModelProperty.class).value().contains("稽核结果")){
+                            if (field.getAnnotation(ApiModelProperty.class).value().contains("是否")){
+                                if (value1.equals("1")){
+                                    value1="是";
+                                }else {
+                                    value1="否";
+                                }
+                                if (value2.equals("1")){
+                                    value2="是";
+                                }else {
+                                    value2="否";
+                                }
                             }
+//                            if (field.getAnnotation(ApiModelProperty.class).value().contains("稽核结果")){
+//                                if (value1.equals("1")){
+//                                    value1="是";
+//                                }else {
+//                                    value1="否";
+//                                }
+//                                if (value2.equals("1")){
+//                                    value2="是";
+//                                }else {
+//                                    value2="否";
+//                                }
+//                            }
+                            diffProperties.put(field.getAnnotation(ApiModelProperty.class).value(), "原值:"+value2+"  ->  现值:"+value1);
                         }
-                        diffProperties.put(field.getAnnotation(ApiModelProperty.class).value(), "原值:"+value2+"  ->  现值:"+value1);
+
                     }
                 }
-            }
         }
 
         return diffProperties;

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

@@ -402,4 +402,58 @@ public class SmsCheckCustomerDataAndLog  {
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 
+
+    @Excel(name = "基本信息稽核稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "基本信息稽核稽核结果是否整改过")
+    private String infoResultIs;
+    @Excel(name = "合同到期时间稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "合同到期时间稽核结果是否整改过")
+    private String  contractDateResultIs;
+    @Excel(name = "营业执照到期时间稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "营业执照到期时间稽核结果是否整改过")
+    private String businessLicenseDateResultIs;
+    @Excel(name = "码号证书到期时间稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "码号证书到期时间稽核结果是否整改过")
+    private String codeNumberDateResultIs;
+    @Excel(name = "备案通知到期时间稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "备案通知到期时间稽核结果是否整改过")
+    private String filingsDateResultIs;
+    @Excel(name = "增值业务许可证到期时间稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "增值业务许可证到期时间稽核结果是否整改过")
+    private String permitDateResultIs;
+    @Excel(name = "法人/责任人证件稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "法人/责任人证件稽核结果是否整改过")
+    private String corporationCardResultIs;
+    @Excel(name = "责任人授权书稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "责任人授权书稽核结果是否整改过")
+    private String personResponsibleResultIs;
+    @Excel(name = "经办人证件稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "经办人证件稽核结果是否整改过")
+    private String operatorCardResultIs;
+    @Excel(name = "经办人手持身份证照片稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "经办人手持身份证照片稽核结果是否整改过")
+    private String operatorCardPhoneResultIs;
+    @Excel(name = "机房设备照片稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "机房设备照片稽核结果是否整改过")
+    private String devicePhoneResultIs;
+    @Excel(name = "短信模板稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "短信模板稽核结果是否整改过")
+    private String textMessageResultIs;
+    @Excel(name = "端口类短信业务责任承诺书稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "端口类短信业务责任承诺书稽核结果是否整改过")
+    private String textMessageBookResultIs;
+    @Excel(name = "信息安全责任承诺书稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "信息安全责任承诺书稽核结果是否整改过")
+    private String secureBookResultIs;
+    @Excel(name = "特殊资费审批稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "特殊资费审批稽核结果是否整改过")
+    private String specialResultIs;
+    @Excel(name = "入网签报稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "入网签报稽核结果是否整改过")
+    private String networkAccessResultIs;
+    @Excel(name = "集团价格审批稽核结果是否整改过", width = 15)
+    @ApiModelProperty(value = "集团价格审批稽核结果是否整改过")
+    private String groupPriceApprovalResultIs;
+
+
 }

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

@@ -0,0 +1,120 @@
+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.Objects;
+
+@Data
+@TableName("sms_check_customer_data_log_bill")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_customer_data_log_bill", description="客户资料稽核稽核结果bill")
+public class SmsCheckCustomerDataLogBill {
+
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /** 客户id */
+    @Excel(name = "客户id", width = 15)
+    @ApiModelProperty(value = "客户id")
+    private String infoId;
+    @ApiModelProperty(value = "基本信息稽核稽核结果")
+    private String infoResult;
+    @ApiModelProperty(value = "基本信息结果备注")
+    private String infoResultRemark;
+    @ApiModelProperty(value = "稽核资料ID")
+    private String dataId;
+
+    @ApiModelProperty(value = "合同到期时间稽核结果")
+    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/mapper/SmsCheckCustomerDataLogBillMapper.java

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

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

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

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