SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'qtz' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #11.
This commit is contained in:
qtz
2023-09-19 11:27:04 +08:00
committed by Gitea
parent 08b6413634 6917827348
commit c74f16a418
6 changed files with 80 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java
+13
View File
@@ -137,6 +137,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));
}
/**
* 是否指派仲裁员
*/
ruoyi-common/src/main/java/com/ruoyi/common/constant/CaseApplicationConstants.java
+26 -22
View File
@@ -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;
/** 待案件归档*/
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+11
View File
@@ -73,6 +73,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;
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java
+2
View File
@@ -25,4 +25,6 @@ public interface ICaseApplicationService {
int pendTral(CaseApplication caseApplication);
int pendingAppointArbotrar(CaseApplication caseApplication);
int pendTralCheck(CaseApplication caseApplication);
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+27
View File
@@ -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<Arbitrator> arbitrators = caseApplication.getArbitrators();
if(arbitrators!=null&&arbitrators.size()>0){
List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
List<String> 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<CaseAffiliate> caseAffiliatesnew) {
CaseAffiliate caseAffiliate = new CaseAffiliate();
// BeanUtils.copyBeanProp(caseApplication,caseAffiliate);
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+1
View File
@@ -149,6 +149,7 @@
<if test="caseName != null and caseName != ''">case_name = #{caseName},</if>
<if test="caseDescribe != null and caseDescribe != ''">case_describe = #{caseDescribe},</if>
<if test="caseResult != null and caseResult != ''">case_result = #{caseResult},</if>
<if test="isAgreePendTral != null">is_agree_pend_tral = #{isAgreePendTral},</if>
</set>
where id = #{id}
</update>