物联网稽核

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

@@ -18,7 +18,7 @@ public class ObjectComparator {
                 field.setAccessible(true);
                 Object value1 = field.get(obj1);
                 Object value2 = field.get(obj2);
-                if (value1!=null && value2!=null){
+                if (value1!=null && value2!=null && field!=null && field.getAnnotation(ApiModelProperty.class)!=null  ){
                     if (!value1.equals(value2)) {
                         if (!field.getAnnotation(ApiModelProperty.class).value().contains("上传资料") && !field.getAnnotation(ApiModelProperty.class).value().contains("稽核结果")){
                             if (field.getAnnotation(ApiModelProperty.class).value().contains("是否")){

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.smscheck.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -144,38 +145,38 @@ public class SmsLotCustomerController extends JeecgController<SmsLotCustomerData
 
         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);
-//            for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
-//                SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
-//                checkZGHistory.setDataId(byId.getDataId());
-//                checkZGHistory.setContext(entry.getValue().toString());
-//                checkZGHistory.setUpdateField(entry.getKey());
-//                Date date = new Date();
-//                SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
-//                checkZGHistory.setUpdateDate(dateFormat.format(date));
-//                smsCheckZGHistories.add(checkZGHistory);
-//                System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
-//            }
-//        }
-//        //SmsCheckCustomerData 如果id不是空的 则存在以前数据
-//        if (StringUtils.isNotBlank(lotCustomerData.getId())){
-//            SmsLotCustomerData dataServiceById = smsLotCustomerService.getById(lotCustomerData.getId());
-//            Map<String, Object> diffProperties = ObjectComparator.compareObjects(lotCustomerData, dataServiceById);
-//            for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
-//                SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
-//                checkZGHistory.setDataId(byId.getDataId());
-//                checkZGHistory.setContext(entry.getValue().toString());
-//                checkZGHistory.setUpdateField(entry.getKey());
-//                Date date = new Date();
-//                SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
-//                checkZGHistory.setUpdateDate(dateFormat.format(date));
-//                smsCheckZGHistories.add(checkZGHistory);
-//                System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
-//            }
-//        }
+//         SmsCheckCustomerDataLog  如果id不是空的 则存在以前数据
+        if (StringUtils.isNotBlank(lotCheckLog.getId())){
+            SmcLotCheckLog logServiceById = smcLotCheckLogService.getById(lotCheckLog.getId());
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(lotCheckLog, logServiceById);
+            for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
+                SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
+                checkZGHistory.setDataId(byId.getDataId());
+                checkZGHistory.setContext(entry.getValue().toString());
+                checkZGHistory.setUpdateField(entry.getKey());
+                Date date = new Date();
+                SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                checkZGHistory.setUpdateDate(dateFormat.format(date));
+                smsCheckZGHistories.add(checkZGHistory);
+                System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
+            }
+        }
+        //SmsCheckCustomerData 如果id不是空的 则存在以前数据
+        if (StringUtils.isNotBlank(lotCustomerData.getId())){
+            SmsLotCustomerData dataServiceById = smsLotCustomerService.getById(lotCustomerData.getId());
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(lotCustomerData, dataServiceById);
+            for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
+                SmsCheckZGHistory checkZGHistory = new SmsCheckZGHistory();
+                checkZGHistory.setDataId(byId.getDataId());
+                checkZGHistory.setContext(entry.getValue().toString());
+                checkZGHistory.setUpdateField(entry.getKey());
+                Date date = new Date();
+                SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                checkZGHistory.setUpdateDate(dateFormat.format(date));
+                smsCheckZGHistories.add(checkZGHistory);
+                System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
+            }
+        }
         if (smsCheckZGHistories.size()>0){
             smsCheckZGHistoryService.saveBatch(smsCheckZGHistories);
         }
@@ -189,9 +190,9 @@ public class SmsLotCustomerController extends JeecgController<SmsLotCustomerData
 
         boolean saveData = lotCustomerService.saveOrUpdate(lotCustomerData);
 
-
+        List<StepsNowVo> strings = JSONArray.parseArray(lotCheckCustomerDataAndLog.getStepsNow(), StepsNowVo.class);
         if (saveLog && saveData){
-            Map<String, String> mapByResult = getMapByResult(lotCheckLog);
+            Map<String, String> mapByResult = getMapByResult(lotCheckLog,strings);
             // 修改客户状态为     未完善/未上传
             SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
             /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；  */
@@ -214,34 +215,54 @@ public class SmsLotCustomerController extends JeecgController<SmsLotCustomerData
     }
 
 
-    private Map<String,String>getMapByResult(SmcLotCheckLog smsCheckCustomerDataLog){
+    private Map<String,String>getMapByResult(SmcLotCheckLog smsCheckCustomerDataLog,List<StepsNowVo>string){
         HashMap <String,String> map =new HashMap<>();
-        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTestCardResult() ) && !smsCheckCustomerDataLog.getTestCardResult().equals("1")){
-            map.put("getTestCardResult","未通过");
-        }
-        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getContractResult() ) && !smsCheckCustomerDataLog.getContractResult().equals("1")){
-            map.put("getContractResult","未通过");
-        }
-        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getHandlingCardResult() ) && !smsCheckCustomerDataLog.getHandlingCardResult().equals("1")){
-            map.put("getHandlingCardResult","未通过");
-        }
-        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getHandlingContractResult() ) && !smsCheckCustomerDataLog.getHandlingContractResult().equals("1")){
-            map.put("getHandlingContractResult","未通过");
-        }
-        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCustomerCardScanningResult() ) && !smsCheckCustomerDataLog.getCustomerCardScanningResult().equals("1")){
-            map.put("getCustomerCardScanningResult","未通过");
-        }
-        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getRiskTableResult() ) && !smsCheckCustomerDataLog.getRiskTableResult().equals("1")){
-            map.put("getRiskTableResult","未通过");
-        }
-        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getPriceTableResult() ) && !smsCheckCustomerDataLog.getPriceTableResult().equals("1")){
-            map.put("getPriceTableResult","未通过");
+        for (StepsNowVo stepsNowVo : string) {
+            if (stepsNowVo.getId().equals("testCard")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTestCardResult() ) && !smsCheckCustomerDataLog.getTestCardResult().equals("1")){
+                    map.put("getTestCardResult","未通过");
+                }
+            }
+            if (stepsNowVo.getId().equals("contract")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getContractResult() ) && !smsCheckCustomerDataLog.getContractResult().equals("1")){
+                    map.put("getContractResult","未通过");
+                }
+            }
+            if (stepsNowVo.getId().equals("handlingCard")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getHandlingCardResult() ) && !smsCheckCustomerDataLog.getHandlingCardResult().equals("1")){
+                    map.put("getHandlingCardResult","未通过");
+                }
+            }
+            if (stepsNowVo.getId().equals("handlingContract")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getHandlingContractResult() ) && !smsCheckCustomerDataLog.getHandlingContractResult().equals("1")){
+                    map.put("getHandlingContractResult","未通过");
+                }
+            }
+            if (stepsNowVo.getId().equals("customerCardScanning")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCustomerCardScanningResult() ) && !smsCheckCustomerDataLog.getCustomerCardScanningResult().equals("1")){
+                    map.put("getCustomerCardScanningResult","未通过");
+                }
+            }
+            if (stepsNowVo.getId().equals("riskTable")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getRiskTableResult() ) && !smsCheckCustomerDataLog.getRiskTableResult().equals("1")){
+                    map.put("getRiskTableResult","未通过");
+                }
+            }
+            if (stepsNowVo.getId().equals("priceTable")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getPriceTableResult() ) && !smsCheckCustomerDataLog.getPriceTableResult().equals("1")){
+                    map.put("getPriceTableResult","未通过");
+                }
+            }
+            if (stepsNowVo.getId().equals("commitment")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCommitmentResult() ) && !smsCheckCustomerDataLog.getCommitmentResult().equals("1")){
+                    map.put("getCommitmentResult","未通过");
+                }
+            }
         }
