Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
+
+import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
+import com.ruoyi.wisdomarbitrate.service.IdentityAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +36,8 @@ public class SysLoginController
 
     @Autowired
     private SysPermissionService permissionService;
+    @Autowired
+    private IdentityAuthenticationService identityAuthenticationService;
 
     /**
      * 登录方法
@@ -48,6 +53,13 @@ public class SysLoginController
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
+
+//        IdentityAuthentication identityAuthentication = new IdentityAuthentication();
+//        identityAuthentication.setUserName(loginBody.getUsername());
+//        IdentityAuthentication identityAuthenticationselect = identityAuthenticationService.selectIdentityAuthentication(identityAuthentication);
+//        ajax.put("certificationStatusName", identityAuthenticationselect.getCertificationStatusName());
+//        ajax.put("certificationStatus", identityAuthenticationselect.getCertificationStatus());
+
         return ajax;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

@@ -72,10 +72,10 @@ public class CaseApplicationController  extends BaseController {
     }
 
     /**
-     * 提交立案数据
+     * 提交立案申请
      */
     @PreAuthorize("@ss.hasPermi('caseApplication:submit')")
-    @Log(title = "提交立案数据", businessType = BusinessType.UPDATE)
+    @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
     @PostMapping("/submitCaseApplication")
     public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
     {
@@ -194,6 +194,18 @@ public class CaseApplicationController  extends BaseController {
         return toAjax(caseApplicationService.pendingAppointArbotrar(caseApplication));
     }
 
+    /**
+     * 提交立案审查
+     */
+    @PreAuthorize("@ss.hasPermi('caseApplication:submitCaseApplicationCheck')")
+    @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
+    @PostMapping("/submitCaseApplicationCheck")
+    public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication)
+    {
+
+        return toAjax(caseApplicationService.submitCaseApplicationCheck(caseApplication));
+    }
+
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java

@@ -18,15 +18,7 @@ public class IdentityAuthenticationController   extends BaseController {
     @Autowired
     private IdentityAuthenticationService identityAuthenticationService;
 
-    /**
-     * 查询身份证信息
-     */
-    @PostMapping("/selectIdentityInformation")
-    public AjaxResult selectIdentityInformation()
-    {
-        IdentityAuthentication identityAuthentication = identityAuthenticationService.selectIdentityInformation();
-        return success(identityAuthentication);
-    }
+