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

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz5

Browse Source
This commit is contained in:
qitz
2023-12-27 14:40:48 +08:00
parent 31a9287a8f 4cd04ef10e
commit deea55b1e9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java
+1 -3
View File
@@ -124,7 +124,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
//查询案件详细信息 //查询案件详细信息
CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication); CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
if (caseApplication1 == null) { if (caseApplication1 == null) {
return AjaxResult.error(); continue;
} }
String caseName = "仲裁"; //这里案件名称表里未定义,暂时写死 String caseName = "仲裁"; //这里案件名称表里未定义,暂时写死
String caseNum = caseApplication1.getCaseNum(); String caseNum = caseApplication1.getCaseNum();
@@ -183,8 +183,6 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
casePaymentRecordMapper.update(casePaymentRecord); casePaymentRecordMapper.update(casePaymentRecord);
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_CROSSEXAMI, ""); CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_CROSSEXAMI, "");
return AjaxResult.success();
} }
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java
+6 -1
View File
@@ -415,7 +415,12 @@ public class CaseZipImportImpl {
* @param fatchRules 抓取规则 * @param fatchRules 抓取规则
*/ */
private void getFatchContent(Map<String, String> andConvertPDF, String mapKey, Map<String, String> map, List<FatchRule> fatchRules) { private void getFatchContent(Map<String, String> andConvertPDF, String mapKey, Map<String, String> map, List<FatchRule> fatchRules) {
String fileURL = andConvertPDF.get(mapKey); String fileURL =null;
for (Map.Entry<String, String> entry : andConvertPDF.entrySet()) {
if(entry.getKey().contains(mapKey)){
fileURL=entry.getValue();
}
}
if (StrUtil.isEmpty(fileURL)) { if (StrUtil.isEmpty(fileURL)) {
return; return;
} }