-        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCommitmentResult() ) && !smsCheckCustomerDataLog.getCommitmentResult().equals("1")){
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getInfoResult() ) && !smsCheckCustomerDataLog.getInfoResult().equals("1")){
             map.put("getCommitmentResult","未通过");
         }
 
-
         return map;
     }
 

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

@@ -294,6 +294,15 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
         if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getTrunkContractResult() ) && !smsCheckCustomerDataLog.getTrunkContractResult().equals("1")){
             map.put("getTrunkContractResult","未通过");
         }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getAccessPhoneResult() ) && !smsCheckCustomerDataLog.getAccessPhoneResult().equals("1")){
+            map.put("getRiskTableResult","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getAccessPhotoResult() ) && !smsCheckCustomerDataLog.getAccessPhotoResult().equals("1")){
+            map.put("getTrunkTableResult","未通过");
+        }
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getAccessTableResult() ) && !smsCheckCustomerDataLog.getAccessTableResult().equals("1")){
+            map.put("getTrunkContractResult","未通过");
+        }
 
         return map;
     }

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

@@ -27,10 +27,7 @@ public class SmcLotCheckLog {
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
-    /**卡类型 0测试卡；1正式卡*/
-    private Integer blockType;
-    /**是否突破价格管控*/
-    private Integer control;
+
     /**任务ID*/
     private String taskId;
     /**客户信息ID*/
@@ -98,6 +95,8 @@ public class SmcLotCheckLog {
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 
+    private String infoResult;
+    private String infoResultRemark;
     private String testCardResult;
     private String testCardResultRemark;
     private String contractResult;

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

@@ -21,6 +21,7 @@ public class SmsLotCheckCustomerDataAndLog {
     private String dataId;
     private String logId;
 
+    private String stepsNow;
 
     /**卡类型 0测试卡；1正式卡*/
     private String blockType;
@@ -173,7 +174,8 @@ public class SmsLotCheckCustomerDataAndLog {
     private Integer commitmentState;
     /**承诺函、其它材料 稽核备注*/
     private String commitmentNote;
-
+    private String infoResult;
+    private String infoResultRemark;
     private String testCardResult;
     private String testCardResultRemark;
     private String contractResult;

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

@@ -14,10 +14,10 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 @Data
-@TableName("sms_log_customer_data_log_bill")
+@TableName("sms_lot_customer_data_log_bill")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="sms_log_customer_data_log_bill", description="客户资料稽核稽核结果bill")
+@ApiModel(value="sms_lot_customer_data_log_bill", description="客户资料稽核稽核结果bill")
 public class SmsLotCheckCustomerDataLogBill {
     /** 主键 */
     @TableId(type = IdType.ASSIGN_ID)

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

@@ -76,7 +76,7 @@ public class SmsLotCustomerData implements Serializable {
     /** 更新日期 */
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新日期")
+    //@ApiModelProperty(value = "更新日期")
     private Date updateTime;
     /** 所属部门 */
     @ApiModelProperty(value = "所属部门")
@@ -112,35 +112,35 @@ public class SmsLotCustomerData implements Serializable {
     @Excel(name = "员工编号", width = 15)
     @ApiModelProperty(value = "员工编号")
     private String staffNo;
-    @ApiModelProperty(value = "测试卡申请单资料上传")
+    @ApiModelProperty(value = "测试卡申请单上传资料")
     private String testCard;
     @ApiModelProperty(value = "测试卡申请单资料上传备注")
     private String testCardRemark;
-    @ApiModelProperty(value = "合同资料上传")
+    @ApiModelProperty(value = "合同上传资料")
     private String contract;
     @ApiModelProperty(value = "合同资料上传备注")
     private String contractRemark;
     @ApiModelProperty(value = "责任人和经办人授权书上传资料")
     private String handlingContract;
-    @ApiModelProperty(value = "责任人和经办人授权书上传资料备注")
+    @ApiModelProperty(value = "责任人和经办人授权书资料上传备注")
     private String handlingContractRemark;
     @ApiModelProperty(value = "责任人和经办人身份证上传资料")
     private String handlingCard;
-    @ApiModelProperty(value = "责任人和经办人身份证上传资料备注")
+    @ApiModelProperty(value = "责任人和经办人身份证资料上传备注")
     private String handlingCardRemark;
-    @ApiModelProperty(value = "客户证件扫描资料上传")
+    @ApiModelProperty(value = "客户证件扫描上传资料")
     private String customerCardScanning;
     @ApiModelProperty(value = "客户证件扫描资料上传备注")
     private String customerCardScanningRemark;
-    @ApiModelProperty(value = "风险评估表资料上传")
+    @ApiModelProperty(value = "风险评估表上传资料")
     private String riskTable;
     @ApiModelProperty(value = "风险评估表资料上传备注")
     private String riskTableRemark;
-    @ApiModelProperty(value = "省/集团价格审批表资料上传")
+    @ApiModelProperty(value = "省/集团价格审批表上传资料")
     private String priceTable;
     @ApiModelProperty(value = "省/集团价格审批表资料上传备注")
     private String priceTableRemark;
-    @ApiModelProperty(value = "其他材料资料上传")
+    @ApiModelProperty(value = "其他材料上传资料")
     private String commitment;
     @ApiModelProperty(value = "其他材料资料上传备注")
     private String commitmentRemark;

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

@@ -0,0 +1,9 @@
+package org.jeecg.modules.smscheck.entity;
+
+import lombok.Data;
+
+@Data
+public class StepsNowVo {
+    private String id;
+    private String title;
+}