1.资料管理优化

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

@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author jeecg-boot
@@ -73,11 +74,11 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户资料-列表查询", notes = "客户资料-列表查询")
     @PostMapping(value = "/list")
     public Result<IPage<SmsCheckCustomerData>> queryList(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
-        if (StringUtils.isEmpty(smsCheckCustomerData.getUserNo())){
+        if (StringUtils.isEmpty(smsCheckCustomerData.getInfoId())){
             return Result.error("用户编码不能为空");
         }
         LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
-        queryWrapperData.eq(SmsCheckCustomerData::getUserNo,smsCheckCustomerData.getUserNo());
+        queryWrapperData.eq(SmsCheckCustomerData::getInfoId,smsCheckCustomerData.getInfoId());
         Page<SmsCheckCustomerData> page = new Page<>(1, 100);
         IPage<SmsCheckCustomerData> pageList = smsCheckCustomerDataService.page(page, queryWrapperData);
         return Result.OK(pageList);
@@ -114,18 +115,13 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
 
     @AutoLog(value = "客户资料-编辑")
     @ApiOperation(value = "客户资料-编辑", notes = "客户资料-编辑")
-    @RequestMapping(value = "/edit/user/no", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequestMapping(value = "/edit/info/id", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> editUserNo(@RequestBody SmsCheckCustomerData smsCheckCustomerData) {
-        if (StringUtils.isEmpty(smsCheckCustomerData.getUserNo())) {
-            return Result.error("用户编码不能为空");
+        if (StringUtils.isEmpty(smsCheckCustomerData.getInfoId())) {
+            return Result.error("客户编码不能为空");
         }
-        LambdaQueryWrapper<SmsCheckCustomerInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SmsCheckCustomerInfo::getUserNo,smsCheckCustomerData.getUserNo());
-        String id = smsCheckCustomerInfoService.getOne(queryWrapper).getId();
-        smsCheckCustomerData.setId(id);
-
         LambdaQueryWrapper<SmsCheckCustomerData> queryWrapperData = new LambdaQueryWrapper<>();
-        queryWrapperData.eq(SmsCheckCustomerData::getUserNo,smsCheckCustomerData.getUserNo());
+        queryWrapperData.eq(SmsCheckCustomerData::getInfoId,smsCheckCustomerData.getInfoId());
         List<SmsCheckCustomerData> list = smsCheckCustomerDataService.list(queryWrapperData);
         if (list.size() == 0){
             boolean save = smsCheckCustomerDataService.save(smsCheckCustomerData);
@@ -134,6 +130,7 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
             }
             return Result.OK("编辑成功!");
         }
+        smsCheckCustomerData =  smsCheckCustomerDataService.integration(smsCheckCustomerData,list.get(0));
         boolean edit = smsCheckCustomerDataService.updateById(smsCheckCustomerData);
         if (!edit) {
             return Result.error("编辑失败");

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

@@ -162,6 +162,18 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return Result.OK("编辑成功!");
     }
 
+    @AutoLog(value = "客户信息-提交稽核")
+    @ApiOperation(value = "客户信息-提交稽核", notes = "客户信息-提交稽核")
+    @RequestMapping(value = "/edit/check/state", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> editCheckState(@RequestBody SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        if (StringUtils.isEmpty(smsCheckCustomerInfo.getId())){
+            return Result.error("提交失败");
+        }
+        smsCheckCustomerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
+        smsCheckCustomerInfoService.updateById(smsCheckCustomerInfo);
+        return Result.OK("提交成功!");
+    }
+
 
     /**
      * 通过id删除

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

@@ -11,4 +11,6 @@ import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
  */
 public interface ISmsCheckCustomerDataService extends IService<SmsCheckCustomerData> {
 
+     SmsCheckCustomerData integration(SmsCheckCustomerData date1,SmsCheckCustomerData data2);
+
 }

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

@@ -15,4 +15,23 @@ import org.springframework.stereotype.Service;
 @Service
 public class SmsCheckCustomerDataServiceImpl extends ServiceImpl<SmsCheckCustomerDataMapper, SmsCheckCustomerData> implements ISmsCheckCustomerDataService {
 
+
+    @Override
+    public SmsCheckCustomerData integration(SmsCheckCustomerData date1, SmsCheckCustomerData data2) {
+        date1.setId(data2.getId());
+        if (date1.getBusinessContract()!=null && data2.getBusinessContract() != null){
+            date1.setBusinessContract(date1.getBusinessContract() + ","+data2.getBusinessContract());
+        }else {
+            date1.setBusinessContract(data2.getBusinessContract());
+        }
+
+        if (date1.getSmsNumberCertificate() != null && data2.getSmsNumberCertificate() != null){
+            date1.setSmsNumberCertificate(date1.getSmsNumberCertificate() + ","+ data2.getSmsNumberCertificate() );
+        }else {
+            date1.setSmsNumberCertificate(data2.getSmsNumberCertificate());
+        }
+
+
+        return date1;
+    }
 }