ソースを参照

上传资料不记录历史

sunyize 2 年 前
コミット
49bea1a0a4

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

@@ -14,36 +14,38 @@ public class ObjectComparator {
         Field[] fields = clazz.getDeclaredFields();
 
         for (Field field : fields) {
-            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 (!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 (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);
                     }
-                    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);
                 }
             }
         }

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

@@ -75,56 +75,56 @@ public class SmsCheckCustomerData implements Serializable {
     private String sysOrgCode;
 
 
-    @ApiModelProperty(value = "合同到期时间资料")
+    @ApiModelProperty(value = "合同到期时间上传资料")
     private String contractDate;
 
 
-    @ApiModelProperty(value = " 营业执照到期时间资料")
+    @ApiModelProperty(value = " 营业执照到期时间上传资料")
     private String businessLicenseDate;
 
 
-    @ApiModelProperty(value = " 码号证书到期时间资料")
+    @ApiModelProperty(value = " 码号证书到期时间上传资料")
     private String codeNumberDate;
 
 
-    @ApiModelProperty(value = " 备案通知到期时间资料")
+    @ApiModelProperty(value = " 备案通知到期时间上传资料")
     private String filingsDate;
 
-    @ApiModelProperty(value = " 增值业务许可证到期时间资料")
+    @ApiModelProperty(value = " 增值业务许可证到期时间上传资料")
     private String permitDate;
 
-    @ApiModelProperty(value = " 法人/责任人证件")
+    @ApiModelProperty(value = " 法人/责任人证件上传资料")
     private String corporationCard;
 
-    @ApiModelProperty(value = " 责任人授权书")
+    @ApiModelProperty(value = " 责任人授权书上传资料")
     private String personResponsible;
 
-    @ApiModelProperty(value = " 经办人证件")
+    @ApiModelProperty(value = " 经办人证件上传资料")
     private String operatorCard;
 
-    @ApiModelProperty(value = " 经办人手持身份证照片(背景需为电信营业厅或白墙)")
+    @ApiModelProperty(value = " 经办人手持身份证照片(背景需为电信营业厅或白墙)上传资料")
     private String operatorCardPhone;
 
-    @ApiModelProperty(value = " 机房设备照片")
+    @ApiModelProperty(value = " 机房设备照片上传资料")
     private String devicePhone;
 
-    @ApiModelProperty(value = " 短信模板")
+    @ApiModelProperty(value = " 短信模板上传资料")
     private String textMessage;
 
 
-    @ApiModelProperty(value = " 端口类短信业务责任承诺书")
+    @ApiModelProperty(value = " 端口类短信业务责任承诺书上传资料")
     private String textMessageBook;
 
-    @ApiModelProperty(value = " 信息安全责任承诺书")
+    @ApiModelProperty(value = " 信息安全责任承诺书上传资料")
     private String secureBook;
 
-    @ApiModelProperty(value = " 特殊资费审批(标准资费无需提供)")
+    @ApiModelProperty(value = " 特殊资费审批(标准资费无需提供)上传资料")
     private String special;
 
-    @ApiModelProperty(value = " 入网签报")
+    @ApiModelProperty(value = " 入网签报上传资料")
     private String networkAccess;
 
-    @ApiModelProperty(value = " 集团价格审批")
+    @ApiModelProperty(value = " 集团价格审批上传资料")
     private String groupPriceApproval;
 
     @ApiModelProperty(value = " 码号")