稽核结果备注 记录

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

@@ -4,57 +4,57 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModelProperty;
-import org.jeecg.modules.smscheck.entity.FileStaticUrl;
-import org.jeecg.modules.smscheck.entity.MyCustomAnnotation;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
-import org.jeecg.modules.smscheck.entity.UrlData;
-
+import io.swagger.models.auth.In;
+import org.jeecg.modules.smscheck.entity.*;
+import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
+
 public class ObjectComparator {
-    public static Map<String, Object> compareObjects(Object obj1, Object obj2) throws IllegalAccessException {
+
+
+    public static Map<String, Object> compareObjects(Object obj1, Object obj2, Integer type) throws IllegalAccessException {
         Map<String, Object> diffProperties = new HashMap<>();
 
         Class<?> clazz = obj1.getClass();
         Field[] fields = clazz.getDeclaredFields();
-
+        int i=-1;
         for (Field field : fields) {
-
+            i++;
                 field.setAccessible(true);
                 Object value1 = field.get(obj1);
                 Object value2 = field.get(obj2);
                 if (value1!=null && value2!=null && field!=null && field.getAnnotation(ApiModelProperty.class)!=null  ){
+                    System.out.println(field.getAnnotation(ApiModelProperty.class).value());
                     if (!value1.equals(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("上传资料") && !field.getAnnotation(ApiModelProperty.class).value().contains("稽核结果")){
+                      //  if (!field.getAnnotation(ApiModelProperty.class).value().contains("上传资料")){
+                            if (!field.getAnnotation(ApiModelProperty.class).value().contains("稽核结果") && type!=2){
+                                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);
                         }
-
+                       if (field.getAnnotation(ApiModelProperty.class).value().contains("稽核结果") && type==2){
+                           diffProperties.put(field.getAnnotation(ApiModelProperty.class).value(), "原值:"+value2+"  ->  现值:"+value1);
+                       }
                     }
                 }
         }

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

@@ -172,13 +172,13 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
 
         SmsCheckCustomerInfo byId = iSmsCheckCustomerInfoService.getById(smsCheckCustomerDataLog.getInfoId());
         smsCheckCustomerDataLog.setDataId(byId.getDataId());
-
+        SmsCheckTask byId1 = taskService.getById(byId.getTaskId());
         List<SmsCheckZGHistory> smsCheckZGHistories = new ArrayList<>();
 
         // SmsCheckCustomerDataLog  如果id不是空的 则存在以前数据
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getId())){
             SmsCheckCustomerDataLog checkCustomerDataLog = checkCustomerDataLogService.getById(smsCheckCustomerDataLog.getId());
-            Map<String, Object> diffProperties = ObjectComparator.compareObjects(smsCheckCustomerDataLog, checkCustomerDataLog);
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(smsCheckCustomerDataLog, checkCustomerDataLog,byId1.getType());
             for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
                 SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
                 checkZGHistory.setDataId(byId.getDataId());
@@ -194,7 +194,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         //SmsCheckCustomerData 如果id不是空的 则存在以前数据
         if (StringUtils.isNotBlank(smsCheckCustomerData.getId())){
             SmsCheckCustomerData checkCustomerData = customerDataService.getById(smsCheckCustomerData.getId());
-            Map<String, Object> diffProperties = ObjectComparator.compareObjects(smsCheckCustomerData, checkCustomerData);
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(smsCheckCustomerData, checkCustomerData,byId1.getType());
             for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
                 SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
                 checkZGHistory.setDataId(byId.getDataId());

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

@@ -42,7 +42,8 @@ public class SmsLotCustomerController extends JeecgController<SmsLotCustomerData
 
     @Autowired
     private SmsLotCustomerService lotCustomerService;
-
+    @Autowired
+    private ISmsCheckTaskService taskService;
     /**
      * 客户信息业务
      */
@@ -145,12 +146,14 @@ public class SmsLotCustomerController extends JeecgController<SmsLotCustomerData
         SmsCheckCustomerInfo byId = infoService.getById(lotCheckLog.getInfoId());
         lotCheckLog.setDataId(byId.getDataId());
 
+        SmsCheckTask byId1 = taskService.getById(byId.getTaskId());
+
         List<SmsCheckZGHistory> smsCheckZGHistories = new ArrayList<>();
 
 //         SmsCheckCustomerDataLog  如果id不是空的 则存在以前数据
         if (StringUtils.isNotBlank(lotCheckLog.getId())){
             SmcLotCheckLog logServiceById = smcLotCheckLogService.getById(lotCheckLog.getId());
-            Map<String, Object> diffProperties = ObjectComparator.compareObjects(lotCheckLog, logServiceById);
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(lotCheckLog, logServiceById,byId1.getType());
             for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
                 SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
                 checkZGHistory.setDataId(byId.getDataId());
@@ -166,7 +169,7 @@ public class SmsLotCustomerController extends JeecgController<SmsLotCustomerData
         //SmsCheckCustomerData 如果id不是空的 则存在以前数据
         if (StringUtils.isNotBlank(lotCustomerData.getId())){
             SmsLotCustomerData dataServiceById = smsLotCustomerService.getById(lotCustomerData.getId());
-            Map<String, Object> diffProperties = ObjectComparator.compareObjects(lotCustomerData, dataServiceById);
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(lotCustomerData, dataServiceById,byId1.getType());
             for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
                 SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
                 checkZGHistory.setDataId(byId.getDataId());

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

@@ -199,13 +199,13 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
 
         SmsCheckCustomerInfo byId = infoService.getById(truckCheckLog.getInfoId());
         truckCheckLog.setDataId(byId.getDataId());
-
+        SmsCheckTask byId1 = taskService.getById(byId.getTaskId());
         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);
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(truckCheckLog, logServiceById,byId1.getType());
             for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
                 SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
                 checkZGHistory.setDataId(byId.getDataId());
@@ -221,7 +221,7 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
         //SmsCheckCustomerData 如果id不是空的 则存在以前数据
         if (StringUtils.isNotBlank(truckCustomerData.getId())){
             SmsTruckCustomerData dataServiceById = smsTruckCustomerDataService.getById(truckCustomerData.getId());
-            Map<String, Object> diffProperties = ObjectComparator.compareObjects(truckCustomerData, dataServiceById);
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(truckCustomerData, dataServiceById,byId1.getType());
             for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
                 SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
                 checkZGHistory.setDataId(byId.getDataId());

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

@@ -96,22 +96,39 @@ public class SmcLotCheckLog {
     private String sysOrgCode;
 
     private String infoResult;
+    @ApiModelProperty(value = "基本信息稽核结果备注")
     private String infoResultRemark;
-    private String testCardResult;
+
+     private String testCardResult;
+    @ApiModelProperty(value = "测试卡申请单稽核结果备注")
     private String testCardResultRemark;
-    private String contractResult;
+
+     private String contractResult;
+    @ApiModelProperty(value = "合同要求稽核结果备注")
     private String contractResultRemark;
+
     private String handlingContractResult;
+    @ApiModelProperty(value = "责任人和经办人授权书稽核结果备注")
     private String handlingContractResultRemark;
+
     private String handlingCardResult;
+    @ApiModelProperty(value = "责任人和经办人身份证稽核结果备注")
     private String handlingCardResultRemark;
+
     private String customerCardScanningResult;
+    @ApiModelProperty(value = "客户证件扫描稽核结果备注")
     private String customerCardScanningResultRemark;
+
     private String riskTableResult;
+    @ApiModelProperty(value = "风险评估表稽核结果备注")
     private String riskTableResultRemark;
+
     private String priceTableResult;
+    @ApiModelProperty(value = " 省/集团价格审批表稽核结果备注")
     private String priceTableResultRemark;
+
     private String commitmentResult;
+    @ApiModelProperty(value = "其他材料稽核结果备注")
     private String commitmentResultRemark;