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

案件bug修复

Browse Source
This commit is contained in:
18792927508
2023-12-21 09:16:26 +08:00
parent c7970e884f
commit 1da61f526d
6 changed files with 369 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java
+4 -5
View File
@@ -222,14 +222,13 @@ public class DeptIdentifyController extends BaseController {
/** /**
* 根据模板id查询模板字段列表 * 根据模板id查询模板字段列表
* @param templateManage * @param id
* @return * @return
*/ */
@GetMapping("/getTemplateInfoById") @GetMapping("/getTemplateInfoById")
public AjaxResult getTemplateInfoById(@RequestBody TemplateManage templateManage){ public AjaxResult getTemplateInfoById(@RequestParam("id") Long id){
if(templateManage.getId()==null){ TemplateManage templateManage = new TemplateManage();
return error("参数校验错误"); templateManage.setId(id);
}
List<FatchRule> fatchRuleList = deptIdentifyService.getTemplateInfoById(templateManage); List<FatchRule> fatchRuleList = deptIdentifyService.getTemplateInfoById(templateManage);
return AjaxResult.success(fatchRuleList); return AjaxResult.success(fatchRuleList);
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+3 -1
View File
@@ -1093,7 +1093,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
if(CollectionUtil.isNotEmpty(caseApplication.getColumnValues())) { if(CollectionUtil.isNotEmpty(caseApplication.getColumnValues())) {
// 修改自定义字段 // 修改自定义字段
for (ColumnValue columnValue : caseApplication.getColumnValues()) { for (ColumnValue columnValue : caseApplication.getColumnValues()) {
columnValueMapper.updateColumnValue(columnValue); if(StrUtil.isNotEmpty(columnValue.getValue())) {
columnValueMapper.updateColumnValue(columnValue);
}
} }
} }
// 修改记录表状态为同意提交修改的内容 // 修改记录表状态为同意提交修改的内容
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java
+104 -46
View File
@@ -32,6 +32,7 @@ import com.ruoyi.wisdomarbitrate.utils.UnZipFileUtils;
import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocument;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.*; import java.io.*;
@@ -93,7 +94,7 @@ public class CaseZipImportImpl {
private Integer maxCaseNum; private Integer maxCaseNum;
private Integer maxBatchNumber; private Integer maxBatchNumber;
@Transactional
public AjaxResult zipImport(MultipartFile file, Long templateId) { public AjaxResult zipImport(MultipartFile file, Long templateId) {
UUID uuid = UUID.randomUUID(); UUID uuid = UUID.randomUUID();
// todo // todo
@@ -166,22 +167,30 @@ public class CaseZipImportImpl {
throw new ServiceException("未找到文件夹"); throw new ServiceException("未找到文件夹");
} }
File[] files = directory.listFiles(); File[] files = directory.listFiles();
CaseZipImportTask caseZipImportTask = new CaseZipImportTask(this, templateId, fatchRuleList, fatchMap, fatchRuleMap, userMap, dictDataList, files , deptMap,SecurityUtils.getLoginUser()); CaseZipImportTask caseZipImportTask = null;
Future<List<CaseApplication>> future = ThreadPoolUtil.submit(caseZipImportTask); try {
caseZipImportTask = new CaseZipImportTask(this, templateId, fatchRuleList, fatchMap, fatchRuleMap, userMap, dictDataList, files , deptMap, SecurityUtils.getLoginUser());
} catch (Exception e) {
return error("导入失败");
}
Future<List<CaseApplication>> future = ThreadPoolUtil.submit(caseZipImportTask);
try { try {
if(future.get()!=null){ if(future.get()!=null){
return success("导入成功"); return success("导入成功");
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
return success("导入失败");
} catch (ExecutionException e) { } catch (ExecutionException e) {
e.printStackTrace(); e.printStackTrace();
return success("导入失败");
} }
return error("无可导入的案件"); return error("导入失败");
} }
@Transactional
public CaseApplication buildCaseInfo(File file, Long templateId, List<FatchRule> fatchRuleList, Map<String, List<FatchRule>> fatchRuleMap, Map<String, String> fatchMap, Map<String, SysUser> userMap, List<SysDictData> dictDataList, Map<String, Long> deptMap,LoginUser loginUser) { public CaseApplication buildCaseInfo(File file, Long templateId, List<FatchRule> fatchRuleList, Map<String, List<FatchRule>> fatchRuleMap, Map<String, String> fatchMap, Map<String, SysUser> userMap, List<SysDictData> dictDataList, Map<String, Long> deptMap,LoginUser loginUser) {
// fileMap<caseId, List<File>> // fileMap<caseId, List<File>>
Map<String, String> fileMap = findFile(file, fatchRuleList); Map<String, String> fileMap = findFile(file, fatchRuleList);
@@ -288,57 +297,106 @@ public class CaseZipImportImpl {
caseApplication.setCaseAttachList(caseAttachs); caseApplication.setCaseAttachList(caseAttachs);
// 案件压缩包导入 // 案件压缩包导入
caseApplication.setImportFlag(2); caseApplication.setImportFlag(2);
caseApplicationMapper.insertCaseApplication(caseApplication); // 多线程执行
// List<MultipleThreadListParam> execList = new ArrayList<>();
// if (CollectionUtil.isNotEmpty(addUsers)) {
// Function<List<SysUser>, Integer> function = userMapper::batchSave;
// execList.add(new MultipleThreadListParam(function, addUsers));
// }
// if (CollectionUtil.isNotEmpty(userRoleList)) {
// Function<List<SysUserRole>, Integer> function = userRoleMapper::batchUserRole;
// execList.add(new MultipleThreadListParam(function, userRoleList));
//
// }
// if (CollectionUtil.isNotEmpty(sysDepts)) {
// Function<List<SysDept>, Integer> function = sysDeptMapper::batchSave;
// execList.add(new MultipleThreadListParam(function, sysDepts));
//
// }
// if (CollectionUtil.isNotEmpty(caseApplications)) {
// Function<List<CaseApplication>, Integer> function = caseApplicationMapper::batchSave;
// execList.add(new MultipleThreadListParam(function, caseApplications));
// Function<List<CaseApplication>, Integer> functionLog = caseApplicationLogMapper::batchSave;
// execList.add(new MultipleThreadListParam(functionLog, caseApplications));
//
// }
// if (CollectionUtil.isNotEmpty(caseAffiliates)) {
// Function<List<CaseAffiliate>, Integer> function = caseAffiliateMapper::batchCaseAffiliate;
// execList.add(new MultipleThreadListParam(function, caseAffiliates));
// Function<List<CaseAffiliate>, Integer> functionLog = caseAffiliateLogMapper::batchCaseAffiliate;
// execList.add(new MultipleThreadListParam(functionLog, caseAffiliates));
// }
// if (CollectionUtil.isNotEmpty(caseAttachs)) {
// Function<List<CaseAttach>, Integer> function = caseAttachMapper::batchSave;
// execList.add(new MultipleThreadListParam(function, caseAttachs));
// Function<List<CaseAttach>, Integer> functionLog = caseAttachLogMapper::batchSave;
// execList.add(new MultipleThreadListParam(functionLog, caseAttachs));
// }
// if (CollectionUtil.isNotEmpty(columnValueList)) {
// Function<List<ColumnValue>, Integer> function = columnValueMapper::batchSave;
// execList.add(new MultipleThreadListParam(function, columnValueList));
// Function<List<ColumnValue>, Integer> functionLog = columnValueLogMapper::batchSave;
// execList.add(new MultipleThreadListParam(functionLog, columnValueList));
// }
// if (CollectionUtil.isNotEmpty(execList)) {
// MultipleThreadWorkUtil.execListFun(execList.toArray(new MultipleThreadListParam[execList.size()]));
// }
// 多线程执行 // 多线程执行
ThreadPoolUtil.execute(() -> { ThreadPoolUtil.execute(() -> {
caseApplicationLogMapper.insert(caseApplication); try {
// 多线程执行 caseApplicationMapper.insertCaseApplication(caseApplication);
if (CollectionUtil.isNotEmpty(addUsers)) { caseApplicationLogMapper.insert(caseApplication);
userMapper.batchSave(addUsers); // 多线程执行
if (CollectionUtil.isNotEmpty(addUsers)) {
userMapper.batchSave(addUsers);
} }
if (CollectionUtil.isNotEmpty(userRoleList)) { if (CollectionUtil.isNotEmpty(userRoleList)) {
userRoleMapper.batchUserRole(userRoleList); userRoleMapper.batchUserRole(userRoleList);
} }
if (CollectionUtil.isNotEmpty(sysDepts)) { if (CollectionUtil.isNotEmpty(sysDepts)) {
sysDeptMapper.batchSave(sysDepts); sysDeptMapper.batchSave(sysDepts);
} }
if (CollectionUtil.isNotEmpty(caseApplication.getCaseAffiliates())) { if (CollectionUtil.isNotEmpty(caseApplication.getCaseAffiliates())) {
caseAffiliateMapper.batchCaseAffiliate(caseApplication.getCaseAffiliates()); caseAffiliateMapper.batchCaseAffiliate(caseApplication.getCaseAffiliates());
caseAffiliateLogMapper.batchCaseAffiliate(caseApplication.getCaseAffiliates()); caseAffiliateLogMapper.batchCaseAffiliate(caseApplication.getCaseAffiliates());
} }
if (CollectionUtil.isNotEmpty(caseAttachs)) { if (CollectionUtil.isNotEmpty(caseAttachs)) {
caseAttachMapper.batchSave(caseAttachs); caseAttachMapper.batchSave(caseAttachs);
caseAttachLogMapper.batchSave(caseAttachs); caseAttachLogMapper.batchSave(caseAttachs);
} }
if (CollectionUtil.isNotEmpty(columnValueList)) { if (CollectionUtil.isNotEmpty(columnValueList)) {
columnValueMapper.batchSave(columnValueList); columnValueMapper.batchSave(columnValueList);
columnValueLogMapper.batchSave(columnValueList); columnValueLogMapper.batchSave(columnValueList);
} }
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_APPLICATION, "",loginUser); CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_APPLICATION, "",loginUser);
// 发送短信 // 发送短信
if (CollectionUtil.isNotEmpty(smsRequestList)) { if (CollectionUtil.isNotEmpty(smsRequestList)) {
Map<Long, SmsSendRecord> sendRecordMap = null; Map<Long, SmsSendRecord> sendRecordMap = null;
if (CollectionUtil.isNotEmpty(smsSendRecordList)) { if (CollectionUtil.isNotEmpty(smsSendRecordList)) {
sendRecordMap = smsSendRecordList.stream().collect(Collectors.toMap(SmsSendRecord::getCaseId, Function.identity())); sendRecordMap = smsSendRecordList.stream().collect(Collectors.toMap(SmsSendRecord::getCaseId, Function.identity()));
for (SmsUtils.SendSmsRequest sendSmsRequest : smsRequestList) { for (SmsUtils.SendSmsRequest sendSmsRequest : smsRequestList) {
Boolean aBoolean = SmsUtils.sendSms(request); Boolean aBoolean = SmsUtils.sendSms(request);
if (sendRecordMap != null && sendRecordMap.containsKey(sendSmsRequest.getCaseId())) { if (sendRecordMap != null && sendRecordMap.containsKey(sendSmsRequest.getCaseId())) {
if (aBoolean) { if (aBoolean) {
sendRecordMap.get(sendSmsRequest.getCaseId()).setSendStatus(1); sendRecordMap.get(sendSmsRequest.getCaseId()).setSendStatus(1);
} else { } else {
sendRecordMap.get(sendSmsRequest.getCaseId()).setSendStatus(0); sendRecordMap.get(sendSmsRequest.getCaseId()).setSendStatus(0);
}
} }
} }
smsRecordMapper.batchSaveSmsSendRecord(smsSendRecordList);
} }
smsRecordMapper.batchSaveSmsSendRecord(smsSendRecordList);
} }
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("导入失败,请检查抓取规则是否正确");
} }
}); });
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/task/CaseZipImportTask.java
+10 -6
View File
@@ -49,16 +49,20 @@ public class CaseZipImportTask implements Callable<List<CaseApplication>> {
@Override @Override
public List<CaseApplication> call() { public List<CaseApplication> call() {
List<CaseApplication> caseApplications = new ArrayList<>(); List<CaseApplication> caseApplications = new ArrayList<>();
for (File file1 : files) { try {
if (file1.isDirectory() && file1.listFiles() != null) { for (File file1 : files) {
if (file1.isDirectory() && file1.listFiles() != null) {
for (File file2 : file1.listFiles()) { for (File file2 : file1.listFiles()) {
CaseApplication caseApplication = caseZipImportImpl.buildCaseInfo(file2, templateId, fatchRuleList, fatchRuleMap, fatchMap, userMap, dictDataList, deptMap, loginUser); CaseApplication caseApplication = caseZipImportImpl.buildCaseInfo(file2, templateId, fatchRuleList, fatchRuleMap, fatchMap, userMap, dictDataList, deptMap, loginUser);
if (caseApplication != null) { if (caseApplication != null) {
caseApplications.add(caseApplication); caseApplications.add(caseApplication);
}
} }
} }
} }
} catch (Exception e) {
throw new RuntimeException("导入失败");
} }
return caseApplications; return caseApplications;
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationLogMapper.xml
+8 -8
View File
@@ -204,23 +204,23 @@
<delete id="batchDeleteLog"> <delete id="batchDeleteLog">
delete from case_application_log l where l.id in delete from case_application_log l where l.id in
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="item" open="(" separator="," close=")">
#{id} #{item}
</foreach> </foreach>
; ;
delete from case_affiliate_log l where l.case_appli_log_id in delete from case_affiliate_log l where l.case_appli_log_id in
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="item" open="(" separator="," close=")">
#{id} #{item}
</foreach> </foreach>
; ;
delete from case_attach_log l where l.case_appli_log_id in delete from case_attach_log l where l.case_appli_log_id in
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="item" open="(" separator="," close=")">
#{id} #{item}
</foreach> </foreach>
; ;
delete from column_value_log l where l.case_appli_log_id in delete from column_value_log l where l.case_appli_log_id in
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="item" open="(" separator="," close=")">
#{id} #{item}
</foreach> </foreach>
; ;
</delete> </delete>
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+240 -112
View File
@@ -5,54 +5,54 @@
<mapper namespace="com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper"> <mapper namespace="com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper">
<resultMap type="CaseApplication" id="CaseApplicationResult"> <resultMap type="CaseApplication" id="CaseApplicationResult">
<id property="id" column="id" /> <id property="id" column="id"/>
<result property="caseNum" column="case_num" /> <result property="caseNum" column="case_num"/>
<result property="caseName" column="case_name" /> <result property="caseName" column="case_name"/>
<result property="caseSubjectAmount" column="case_subject_amount" /> <result property="caseSubjectAmount" column="case_subject_amount"/>
<result property="registerDate" column="register_date" /> <result property="registerDate" column="register_date"/>
<result property="arbitratMethod" column="arbitrat_method" /> <result property="arbitratMethod" column="arbitrat_method"/>
<result property="caseStatus" column="case_status" /> <result property="caseStatus" column="case_status"/>
<result property="hearDate" column="hear_date" /> <result property="hearDate" column="hear_date"/>
<result property="arbitratClaims" column="arbitrat_claims" /> <result property="arbitratClaims" column="arbitrat_claims"/>
<result property="loanStartDate" column="loan_start_date" /> <result property="loanStartDate" column="loan_start_date"/>
<result property="loanEndDate" column="loan_end_date" /> <result property="loanEndDate" column="loan_end_date"/>
<result property="claimPrinciOwed" column="claim_princi_owed" /> <result property="claimPrinciOwed" column="claim_princi_owed"/>
<result property="claimInterestOwed" column="claim_interest_owed" /> <result property="claimInterestOwed" column="claim_interest_owed"/>
<result property="claimLiquidDamag" column="claim_liquid_damag" /> <result property="claimLiquidDamag" column="claim_liquid_damag"/>
<result property="feePayable" column="fee_payable" /> <result property="feePayable" column="fee_payable"/>
<result property="beginVideoDate" column="begin_video_date" /> <result property="beginVideoDate" column="begin_video_date"/>
<result property="onlineVideoPerson" column="online_video_person" /> <result property="onlineVideoPerson" column="online_video_person"/>
<result property="contractNumber" column="contract_number" /> <result property="contractNumber" column="contract_number"/>
<result property="caseStatusName" column="caseStatusName" /> <result property="caseStatusName" column="caseStatusName"/>
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time"/>
<result property="arbitratMethodName" column="arbitratMethodName" /> <result property="arbitratMethodName" column="arbitratMethodName"/>
<result property="applicantIsWrittenHear" column="appli_iswrit_hear" /> <result property="applicantIsWrittenHear" column="appli_iswrit_hear"/>
<result property="respondentIsWrittenHear" column="respon_isWrit_hear" /> <result property="respondentIsWrittenHear" column="respon_isWrit_hear"/>
<result property="isAbsence" column="is_absence" /> <result property="isAbsence" column="is_absence"/>
<result property="responCrossOpin" column="respon_cross_opin" /> <result property="responCrossOpin" column="respon_cross_opin"/>
<result property="applicaCrossOpin" column="applica_cross_opin" /> <result property="applicaCrossOpin" column="applica_cross_opin"/>
<result property="responDefenOpini" column="respon_defen_opini" /> <result property="responDefenOpini" column="respon_defen_opini"/>
<result property="arbitratorId" column="arbitrator_id" /> <result property="arbitratorId" column="arbitrator_id"/>
<result property="arbitratorName" column="arbitrator_name" /> <result property="arbitratorName" column="arbitrator_name"/>
<result property="paymentStatus" column="payment_status" /> <result property="paymentStatus" column="payment_status"/>
<result property="paymentStatusName" column="paymentStatusName" /> <result property="paymentStatusName" column="paymentStatusName"/>
<result property="filearbitraUrl" column="filearbitra_url" /> <result property="filearbitraUrl" column="filearbitra_url"/>
<result property="requestRule" column="request_rule" /> <result property="requestRule" column="request_rule"/>
<result property="properPreser" column="proper_preser" /> <result property="properPreser" column="proper_preser"/>
<result property="adjudicaCounter" column="adjudica_counter" /> <result property="adjudicaCounter" column="adjudica_counter"/>
<result property="lockStatus" column="lock_status" /> <result property="lockStatus" column="lock_status"/>
<result property="facts" column="facts" /> <result property="facts" column="facts"/>
<result property="batchNumber" column="batch_number" /> <result property="batchNumber" column="batch_number"/>
<result property="mediationAgreement" column="mediation_agreement" /> <result property="mediationAgreement" column="mediation_agreement"/>
</resultMap> </resultMap>
@@ -368,6 +368,114 @@
JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1 JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
WHERE WHERE
r.create_by=#{loginUserName} AND ca.identity_type=1 r.create_by=#{loginUserName} AND ca.identity_type=1
and c.id not in(
<trim suffixOverrides="union">
<!--被申请人，仲裁员,部门长，财务，代理人案件-->
<if test="isOtherRole!=null and isOtherRole==1">
select c.id
from case_application c
JOIN case_affiliate ca ON ca.case_appli_id = c.id
<where>
<!--根据角色和状态过滤-->
<!--被申请人-->
<if test="idCard != null and idCard != ''">
or (ca.identity_num=#{idCard} AND ca.identity_type=2
and (c.case_status=4 or c.case_status=17)
)
</if>
<!--仲裁员-->
<if test="userId != null and userId != ''">
or ( ca.identity_type=1 and
c.case_status in (7,13,17,18)
and
instr (c.arbitrator_id,#{userId})>0)
</if>
<!--部门长-->
<if test="deptHeadStatus != null and deptHeadStatus.size() > 0">
or (ca.identity_type=1)
</if>
<!--财务-->
<if test="financeStatus != null and financeStatus != ''">
or (ca.identity_type=1
and c.case_status =#{financeStatus}
)
</if>
<!--代理人-->
<if test="agentDeptIds != null and agentDeptIds.size()>0">
or (
ca.application_organ_id in
<foreach item="deptId" collection="agentDeptIds" open="(" separator="," close=")">#{deptId}
</foreach>
AND ca.identity_type=1
and c.case_status in (0,9)
)
</if>
</where>
union
</if>
<if test="applicationOrganId != null and applicationOrganId != ''">
<!--申请人案件-->
select c.id
from case_application c
JOIN case_affiliate ca ON ca.case_appli_id =c.id AND ca.identity_type = 1
<where>
(c.case_status &lt;= 10 or c.case_status=31) AND
ca.identity_type=1
<if test="applicationOrganId != null and applicationOrganId != ''">
AND ca.application_organ_id = #{applicationOrganId}
</if>
</where>
union
</if>
<!--秘书案件-->
<if test="deptIds != null and deptIds.size() > 0">
<!--秘书主表案件-->
SELECT
c.id
FROM
case_application c
JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type = 1
JOIN case_application_log l on l.case_appli_id=c.id and l.update_submit_status not in(1, 2) and
l.version
= (
SELECT
max( version ) version
FROM
case_application_log
WHERE case_appli_id = c.id
)
WHERE
ca.identity_type=1
and c.case_status in (1,5,8,9,11,14,15,16,17,31)
union
<!--秘书审核案件-->
SELECT
l.case_appli_id id
FROM
case_application c
JOIN case_application_log l ON c.id = l.case_appli_id
JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id
AND ca.identity_type = 1
WHERE
l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1
<!-- 查询该案件的最新记录 -->
AND l.version = (
SELECT
max( version ) version
FROM
case_application_log
WHERE
c.id = case_appli_id)
</if>
</trim>
)
</if> </if>
</trim> </trim>
@@ -391,13 +499,13 @@
</select> </select>
<select id="selectHandledCase" resultMap="CaseApplicationResult"> <select id="selectHandledCase" resultMap="CaseApplicationResult">
select DISTINCT(c.id) id,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method , select DISTINCT(c.id) id,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理' CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
ELSE '无审理方式' ELSE '无审理方式'
END arbitratMethodName, END arbitratMethodName,
c.case_status , c.case_status ,
CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核' when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理' when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书' when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
@@ -408,9 +516,11 @@
ELSE '无案件状态' ELSE '无案件状态'
END caseStatusName, END caseStatusName,
c.hear_date ,c.arbitrat_claims , c.hear_date ,c.arbitrat_claims ,
c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable , c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
,c.fee_payable ,
c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status, c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url,c.version c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId
,ca.application_organ_name as applicantName,c.filearbitra_url,c.version
from case_log_record r from case_log_record r
join case_application c on r.case_appli_id=c.id join case_application c on r.case_appli_id=c.id
JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1 JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
@@ -423,10 +533,10 @@
AND c.case_num = #{caseNum} AND c.case_num = #{caseNum}
</if> </if>
<if test="nameId != null and nameId != ''"> <if test="nameId != null and nameId != ''">
AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
</if> </if>
<if test="loginUserName != null and loginUserName != ''"> <if test="loginUserName != null and loginUserName != ''">
AND r.create_by=#{loginUserName} AND ca.identity_type=1 AND r.create_by=#{loginUserName} AND ca.identity_type=1
</if> </if>
</where> </where>
@@ -443,7 +553,8 @@
from( from(
select t.id,t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method, select t.id,t.case_num ,t.case_subject_amount ,t.register_date ,t.arbitrat_method,
t.arbitratMethodName,t.case_status,t.caseStatusName,t.hear_date ,t.arbitrat_claims , t.arbitratMethodName,t.case_status,t.caseStatusName,t.hear_date ,t.arbitrat_claims ,
t.loan_start_date ,t.loan_end_date ,t.claim_princi_owed ,t.claim_interest_owed ,t.claim_liquid_damag,t.fee_payable , t.loan_start_date ,t.loan_end_date ,t.claim_princi_owed ,t.claim_interest_owed
,t.claim_liquid_damag,t.fee_payable ,
t.begin_video_date ,t.online_video_person ,t.contract_number ,t.create_by ,t.create_time , t.begin_video_date ,t.online_video_person ,t.contract_number ,t.create_by ,t.create_time ,
t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.applicantName, t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.applicantName,
t.arbitrator_id,t.identity_num , t.identity_type,t.filearbitra_url,t.lock_status,t.version t.arbitrator_id,t.identity_num , t.identity_type,t.filearbitra_url,t.lock_status,t.version
@@ -480,7 +591,7 @@
AND c.case_num = #{caseNum} AND c.case_num = #{caseNum}
</if> </if>
<if test="nameId != null and nameId != ''"> <if test="nameId != null and nameId != ''">
AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
</if> </if>
<if test="caseStatusList != null and caseStatusList.size() > 0"> <if test="caseStatusList != null and caseStatusList.size() > 0">
and c.case_status in and c.case_status in
@@ -521,7 +632,7 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <if test="financeStatus != null and financeStatus != ''">
or (t.identity_type=1 and t.case_status =#{financeStatus}) or (t.identity_type=1 and t.case_status =#{financeStatus})
</if> </if>
@@ -565,7 +676,8 @@
<trim suffixOverrides="union"> <trim suffixOverrides="union">
<!--被申请人，仲裁员,部门长，财务，代理人案件--> <!--被申请人，仲裁员,部门长，财务，代理人案件-->
<if test="isOtherRole!=null and isOtherRole==1"> <if test="isOtherRole!=null and isOtherRole==1">
select DISTINCT(t.id),t.case_status,t.application_organ_id, t.arbitrator_id,t.identity_num , t.identity_type from( select DISTINCT(t.id),t.case_status,t.application_organ_id, t.arbitrator_id,t.identity_num ,
t.identity_type from(
select c.id , select c.id ,
c.case_status,ca.application_organ_id, c.case_status,ca.application_organ_id,
c.arbitrator_id,ca.identity_num , ca.identity_type c.arbitrator_id,ca.identity_num , ca.identity_type
@@ -612,7 +724,7 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <if test="financeStatus != null and financeStatus != ''">
or ( t.identity_type=1 and t.case_status =#{financeStatus}) or ( t.identity_type=1 and t.case_status =#{financeStatus})
</if> </if>
<!--代理人--> <!--代理人-->
@@ -651,12 +763,12 @@
ca.identity_type=1 ca.identity_type=1
and c.case_status in (1,5,8,9,11,14,15,16,17,31) and c.case_status in (1,5,8,9,11,14,15,16,17,31)
<!-- <if test="deptIds != null and deptIds.size() > 0"> <!-- <if test="deptIds != null and deptIds.size() > 0">
and ca.application_organ_id in and ca.application_organ_id in
<foreach item="item" collection="deptIds" open="(" separator="," close=")"> <foreach item="item" collection="deptIds" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if> --> </if> -->
<if test="caseStatus != null"> <if test="caseStatus != null">
AND c.case_status = #{caseStatus} AND c.case_status = #{caseStatus}
</if> </if>
@@ -665,7 +777,7 @@
AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
</if> </if>
union union
select c.id , select c.id ,
c.case_status,ca.application_organ_id, c.case_status,ca.application_organ_id,
c.arbitrator_id,ca.identity_num , ca.identity_type c.arbitrator_id,ca.identity_num , ca.identity_type
FROM FROM
@@ -694,7 +806,7 @@
ELSE '无审理方式' ELSE '无审理方式'
END arbitratMethodName, END arbitratMethodName,
c.case_status , c.case_status ,
CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核' when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理' when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书' when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
@@ -705,9 +817,11 @@
ELSE '无案件状态' ELSE '无案件状态'
END caseStatusName, END caseStatusName,
c.hear_date ,c.arbitrat_claims , c.hear_date ,c.arbitrat_claims ,
c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable , c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
,c.fee_payable ,
c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status, c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url,(select version from c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId
,ca.application_organ_name as applicantName,c.filearbitra_url,(select version from
case_application_log where case_appli_id=c.id order by version desc limit 1) as version,(select case_application_log where case_appli_id=c.id order by version desc limit 1) as version,(select
update_submit_status from case_application_log where case_appli_id=c.id order by version desc limit 1) update_submit_status from case_application_log where case_appli_id=c.id order by version desc limit 1)
as updateSubmitStatus,c.batch_number as updateSubmitStatus,c.batch_number
@@ -726,7 +840,7 @@
AND c.case_num = #{caseNum} AND c.case_num = #{caseNum}
</if> </if>
<if test="nameId != null and nameId != ''"> <if test="nameId != null and nameId != ''">
AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
</if> </if>
<if test="caseStatusList != null and caseStatusList.size() > 0"> <if test="caseStatusList != null and caseStatusList.size() > 0">
and c.case_status in and c.case_status in
@@ -791,7 +905,7 @@
<select id="selectCaseApplicationCount" parameterType="CaseApplication" resultType="int"> <select id="selectCaseApplicationCount" parameterType="CaseApplication" resultType="int">
select count(1) from case_application c select count(1) from case_application c
<where> <where>
<if test="caseNum != null and caseNum != ''"> <if test="caseNum != null and caseNum != ''">
AND c.case_num = #{caseNum} AND c.case_num = #{caseNum}
@@ -875,7 +989,7 @@
id, id,
case_name , case_name ,
case_num, case_num,
case_subject_amount, case_subject_amount,
register_date, register_date,
arbitrat_method, arbitrat_method,
case_status, case_status,
@@ -900,49 +1014,49 @@
create_by, create_by,
import_flag, import_flag,
version, version,
template_id, template_id,
facts, facts,
mediation_agreement, mediation_agreement,
batch_number, batch_number,
create_time create_time
)values )values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
( (
#{item.id}, #{item.id},
#{item.caseName}, #{item.caseName},
#{item.caseNum}, #{item.caseNum},
#{item.caseSubjectAmount}, #{item.caseSubjectAmount},
sysdate(), sysdate(),
#{item.arbitratMethod}, #{item.arbitratMethod},
#{item.caseStatus}, #{item.caseStatus},
#{item.hearDate}, #{item.hearDate},
#{item.arbitratClaims}, #{item.arbitratClaims},
#{item.requestRule}, #{item.requestRule},
#{item.loanStartDate}, #{item.loanStartDate},
#{item.loanEndDate}, #{item.loanEndDate},
#{item.claimPrinciOwed}, #{item.claimPrinciOwed},
#{item.claimInterestOwed}, #{item.claimInterestOwed},
#{item.claimLiquidDamag}, #{item.claimLiquidDamag},
#{item.feePayable}, #{item.feePayable},
#{item.beginVideoDate}, #{item.beginVideoDate},
#{item.onlineVideoPerson}, #{item.onlineVideoPerson},
#{item.contractNumber}, #{item.contractNumber},
#{item.adjudicaCounter}, #{item.adjudicaCounter},
#{item.properPreser}, #{item.properPreser},
#{item.createBy}, #{item.createBy},
#{item.importFlag}, #{item.importFlag},
#{item.version}, #{item.version},
#{item.templateId}, #{item.templateId},
#{item.facts}, #{item.facts},
#{item.mediationAgreement}, #{item.mediationAgreement},
#{item.batchNumber}, #{item.batchNumber},
sysdate() sysdate()
) )
</foreach>; </foreach>;
</insert> </insert>
@@ -962,7 +1076,9 @@
<if test="claimLiquidDamag != null ">claim_liquid_damag = #{claimLiquidDamag},</if> <if test="claimLiquidDamag != null ">claim_liquid_damag = #{claimLiquidDamag},</if>
<if test="feePayable != null ">fee_payable = #{feePayable},</if> <if test="feePayable != null ">fee_payable = #{feePayable},</if>
<if test="beginVideoDate != null ">begin_video_date = #{beginVideoDate},</if> <if test="beginVideoDate != null ">begin_video_date = #{beginVideoDate},</if>
<if test="onlineVideoPerson != null and onlineVideoPerson != ''">online_video_person = #{onlineVideoPerson},</if> <if test="onlineVideoPerson != null and onlineVideoPerson != ''">online_video_person =
#{onlineVideoPerson},
</if>
<if test="contractNumber != null and contractNumber != ''">contract_number = #{contractNumber},</if> <if test="contractNumber != null and contractNumber != ''">contract_number = #{contractNumber},</if>
@@ -978,8 +1094,10 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if> <if test="caseNum != null and caseNum != ''">case_num = #{caseNum},</if>
<if test="version != null ">version = #{version},</if> <if test="version != null ">version = #{version},</if>
<if test="facts != null and facts != ''">facts = #{facts},</if> <if test="facts != null and facts != ''">facts = #{facts},</if>
<if test="mediationAgreement != null and mediationAgreement != ''">mediation_agreement = #{mediationAgreement},</if> <if test="mediationAgreement != null and mediationAgreement != ''">mediation_agreement =
#{mediationAgreement},
</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where id = #{id} where id = #{id}
@@ -1003,13 +1121,17 @@
<if test="isAbsence != null">is_absence = #{isAbsence},</if> <if test="isAbsence != null">is_absence = #{isAbsence},</if>
<if test="appliIsAbsen != null">appli_is_absen = #{appliIsAbsen},</if> <if test="appliIsAbsen != null">appli_is_absen = #{appliIsAbsen},</if>
<if test="responCrossOpin != null and responCrossOpin != ''">respon_cross_opin = #{responCrossOpin},</if> <if test="responCrossOpin != null and responCrossOpin != ''">respon_cross_opin = #{responCrossOpin},</if>
<if test="applicaCrossOpin != null and applicaCrossOpin != ''">applica_cross_opin = #{applicaCrossOpin},</if> <if test="applicaCrossOpin != null and applicaCrossOpin != ''">applica_cross_opin = #{applicaCrossOpin},
<if test="responDefenOpini != null and responDefenOpini != ''">respon_defen_opini = #{responDefenOpini},</if> </if>
<if test="responDefenOpini != null and responDefenOpini != ''">respon_defen_opini = #{responDefenOpini},
</if>
<if test="objectionAddEviden != null">objection_add_eviden = #{objectionAddEviden},</if> <if test="objectionAddEviden != null">objection_add_eviden = #{objectionAddEviden},</if>
<if test="openCourtHear != null">open_court_hear = #{openCourtHear},</if> <if test="openCourtHear != null">open_court_hear = #{openCourtHear},</if>
<if test="hearDate != null">hear_date = #{hearDate},</if> <if test="hearDate != null">hear_date = #{hearDate},</if>
<if test="filearbitraUrl != null and filearbitraUrl != ''">filearbitra_url = #{filearbitraUrl},</if> <if test="filearbitraUrl != null and filearbitraUrl != ''">filearbitra_url = #{filearbitraUrl},</if>
<if test="adjudicaCounterReason != null and adjudicaCounterReason != ''">adjudica_counter_reason = #{adjudicaCounterReason},</if> <if test="adjudicaCounterReason != null and adjudicaCounterReason != ''">adjudica_counter_reason =
#{adjudicaCounterReason},
</if>
</set> </set>
where id = #{id} where id = #{id}
</update> </update>
@@ -1064,7 +1186,7 @@
END arbitratMethodName, END arbitratMethodName,
c.case_name, c.case_name,
c.case_status , c.case_status ,
CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核' when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理' when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书' when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
@@ -1075,10 +1197,13 @@
ELSE '无案件状态' ELSE '无案件状态'
END caseStatusName, END caseStatusName,
c.hear_date ,c.arbitrat_claims , c.hear_date ,c.arbitrat_claims ,
c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable , c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.request_rule,c.adjudica_counter,c.proper_preser, ,c.fee_payable ,
c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time
,c.request_rule,c.adjudica_counter,c.proper_preser,
c.is_absence ,c.respon_cross_opin ,c.applica_cross_opin ,c.respon_defen_opini , c.is_absence ,c.respon_cross_opin ,c.applica_cross_opin ,c.respon_defen_opini ,
c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName, c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId
,ca.application_organ_name as applicantName,
c.batch_number, c.batch_number,
c.facts, c.facts,
c.appli_iswrit_hear,c.respon_isWrit_hear, c.appli_iswrit_hear,c.respon_isWrit_hear,
@@ -1099,7 +1224,7 @@
ELSE '无审理方式' ELSE '无审理方式'
END arbitratMethodName, END arbitratMethodName,
c.case_status , c.case_status ,
CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费' CASE c.case_status when 0 then '立案申请' when 1 then '待立案审查' when 2 then '待缴费'
when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核' when 3 then '待缴费确认' when 4 then '待案件质证' when 5 then '待组庭审核'
when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理' when 6 then '待组庭确定' when 7 then '待审核仲裁方式' when 8 then '待开庭审理'
when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书' when 9 then '待书面审理' when 10 then '待生成仲裁文书' when 11 then '待核验仲裁文书'
@@ -1110,10 +1235,13 @@
ELSE '无案件状态' ELSE '无案件状态'
END caseStatusName, END caseStatusName,
c.hear_date ,c.arbitrat_claims , c.hear_date ,c.arbitrat_claims ,
c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable , c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.request_rule,c.adjudica_counter,c.proper_preser, ,c.fee_payable ,
c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time
,c.request_rule,c.adjudica_counter,c.proper_preser,
c.is_absence ,c.respon_cross_opin ,c.applica_cross_opin ,c.respon_defen_opini , c.is_absence ,c.respon_cross_opin ,c.applica_cross_opin ,c.respon_defen_opini ,
c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName, c.update_by ,c.update_time,c.arbitrator_id,c.arbitrator_name,ca.application_organ_id applicationOrganId
,ca.application_organ_name as applicantName,
c.batch_number, c.batch_number,
c.facts, c.facts,
c.mediation_agreement,c.template_id templateId c.mediation_agreement,c.template_id templateId