|
|
@@ -22,10 +22,7 @@ import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.modules.smscheck.configs.CheckStateCode;
|
|
|
import org.jeecg.modules.smscheck.configs.ObjectComparator;
|
|
|
import org.jeecg.modules.smscheck.entity.*;
|
|
|
-import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataLogService;
|
|
|
-import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataService;
|
|
|
-import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
|
|
|
-import org.jeecg.modules.smscheck.service.SmsCheckZGHistoryService;
|
|
|
+import org.jeecg.modules.smscheck.service.*;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -408,6 +405,10 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
|
|
|
LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
|
|
|
queryWrapperData.eq(SmsCheckCustomerData::getInfoId, infoId);
|
|
|
SmsCheckCustomerData smsCheckCustomerData = customerDataService.getOne(queryWrapperData);
|
|
|
+
|
|
|
+ //任务数据
|
|
|
+ SmsCheckCustomerInfo byId = infoService.getById(infoId);
|
|
|
+
|
|
|
//查询 稽核结果数据
|
|
|
LambdaQueryWrapper<SmsCheckCustomerDataLog> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(SmsCheckCustomerDataLog::getInfoId, infoId);
|
|
|
@@ -426,6 +427,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
|
|
|
stringObjectMap.remove("id");
|
|
|
map.putAll(stringObjectMap);
|
|
|
}
|
|
|
+ map.put("taskId",byId.getTaskId());
|
|
|
map.put("history",list);
|
|
|
if (smsCheckCustomerData == null) {
|
|
|
return Result.error("未找到对应数据");
|
sunyize