Merge remote-tracking branch 'origin/master'

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

@@ -88,17 +88,6 @@ public class SmsWarningCustomerController {
         if (!audit){
             return Result.error("稽核失败，请检查资料信息");
         }
-        LambdaQueryWrapper<SmsWarningCustomerData> dataLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        dataLambdaQueryWrapper.eq(SmsWarningCustomerData::getDueId,dueId);
-        SmsWarningCustomerData data = smsWarningCustomerDataService.getOne(dataLambdaQueryWrapper);
-        String lotContract = data.getLotContract();
-        if (StringUtils.isNotBlank(lotContract)){
-            LambdaQueryWrapper<SmsLotCustomerData> smsLotCustomerDataLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            smsLotCustomerDataLambdaQueryWrapper.eq(SmsLotCustomerData::getInfoId,infoId);
-            SmsLotCustomerData lotCustomerData = new SmsLotCustomerData();
-            lotCustomerData.setContract(lotCustomerData.getContract()+","+lotContract);
-            smsLotCustomerService.update(lotCustomerData,smsLotCustomerDataLambdaQueryWrapper);
-        }
 
         return Result.ok("稽核成功");
     }

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

@@ -176,6 +176,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         BeanUtil.copyProperties(specialExaminationVo, specialExamination);
         String infoId = specialExamination.getInfoId();
         SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
+        Integer checkState = customerInfo.getCheckState();
         if (null == customerInfo) {
             return Result.error("客户信息不存在");
         }
@@ -225,6 +226,9 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
                             " 工单创建人：" + customerInfo.getCreateBy() +
                             " 提交了复开号码为" + customerInfo.getSmsNumber() +
                             "的复开申请，请及时进行稽核。");
+        }
+        if (checkState == CheckStateCode.CHECK_STSTE_4){
+
         }
         return Result.OK("已成功提交申请");
     }
@@ -551,7 +555,6 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             SmcSpecialCheckLogHistory smcSpecialCheckLogHistory = new SmcSpecialCheckLogHistory();
             BeanUtil.copyProperties(smcSpecialCheckLog, smcSpecialCheckLogHistory);
             smcSpecialCheckLogHistory.setId(null);
