diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/dept/DeptIdentifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/dept/DeptIdentifyController.java index 4c6e05a..4c5faf8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/dept/DeptIdentifyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/dept/DeptIdentifyController.java @@ -201,25 +201,7 @@ public class DeptIdentifyController extends BaseController { return deptIdentifyService.saveFatchRules(templateManage); } - /** - * 查询column和注释 - * @return - */ - @PostMapping("/selectColumnandComment") - public AjaxResult selectColumnandComment(){ - List fatchRuleList = deptIdentifyService.selectColumnandComment(); - return AjaxResult.success(fatchRuleList); - } - /** - * 查询column - * @return - */ - @PostMapping("/selectColumnbycomment") - public AjaxResult selectColumnbycomment(@RequestBody FatchRule fatchRule){ - FatchRule fatchRulesel = deptIdentifyService.selectColumnbycomment(fatchRule); - return AjaxResult.success(fatchRulesel); - } /** * 根据模板id查询模板字段列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java index d72d7c7..4f27471 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java @@ -51,6 +51,9 @@ public class MsCaseApplicationController extends BaseController { @PostMapping("/insert") public AjaxResult insert(@RequestBody MsCaseApplicationVO caseApplication ) { + if(caseApplication.getAffiliate()==null||caseApplication.getAffiliate().getOrganizeFlag()==null){ + error("参数校验失败"); + } return success(caseApplicationService.insert(caseApplication)); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliate.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliate.java index 0086685..12097e7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliate.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliate.java @@ -20,24 +20,30 @@ public class MsCaseAffiliate { @Id @Column(name = "case_appli_id") private Long caseAppliId; + /** + * 是否机构申请,0-自然人,1-申请机构,默认0 + */ + @Column(name = "organize_flag") + private Integer organizeFlag; + /** - * 申请机构 + * 申请人id */ - @Column(name = "application_organ_id") - private String applicationOrganId; + @Column(name = "application_id") + private String applicationId; /** - * 申请机构名称 + * 申请人名称 */ - @Column(name = "application_organ_name") - private String applicationOrganName; + @Column(name = "application_name") + private String applicationName; /** - * 统一社会信用代码 + * 代码(统一社会信用代码或者身份证号) */ - @Column(name = "credit_code") - private String creditCode; + @Column(name = "code") + private String code; /** * 法定代表人 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplication.java index b3e2f05..0074ffb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplication.java @@ -51,7 +51,7 @@ public class MsCaseApplication { private BigDecimal caseSubjectAmount; /** - * 调解方式,1-开庭调解,2-书面调解 + * 调解方式,1-线上调解,2-线下调解 */ @Column(name = "mediation_method") private String mediationMethod; @@ -92,23 +92,12 @@ public class MsCaseApplication { @Column(name = "mediator_name") private String mediatorName; - /** - * 是否同意组庭,0否,1是 - */ - @Column(name = "is_agree_pend_tral") - private Integer isAgreePendTral; - /** * 支付方式(0线上支付,1线下支付) */ @Column(name = "pay_type") private String payType; - /** - * 是否仲裁反请求,1是,0否 - */ - @Column(name = "adjudica_counter") - private Integer adjudicaCounter; /** * 被申请人是否缺席,1是,0否 @@ -192,17 +181,6 @@ public class MsCaseApplication { */ private String facts; - /** - * 申请人请求仲裁庭裁决 - */ - @Column(name = "request_rule") - private String requestRule; - - /** - * 案件描述 - */ - @Column(name = "case_describe") - private String caseDescribe; /** * 调解书URL @@ -210,11 +188,7 @@ public class MsCaseApplication { @Column(name = "mediation_url") private String mediationUrl; - /** - * 仲裁反请求原因 - */ - @Column(name = "adjudica_counter_reason") - private String adjudicaCounterReason; + /** * 调解内容 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java index 3e408ec..59f81bc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java @@ -35,7 +35,7 @@ public interface MsCaseApplicationMapper extends Mapper { * @return */ @Select("