修复

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

@@ -790,7 +790,12 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         BeanUtils.copyProperties(warningCheckCustomerDataLog,smsWarningCheckCustomerDataLog);
         smsWarningCheckCustomerDataLog.setId(warningCheckCustomerDataLog.getLogId());
         boolean saveLog = warningCheckCustomerDataLogService.saveOrUpdate(smsWarningCheckCustomerDataLog);
-        if (saveLog){
+
+        SmsWarningCustomerData smsWarningCustomerData = new SmsWarningCustomerData();
+        BeanUtils.copyProperties(warningCheckCustomerDataLog,smsWarningCustomerData);
+        smsWarningCustomerData.setId(warningCheckCustomerDataLog.getDataId());
+        boolean b = warningCustomerDataService.saveOrUpdate(smsWarningCustomerData);
+        if (saveLog && b){
             Map<String, String> mapByResult = getMapWarningByResult(smsWarningCheckCustomerDataLog);
             /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过；  */
             SmsCheckCustomerInfoBecomeDue byId = dueService.getById(warningCheckCustomerDataLog.getDueId());
@@ -803,17 +808,43 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
                     queryWrapper.eq(SmsCheckCustomerData::getInfoId, byId.getInfoId());
                     SmsCheckCustomerData smsCheckCustomerData = customerDataService.getOne(queryWrapper);
 
-                    smsCheckCustomerData.setContractDateDate(warningCheckCustomerDataLog.getContractDateDate());
-                    smsCheckCustomerData.setContractDateDateIs(warningCheckCustomerDataLog.getContractDateDateIs());
 
-                    smsCheckCustomerData.setCodeNumberDateDate(warningCheckCustomerDataLog.getCodeNumberDateDate());
-                    smsCheckCustomerData.setCodeNumberDateDateIs(warningCheckCustomerDataLog.getCodeNumberDateDateIs());
+                    UpdateWrapper<SmsCheckCustomerData> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.in("id",  smsCheckCustomerData.getId());
+                    if (byId.getShortNowContractDateIs()!=0){
+                        smsCheckCustomerData.setContractDateDate(warningCheckCustomerDataLog.getContractDateDate());
+                        smsCheckCustomerData.setContractDateDateIs(warningCheckCustomerDataLog.getContractDateDateIs());
+                        updateWrapper.set("contract_date_date", warningCheckCustomerDataLog.getContractDateDate())
+                                .set("contract_date_date_is", warningCheckCustomerDataLog.getContractDateDateIs());
+                    }
+                    if (byId.getShortNowCodeNumberDateIs()!=0){
 
-                    smsCheckCustomerData.setFilingsDateDate(warningCheckCustomerDataLog.getFilingsDateDate());
-                    smsCheckCustomerData.setFilingsDateDateIs(warningCheckCustomerDataLog.getFilingsDateDateIs());
+                        smsCheckCustomerData.setCodeNumberDateDate(warningCheckCustomerDataLog.getCodeNumberDateDate());
+                        smsCheckCustomerData.setCodeNumberDateDateIs(warningCheckCustomerDataLog.getCodeNumberDateDateIs());
+                        updateWrapper
+                                .set("code_number_date_date", warningCheckCustomerDataLog.getCodeNumberDateDate())
+                                .set("code_number_date_date_is", warningCheckCustomerDataLog.getCodeNumberDateDateIs());
+                    }
 
-                    smsCheckCustomerData.setPermitDateDate(warningCheckCustomerDataLog.getPermitDateDate());
-                    smsCheckCustomerData.setPermitDateDateIs(warningCheckCustomerDataLog.getPermitDateDateIs());
+                    if (byId.getShortNowFilingsDataIs()!=0){
+                        smsCheckCustomerData.setFilingsDateDate(warningCheckCustomerDataLog.getFilingsDateDate());
+                        smsCheckCustomerData.setFilingsDateDateIs(warningCheckCustomerDataLog.getFilingsDateDateIs());
+                        updateWrapper
+                                .set("filings_date_date", warningCheckCustomerDataLog.getFilingsDateDate())
+                                .set("filings_date_date_is", warningCheckCustomerDataLog.getFilingsDateDateIs());
+
+                    }
+                   if (byId.getShortNowPermitDateIs()!=0){
+                       smsCheckCustomerData.setPermitDateDate(warningCheckCustomerDataLog.getPermitDateDate());
+                       smsCheckCustomerData.setPermitDateDateIs(warningCheckCustomerDataLog.getPermitDateDateIs());
+                       updateWrapper
+                               .set("permit_date_date", warningCheckCustomerDataLog.getPermitDateDate())
+                               .set("permit_date_date_is", warningCheckCustomerDataLog.getPermitDateDateIs());
+
+                   }
+                    updateWrapper
+                            .set("update_time",new Date());
+                    customerDataService.update(updateWrapper);
                 }else {
                     byId.setCheckState(CheckStateCode.CHECK_STSTE_4);
                 }