-            smcSpecialCheckLogHistoryService.save(smcSpecialCheckLogHistory);
             if (lotList.size() == 0) {
                 smcSpecialCheckLogService.save(smcSpecialCheckLog);
             } else {
@@ -562,6 +565,10 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             SmcSpecialCheckLogStateVo smcSpecialCheckLogStateVo = new SmcSpecialCheckLogStateVo();
             BeanUtil.copyProperties(smcSpecialCheckLog, smcSpecialCheckLogStateVo);
             Boolean stateBoolean = smcSpecialCheckLogService.reflectCheck(smcSpecialCheckLogStateVo);
+            // 稽核不通过进行插入
+            if (!stateBoolean){
+                smcSpecialCheckLogHistoryService.save(smcSpecialCheckLogHistory);
+            }
             int lotStatus = stateBoolean ? 5 : 4;
             //修改客户信息稽核结果
             info.setCheckState(lotStatus);

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckCustomerInfoMapper.java

@@ -848,7 +848,7 @@ public interface SmsCheckCustomerInfoMapper extends BaseMapper<SmsCheckCustomerI
         }
         public String selectCompanyList(SmsCheckCustomerInfo smsCheckCustomerInfo) {
             StringBuilder sql = new StringBuilder();
-            sql.append("SELECT any_value(id) id, customer_no customer_no,any_value(customer_name) as customerName,any_value(sms_number) sms_number,any_value(network_access_time) network_access_time  " +
+            sql.append("SELECT any_value(id) id, customer_no customer_no,any_value(customer_name) as customer_name  ,any_value(sms_number) sms_number,any_value(network_access_time) network_access_time  " +
                     "FROM `sms_check_customer_info` " +
                     "WHERE customer_no is not NULL and del_flag = 0 and type in (1,2,4)");
             String customerNo = smsCheckCustomerInfo.getCustomerNo();

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

@@ -36,32 +36,56 @@ public class SmsWarningCheckCustomerDataLogServiceImpl extends ServiceImpl<SmsWa
     private SmsCheckCustomerInfoBecomeDueService dueService;
     @Autowired
     private ISmsCheckCustomerDataService customerDataService;
+    @Autowired
+    SmsLotCustomerService smsLotCustomerService;
+    @Autowired
+    SmsWarningCustomerDataService smsWarningCustomerDataService;
     @Override
     public boolean lotAudit(SmsWarningCheckCustomerDataLog smsWarningCheckCustomerDataLog) throws IllegalAccessException {
         // 获取稽核预警客户信息
         SmsCheckCustomerInfoBecomeDue dueData = smsCheckCustomerInfoBecomeDueService.getById(smsWarningCheckCustomerDataLog.getDueId());
         Integer checkState = dueData.getCheckState();
-        if (checkState != CheckStateCode.CHECK_STSTE_2){
+        if (checkState != CheckStateCode.CHECK_STSTE_2) {
             return false;
         }
 
         SmsWarningCheckCustomerDataLogVo smsWarningCheckCustomerDataLogVo = new SmsWarningCheckCustomerDataLogVo();
-        BeanCopyUtil.copyProperties(smsWarningCheckCustomerDataLog,smsWarningCheckCustomerDataLogVo);
+        BeanCopyUtil.copyProperties(smsWarningCheckCustomerDataLog, smsWarningCheckCustomerDataLogVo);
         // 稽核预警判断
         Boolean stateBoolean = reflectCheck(smsWarningCheckCustomerDataLogVo);
         int lotStatus = stateBoolean ? 5 : 4;
         dueData.setCheckState(lotStatus);
 
         LambdaQueryWrapper<SmsWarningCheckCustomerDataLog> smsWarningCheckCustomerDataLogLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        smsWarningCheckCustomerDataLogLambdaQueryWrapper.eq(SmsWarningCheckCustomerDataLog::getDueId,smsWarningCheckCustomerDataLog.getDueId());
+        smsWarningCheckCustomerDataLogLambdaQueryWrapper.eq(SmsWarningCheckCustomerDataLog::getDueId, smsWarningCheckCustomerDataLog.getDueId());
         SmsWarningCheckCustomerDataLog logData = getOne(smsWarningCheckCustomerDataLogLambdaQueryWrapper);
-        if (logData !=null){
+        if (logData != null) {
             smsWarningCheckCustomerDataLog.setId(logData.getId());
             updateById(smsWarningCheckCustomerDataLog);
-        }else {
+        } else {
             save(smsWarningCheckCustomerDataLog);
         }
-        return smsCheckCustomerInfoBecomeDueService.updateById(dueData);
+        // 修改预警稽核
+        boolean updateById = smsCheckCustomerInfoBecomeDueService.updateById(dueData);
+        if (updateById) {
+            LambdaQueryWrapper<SmsWarningCustomerData> dataLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            dataLambdaQueryWrapper.eq(SmsWarningCustomerData::getDueId, smsWarningCheckCustomerDataLog.getDueId());
+            SmsWarningCustomerData data = smsWarningCustomerDataService.getOne(dataLambdaQueryWrapper);
+            // 最新合同到期时间
+            String lotContract = data.getLotContract();
+            String lotContractDateIs = data.getLotContractDateIs();
+
+            LambdaQueryWrapper<SmsLotCustomerData> smsLotCustomerDataLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            smsLotCustomerDataLambdaQueryWrapper.eq(SmsLotCustomerData::getInfoId, smsWarningCheckCustomerDataLog.getInfoId());
+            SmsLotCustomerData lotCustomerData = new SmsLotCustomerData();
+            lotCustomerData.setContract(lotCustomerData.getContract() + "," + lotContract);
+            lotCustomerData.setContractDateIs(lotContractDateIs);
+            lotCustomerData.setContractDate(data.getContractDate());
+
+            smsLotCustomerService.update(lotCustomerData, smsLotCustomerDataLambdaQueryWrapper);
+
+        }
+        return updateById;
     }
 
     @Override