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

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

Browse Source
This commit was merged in pull request #133.
This commit is contained in:
wangqiong123
2023-10-20 16:27:10 +08:00
committed by Gitea
parent 9e46b3068f 190273ba21
commit 65c641403c
13 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java
+4 -6
View File
@@ -80,16 +80,14 @@ public class AdjudicationController extends BaseController {
/**
* 归档(暂时只改案件状态)
* @param caseApplication
* @param ids
* @return
*/
@PostMapping("/caseFile")
// @PreAuthorize("@ss.hasPermi('awardManagement:list:file')")
public AjaxResult caseFile(@Validated @RequestBody BatchCaseApplication caseApplication){
if(CollectionUtil.isEmpty(caseApplication.getList())){
return error("参数校验失败");
}
return adjudicationService.caseFile(caseApplication);
public AjaxResult caseFile(@RequestParam(value = "ids",required = true) List<Long> ids){
return adjudicationService.caseFile(ids);
}
/**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java
+7 -13
View File
@@ -89,11 +89,11 @@ public class CaseApplicationController extends BaseController {
// @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')")
@Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
@PostMapping("/submitCaseApplication")
public AjaxResult submitCaseApplication(@Validated @RequestBody BatchCaseApplication caseApplication) {
if(CollectionUtil.isEmpty(caseApplication.getList())){
public AjaxResult submitCaseApplication(@RequestParam(value = "ids",required = true) List<Long> ids) {
if(CollectionUtil.isEmpty(ids)){
return error("参数校验失败");
}
return toAjax(caseApplicationService.submitCaseApplication(caseApplication));
return toAjax(caseApplicationService.submitCaseApplication(ids));
}
/**
@@ -102,12 +102,9 @@ public class CaseApplicationController extends BaseController {
// @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')")
@Log(title = "删除立案数据", businessType = BusinessType.DELETE)
@PostMapping("/removeCaseApplication")
public AjaxResult removeCaseApplication(@Validated @RequestBody BatchCaseApplication caseApplication) {
if(CollectionUtil.isEmpty(caseApplication.getList())){
return error("参数校验失败");
}
public AjaxResult removeCaseApplication(@RequestParam(value = "ids",required = true) List<Long> ids) {
return toAjax(caseApplicationService.deletecaseApplicationByIds(caseApplication));
return success(caseApplicationService.deletecaseApplicationByIds(ids));
}
/**
@@ -258,11 +255,8 @@ public class CaseApplicationController extends BaseController {
// @PreAuthorize("@ss.hasPermi('caseManagement:list:check')")
@Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
@PostMapping("/submitCaseApplicationCheck")
public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody BatchCaseApplication caseApplication) {
if(CollectionUtil.isEmpty(caseApplication.getList())){
return error("参数校验失败");
}
return toAjax(caseApplicationService.submitCaseApplicationCheck(caseApplication));
public AjaxResult submitCaseApplicationCheck(@RequestParam(value = "ids",required = true) List<Long> ids,@RequestParam(value = "agreeOrNotCheck",required = true) Integer agreeOrNotCheck) {
return toAjax(caseApplicationService.submitCaseApplicationCheck(ids,agreeOrNotCheck));
}
/**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java
+7 -7
View File
@@ -12,6 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/arbitrate")
public class CaseArbitrateController extends BaseController {
@@ -20,18 +22,16 @@ public class CaseArbitrateController extends BaseController {
/**
* 审核仲裁方式
* @param caseApplication
* @param ids
* @param opinion 1同意，0拒绝
* @return
*/
@PutMapping("/method")
// @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
public AjaxResult examineArbitrateMethod(@Validated @RequestBody BatchCaseApplication caseApplication
,Integer opinion){
if(CollectionUtil.isEmpty(caseApplication.getList())){
return error("参数校验失败");
}
return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
public AjaxResult examineArbitrateMethod(@RequestParam(value = "ids",required = true) List<Long> ids
,@RequestParam(value = "opinion",required = true) Integer opinion){
return caseArbitrateService.examineArbitrateMethod(ids,opinion);
}
/**
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAffiliateMapper.java
+1 -1
View File
@@ -14,7 +14,7 @@ public interface CaseAffiliateMapper {
void deletecaseAffiliate(CaseApplication caseApplication);
void batchDeletecaseAffiliate(BatchCaseApplication caseApplication);
void batchDeletecaseAffiliate(@Param("ids") List<Long> ids);
List<CaseAffiliate> selectCaseAffiliate(CaseAffiliate caseAffiliate);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java
+1 -1
View File
@@ -75,5 +75,5 @@ public interface CaseApplicationMapper {
* @param caseApplication
* @return
*/
int batchDeletecaseApplication(BatchCaseApplication caseApplication);
int batchDeletecaseApplication(@Param("ids") List<Long> ids);
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/IAdjudicationService.java
+1 -1
View File
@@ -16,7 +16,7 @@ public interface IAdjudicationService {
AjaxResult signature(CaseApplication caseApplication);
AjaxResult caseFile(BatchCaseApplication caseApplication);
AjaxResult caseFile( List<Long> ids);
AjaxResult service(Long id, String appEmail, String resEmail, String apptrackingNum, String restrackingNum);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java
+3 -3
View File
@@ -22,9 +22,9 @@ public interface ICaseApplicationService {
int editCaseApplication(CaseApplication caseApplication);
int submitCaseApplication(BatchCaseApplication caseApplication);
int submitCaseApplication( List<Long> ids);
int deletecaseApplicationByIds(BatchCaseApplication caseApplication);
int deletecaseApplicationByIds(List<Long> ids);
CaseApplication selectCaseApplication(CaseApplication caseApplication);
@@ -42,7 +42,7 @@ public interface ICaseApplicationService {
int checkArbitrateRecord(CaseApplication caseApplication);
int submitCaseApplicationCheck(BatchCaseApplication caseApplication);
int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck);
CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseArbitrateService.java
+3 -1
View File
@@ -5,10 +5,12 @@ import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord;
import com.ruoyi.wisdomarbitrate.domain.BatchCaseApplication;
import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
import java.util.List;
public interface ICaseArbitrateService {
AjaxResult writtenHear(ArbitrateRecord arbitrateRecord);
AjaxResult examineArbitrateMethod(BatchCaseApplication caseApplication, Integer opinion);
AjaxResult examineArbitrateMethod(List<Long> ids, Integer opinion);
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+4 -2
View File
@@ -438,9 +438,11 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
}
@Override
public AjaxResult caseFile(BatchCaseApplication batchCaseApplication) {
public AjaxResult caseFile( List<Long> ids) {
try {
for (CaseApplication caseApplication : batchCaseApplication.getList()) {
for (Long id :ids) {
CaseApplication caseApplication = new CaseApplication();
caseApplication.setId(id);
//更改案件状态(暂时)
caseApplication.setCaseStatus(CaseApplicationConstants.CASE_ARCHIVED);
caseApplicationMapper.submitCaseApplication(caseApplication);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+16 -10
View File
@@ -38,6 +38,8 @@ import com.ruoyi.wisdomarbitrate.utils.SignAward;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import java.io.File;
import java.io.IOException;
import java.math.BigDecimal;
@@ -786,9 +788,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Override
@Transactional
public int submitCaseApplication(BatchCaseApplication caseApplication) {
public int submitCaseApplication( List<Long> ids) {
int rows=0;
for (CaseApplication application : caseApplication.getList()) {
for (Long id : ids) {
CaseApplication application = new CaseApplication();
application.setId(id);
//提交立案申请
application.setCaseStatus(CaseApplicationConstants.CASE_CHECK);
rows += caseApplicationMapper.submitCaseApplication(application);
@@ -800,10 +804,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Override
@Transactional
public int deletecaseApplicationByIds(BatchCaseApplication caseApplication) {
public int deletecaseApplicationByIds(List<Long> ids ) {
caseAffiliateMapper.batchDeletecaseAffiliate(caseApplication);
return caseApplicationMapper.batchDeletecaseApplication(caseApplication);
caseAffiliateMapper.batchDeletecaseAffiliate(ids);
return caseApplicationMapper.batchDeletecaseApplication(ids);
}
@Override
@@ -1414,15 +1418,17 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Override
@Transactional
public int submitCaseApplicationCheck(BatchCaseApplication batchCaseApplication) {
public int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck) {
//提交立案审查
int rows = 0;
for (CaseApplication caseApplication : batchCaseApplication.getList()) {
Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
if(agreeOrNotCheck.intValue()==1){//同意审核
for (Long id : ids) {
CaseApplication caseApplication = new CaseApplication();
caseApplication.setId(id);
caseApplication.setAgreeOrNotCheck(agreeOrNotCheck);
if(agreeOrNotCheck ==1){//同意审核
caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT);
rows+= caseApplicationMapper.submitCaseApplication(caseApplication);
}else if(agreeOrNotCheck.intValue()==2){//拒绝审核
}else if(agreeOrNotCheck ==2){//拒绝审核
caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
rows+= caseApplicationMapper.submitCaseApplication(caseApplication);
}
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
+4 -3
View File
@@ -36,10 +36,11 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
@Override
@Transactional
public AjaxResult examineArbitrateMethod(BatchCaseApplication batchCaseApplication, Integer opinion) {
for (CaseApplication caseApplication : batchCaseApplication.getList()) {
public AjaxResult examineArbitrateMethod(List<Long> ids, Integer opinion) {
for (Long id : ids) {
CaseApplication caseApplication = new CaseApplication();
caseApplication.setId(id);
//查询案件详细信息
CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
if (caseApplication1 == null) {
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml
+2 -2
View File
@@ -109,8 +109,8 @@
<delete id="batchDeletecaseAffiliate">
delete from case_affiliate where case_appli_id in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item.id}
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+2 -2
View File
@@ -454,8 +454,8 @@
<delete id="batchDeletecaseApplication">
delete from case_application
where id in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item.id}
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</delete>