diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java index 9ebfa39..1dab11c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java @@ -131,15 +131,15 @@ public class PdfUtils { return true; } - public static void main(String[] args) { + public static void main(String [] args) { try { - String pdfFile = "D:\\test2.pdf"; + String pdfFile = "D:\\test13.pdf"; String htmlContent1 = "

夫士大夫士大夫发

会见韩国机构行家

地方鬼地方鬼地方三个广泛的

"; String htmlContent = "" + "

夫士大夫士大夫发

会见韩国机构行家

地方鬼地方鬼地方三个广泛的

"; - String htmlContent2 = "" + "

夫士大夫士大夫发

会见韩国机构行家

地方鬼地方鬼地方三个广泛的

"; + String htmlContent2 = "

夫士大夫士大夫发

会见韩国机构行家

地方鬼地方鬼地方三个广泛的

"; - htmlStringConvertToPDF(pdfFile,htmlContent); + htmlStringConvertToPDF(pdfFile,htmlContent2); // parseHtml2PdfByFilePath(pdfFile,htmlFile); } catch (Exception e) { e.printStackTrace(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index c1b2ff0..2dedf2c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -184,6 +184,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { || "部门长".equals(role.getRoleName())) { List caseStatusList = new ArrayList<>(); caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); + caseStatusList.add(CaseApplicationConstants.CHECK_ARBITRATION); // caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); caseApplication.setDeptHeadStatus(caseStatusList); caseApplication.setIsOtherRole(1); @@ -260,6 +261,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { || "部门长".equals(role.getRoleName())) { caseApplication.setIsOtherRole(1); caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); + caseStatusList.add(CaseApplicationConstants.CHECK_ARBITRATION); // caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); caseApplication.setDeptHeadStatus(caseStatusList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java index ec0531f..b3b6e9b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java @@ -329,9 +329,9 @@ public class VideoServiceImpl implements VideoService { } catch (IOException e) { throw new RuntimeException(e); } - + String htmlContent = "" +reservedConferenceVO.getHtmlContent()+""; // html转pdf并上传到服务器 - boolean convertFlag = PdfUtils.htmlStringConvertToPDF(RuoYiConfig.getHtml2PDFPath() + currentFileName, reservedConferenceVO.getHtmlContent()); + boolean convertFlag = PdfUtils.htmlStringConvertToPDF(RuoYiConfig.getHtml2PDFPath() + currentFileName, htmlContent); // 绑定案件 if(convertFlag){ diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 929119d..bb6f40b 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -67,7 +67,8 @@ ,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.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.updateSubmitStatus + t.arbitrator_id,t.identity_num , + t.identity_type,t.filearbitra_url,t.lock_status,t.version,t.updateSubmitStatus from( select c.id ,'' AS caseLogId,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method , CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理' @@ -85,9 +86,12 @@ END caseStatusName, 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.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time, - c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name as applicantName, - c.arbitrator_id,ca.identity_num ,ca.identity_type,c.filearbitra_url,c.lock_status,c.version,null as updateSubmitStatus + ,c.fee_payable ,c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by + ,c.create_time, + c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name + as applicantName, + c.arbitrator_id,ca.identity_num ,ca.identity_type,c.filearbitra_url,c.lock_status,c.version,null as + updateSubmitStatus from case_application c JOIN case_affiliate ca ON ca.case_appli_id = c.id @@ -121,7 +125,7 @@ or ( t.identity_type=1 and - t.case_status in (7,8,9,12,13,17) + t.case_status in (7,8,9,11,13,17) and instr (t.arbitrator_id,#{userId})>0) @@ -183,7 +187,10 @@ c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name as applicantName, - c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status,(select version from 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) as updateSubmitStatus + c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status,(select version from + 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) + as updateSubmitStatus from case_application c JOIN case_application_log l ON c.id = l.case_appli_id and c.version=l.version JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1 @@ -214,6 +221,7 @@ + select tt.* from( SELECT c.id, '' AS caseLogId, @@ -296,40 +304,48 @@ 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 + 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,11,14,15,16,17,31) - - and c.case_status in - - #{caseStatus} - - + ca.identity_type=1 + + and c.case_status in (1,5,14,15,16,17,31) + and ca.application_organ_id in #{item} - - AND c.case_status = #{caseStatus} - AND c.lock_status = #{lockStatus} + AND c.case_num = #{caseNum} AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 - + ) tt + + + and tt.case_status in + + #{caseStatus} + + + + AND tt.case_status = #{caseStatus} + + + union SELECT @@ -415,7 +431,13 @@ 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 + l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1 and c.case_status >10 + + and c.case_status in + + #{caseStatus} + + and ca.application_organ_id in @@ -663,7 +685,7 @@ or ( t.identity_type=1 and - t.case_status in (7,8,9,12,13,17) + t.case_status in (7,8,9,11,13,17) and instr (t.arbitrator_id,#{userId})>0) @@ -755,7 +777,7 @@ WHERE case_appli_id = c.id ) WHERE - ca.identity_type=1 and c.case_status in (1,5,11,14,15,16,17,31) + ca.identity_type=1 and c.case_status in (1,5,14,15,16,17,31) and ca.application_organ_id in @@ -774,44 +796,7 @@ AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 - union - - select l.case_appli_id id , - c.case_status,ca.application_organ_id, - c.arbitrator_id,ca.identity_num , ca.identity_type - 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 ca.application_organ_id in - - #{item} - - - - AND c.case_status = #{caseStatus} - - - AND c.lock_status = #{lockStatus} - - - AND c.case_num = #{caseNum} - - - AND ca.application_organ_id=#{nameId} AND ca.identity_type=1 - - AND l.version = ( - SELECT - max( version ) version - FROM - case_application_log - WHERE - c.id = case_appli_id)