From 32856e223ad661c4f16612d6aa3b139d34164f27 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Tue, 19 Sep 2023 10:13:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=84=E5=BA=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 13 +++++ .../constant/CaseApplicationConstants.java | 48 ++++++++++--------- .../domain/CaseApplication.java | 11 +++++ .../service/ICaseApplicationService.java | 2 + .../impl/CaseApplicationServiceImpl.java | 27 +++++++++++ .../wisdomarbitrate/CaseApplicationMapper.xml | 1 + 6 files changed, 80 insertions(+), 22 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index 4c0ef36..6b0c2eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -139,6 +139,19 @@ public class CaseApplicationController extends BaseController { return toAjax(caseApplicationService.pendTral(caseApplication)); } + /** + * 组庭审核 + */ + @PreAuthorize("@ss.hasPermi('caseApplication:pendTralCheck')") + @Log(title = "组庭", businessType = BusinessType.UPDATE) + @PostMapping("/pendTralCheck") + public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) + { + return toAjax(caseApplicationService.pendTralCheck(caseApplication)); + } + + + /** * 是否指派仲裁员 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java index 23f4e7c..1362386 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java @@ -6,34 +6,38 @@ package com.ruoyi.common.constant; public class CaseApplicationConstants { /** 立案申请 */ public static final int CASE_APPLICATION = 0; + /** 待立案审查 */ + public static final int CASE_CHECK = 1; /** 待缴费 */ - public static final int PENDING_PAYMENT = 1; + public static final int PENDING_PAYMENT = 2; /** 待缴费确认 */ - public static final int PENDING_PAYMENT_CONFIRM = 2; - /** 待确认是否应诉 */ - public static final int CONFIRMDED_RESPOND = 3; - /** 待确认证据 */ - public static final int CONFIRMDED_EVIDENCE = 4; - /** 待确定是否指派仲裁员 */ - public static final int PENDING_APPOINT_ARBOTRATAR = 5; + public static final int PENDING_PAYMENT_CONFIRM = 3; + /** 待案件质证 */ + public static final int CASE_CROSSEXAMI = 4; + /** 待组庭 */ - public static final int PENDING_TRIAL = 6; - /** 待组庭确定 */ - public static final int CONFIRMDED_PENDING_TRIAL = 7; + public static final int PENDING_TRIAL = 26; /** 待组庭审核 */ - public static final int CONFIRMDED_PENDING_TRIAL_SUBMMIT = 8; - /** 待选择仲裁方式 */ - public static final int SELECTED_ARBITRATION_METHOD = 9; - /** 待开庭 */ - public static final int PENDING_OPENCOURT = 10; + public static final int CONFIRMDED_PENDING_TRIAL_SUBMMIT = 5; + /** 待组庭确定 */ + public static final int CONFIRMDED_PENDING_TRIAL = 6; + + /** 待审核仲裁方式 */ + public static final int CHECK_ARBITRATION_METHOD = 7; + /** 待开庭审理 */ + public static final int PENDING_OPENCOURT_HEAR = 8; + /** 待书面审理 */ + public static final int PENDING_WRIITEN_HEAR = 9; /** 待生成仲裁文书 */ - public static final int GENERATED_ARBITRATION = 11; - /** 待确认仲裁文书 */ - public static final int CONFIRMED_ARBITRATION = 12; + public static final int GENERATED_ARBITRATION = 10; + /**待核验仲裁文书*/ + public static final int VERPRIF_ARBITRATION = 11; + /**待审核仲裁文书*/ + public static final int CHECK_ARBITRATION = 12; + /**待仲裁文书签名*/ + public static final int SIGN_ARBITRATION = 13; /** 待仲裁文书用印 */ - public static final int ARBITRATED_SEAL = 13; - /** 待仲裁文书用印审核 */ - public static final int ARBITRATED_SEAL_REVIEW = 14; + public static final int ARBITRATED_SEAL = 14; /** 待仲裁文书送达 */ public static final int ARBITRATION_DELIVERY = 15; /** 待案件归档*/ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index 7fa1206..2375406 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -74,6 +74,17 @@ public class CaseApplication extends BaseEntity { /** 案件描述 */ private String caseDescribe; + /** 是否同意组庭 */ + private int isAgreePendTral; + + public int getIsAgreePendTral() { + return isAgreePendTral; + } + + public void setIsAgreePendTral(int isAgreePendTral) { + this.isAgreePendTral = isAgreePendTral; + } + public String getCaseName() { return caseName; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index 2ccdf87..b12c392 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java @@ -25,4 +25,6 @@ public interface ICaseApplicationService { int pendTral(CaseApplication caseApplication); int pendingAppointArbotrar(CaseApplication caseApplication); + + int pendTralCheck(CaseApplication caseApplication); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index b37aefd..ce875ac 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -206,6 +206,31 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { return rows; } + @Override + @Transactional + public int pendTralCheck(CaseApplication caseApplication) { + int isAgreePendTral = caseApplication.getIsAgreePendTral(); + caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); + int rows = 0; + //同意组庭 + if(isAgreePendTral==1){ + rows = caseApplicationMapper.submitCaseApplication(caseApplication); + }else { + List arbitrators = caseApplication.getArbitrators(); + if(arbitrators!=null&&arbitrators.size()>0){ + List ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList()); + List arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList()); + String idstr = ids.stream().map(Object::toString).collect(Collectors.joining(",")); + String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(",")); + caseApplication.setArbitratorId(idstr); + caseApplication.setArbitratorName(arbitratorNamestr); + rows = caseApplicationMapper.submitCaseApplication(caseApplication); + } + } + + return rows; + } + @Override @Transactional public int pendingAppointArbotrar(CaseApplication caseApplication) { @@ -236,6 +261,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } + + private void assignmentCaseAffiliates(CaseApplication caseApplication, List caseAffiliatesnew) { CaseAffiliate caseAffiliate = new CaseAffiliate(); // BeanUtils.copyBeanProp(caseApplication,caseAffiliate); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index e215199..d528366 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -148,6 +148,7 @@ case_name = #{caseName}, case_describe = #{caseDescribe}, case_result = #{caseResult}, + is_agree_pend_tral = #{isAgreePendTral}, where id = #{id} -- 2.54.0 From cf251ebd287e710bf99c16d210b007d9636a435d Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Tue, 19 Sep 2023 11:07:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-druid.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 763fe7e..3c99069 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,8 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false + # url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false + url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root password: root123456 # 从库数据源 -- 2.54.0 From 69178273481ac505349b3215f8be963bcf9072cc Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Tue, 19 Sep 2023 11:24:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-druid.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 3c99069..763fe7e 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,8 +6,7 @@ spring: druid: # 主库数据源 master: - # url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false - url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false username: root password: root123456 # 从库数据源 -- 2.54.0