|
@@ -1,6 +1,9 @@
|
|
|
package org.jeecg.modules.smscheck.controller;
|
|
package org.jeecg.modules.smscheck.controller;
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
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.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -25,6 +28,7 @@ import org.jeecg.modules.smscheck.entity.*;
|
|
|
import org.jeecg.modules.smscheck.service.*;
|
|
import org.jeecg.modules.smscheck.service.*;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
+import org.springframework.cglib.beans.BeanMap;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
@@ -97,13 +101,14 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
|
|
|
/**
|
|
/**
|
|
|
* 添加
|
|
* 添加
|
|
|
*
|
|
*
|
|
|
- * @param smsCheckCustomerData 对象
|
|
|
|
|
|
|
+ * @param jsonObject 对象
|
|
|
* @return 结果
|
|
* @return 结果
|
|
|
*/
|
|
*/
|
|
|
@AutoLog(value = "客户资料-添加")
|
|
@AutoLog(value = "客户资料-添加")
|
|
|
@ApiOperation(value = "客户资料-添加", notes = "客户资料-添加")
|
|
@ApiOperation(value = "客户资料-添加", notes = "客户资料-添加")
|
|
|
@PostMapping(value = "/add")
|
|
@PostMapping(value = "/add")
|
|
|
- public Result<String> add(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
|
|
|
|
|
|
|
+ public Result<String> add(@RequestBody JSONObject jsonObject) {
|
|
|
|
|
+ SmsCheckCustomerData smsCheckCustomerData = JSON.parseObject(jsonObject.toJSONString(), SmsCheckCustomerData.class);
|
|
|
boolean save = customerDataService.saveOrUpdate(smsCheckCustomerData);
|
|
boolean save = customerDataService.saveOrUpdate(smsCheckCustomerData);
|
|
|
if (save){
|
|
if (save){
|
|
|
// 修改客户状态为 未完善/未上传
|
|
// 修改客户状态为 未完善/未上传
|
|
@@ -122,13 +127,16 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
|
|
|
/**
|
|
/**
|
|
|
* 稽核
|
|
* 稽核
|
|
|
*
|
|
*
|
|
|
- * @param smsCheckCustomerDataAndLog 对象
|
|
|
|
|
|
|
+ * @param jsonObject 对象
|
|
|
* @return 结果
|
|
* @return 结果
|
|
|
*/
|
|
*/
|
|
|
@AutoLog(value = "客户资料Log-添加")
|
|
@AutoLog(value = "客户资料Log-添加")
|
|
|
@ApiOperation(value = "客户资料Log-添加", notes = "客户资料Log-添加")
|
|
@ApiOperation(value = "客户资料Log-添加", notes = "客户资料Log-添加")
|
|
|
@PostMapping(value = "/addLog")
|
|
@PostMapping(value = "/addLog")
|
|
|
- public Result<String> addLog(@RequestBody SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog) throws IllegalAccessException {
|
|
|
|
|
|
|
+ public Result<String> addLog(@RequestBody JSONObject jsonObject) throws IllegalAccessException {
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog = JSON.parseObject(jsonObject.toJSONString(), SmsCheckCustomerDataAndLog.class);
|
|
|
|
|
|
|
|
SmsCheckCustomerDataLog smsCheckCustomerDataLog = new SmsCheckCustomerDataLog();
|
|
SmsCheckCustomerDataLog smsCheckCustomerDataLog = new SmsCheckCustomerDataLog();
|
|
|
BeanUtils.copyProperties(smsCheckCustomerDataAndLog,smsCheckCustomerDataLog);
|
|
BeanUtils.copyProperties(smsCheckCustomerDataAndLog,smsCheckCustomerDataLog);
|
|
@@ -270,7 +278,8 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
|
|
|
@AutoLog(value = "客户资料-添加-暂存")
|
|
@AutoLog(value = "客户资料-添加-暂存")
|
|
|
@ApiOperation(value = "客户资料-添加-暂存", notes = "客户资料-添加")
|
|
@ApiOperation(value = "客户资料-添加-暂存", notes = "客户资料-添加")
|
|
|
@PostMapping(value = "/addIsStaging")
|
|
@PostMapping(value = "/addIsStaging")
|
|
|
- public Result<String> addIsStaging(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
|
|
|
|
|
|
|
+ public Result<String> addIsStaging(@RequestBody JSONObject jsonObject){
|
|
|
|
|
+ SmsCheckCustomerData smsCheckCustomerData = JSON.parseObject(jsonObject.toJSONString(), SmsCheckCustomerData.class);
|
|
|
boolean save = customerDataService.saveOrUpdate(smsCheckCustomerData);
|
|
boolean save = customerDataService.saveOrUpdate(smsCheckCustomerData);
|
|
|
if (save){
|
|
if (save){
|
|
|
// 修改客户状态为 未完善/未上传
|
|
// 修改客户状态为 未完善/未上传
|