SH-Arbitrate
/
Arbitrate-Backend
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests -2 Releases 0 Wiki Activity
Browse Source

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

wangqiong123 2 years ago
parent
532baf1682 cc7cf6d2c0
commit
ffa7ace73b
4 changed files with 52 additions and 65 deletions
Unified View Show Diff Stats
  1. 4
    4
      ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java
  2. 2
    0
      ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
  3. 2
    2
      ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java
  4. 44
    59
      ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

+ 4
- 4
ruoyi-common/src/main/java/com/ruoyi/common/utils/PdfUtils.java View File

131 
         return true;
 131 
         return true;
132 
     }
 132 
     }
133
133
134 
-    public static void main(String[] args) {
134 
+    public static void main(String      [] args) {
135 
         try {
 135 
         try {
136
136
137 
-            String pdfFile = "D:\\test2.pdf";
137 
+            String pdfFile = "D:\\test13.pdf";
138 
             String htmlContent1 = "<h1>夫士大夫士大夫发</h1><p>会见韩国机构行家</p ><h2>地方鬼地方鬼地方三个广泛的</h2>";
 138 
             String htmlContent1 = "<h1>夫士大夫士大夫发</h1><p>会见韩国机构行家</p ><h2>地方鬼地方鬼地方三个广泛的</h2>";
139 
             String htmlContent = "<html><body style=\"font-size:12.0pt; font-family:宋体\">" + "<h1>夫士大夫士大夫发</h1><p>会见韩国机构行家</p ><h2>地方鬼地方鬼地方三个广泛的</h2></body></html>";
 139 
             String htmlContent = "<html><body style=\"font-size:12.0pt; font-family:宋体\">" + "<h1>夫士大夫士大夫发</h1><p>会见韩国机构行家</p ><h2>地方鬼地方鬼地方三个广泛的</h2></body></html>";
140 
-            String htmlContent2 = "<html><body >" + "<h1>夫士大夫士大夫发</h1><p>会见韩国机构行家</p ><h2>地方鬼地方鬼地方三个广泛的</h2></body></html>";
140 
+            String htmlContent2 = "<html><body style=\\\"font-size:12.0pt; font-family:宋体\\\"><h1>夫士大夫士大夫发</h1><p>会见韩国机构行家</p ><h2>地方鬼地方鬼地方三个广泛的</h2></body></html>";
141
141
142 
-            htmlStringConvertToPDF(pdfFile,htmlContent);
142 
+            htmlStringConvertToPDF(pdfFile,htmlContent2);
143 
 //            parseHtml2PdfByFilePath(pdfFile,htmlFile);
 143 
 //            parseHtml2PdfByFilePath(pdfFile,htmlFile);
144 
         } catch (Exception e) {
 144 
         } catch (Exception e) {
145 
             e.printStackTrace();
 145 
             e.printStackTrace();

+ 2
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java View File

184 
                         || "部门长".equals(role.getRoleName())) {
 184 
                         || "部门长".equals(role.getRoleName())) {
185 
                     List<Integer> caseStatusList = new ArrayList<>();
 185 
                     List<Integer> caseStatusList = new ArrayList<>();
186 
                     caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
 186 
                     caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
187 
+                    caseStatusList.add(CaseApplicationConstants.CHECK_ARBITRATION);
187 
                   //  caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
 188 
                   //  caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
188 
                     caseApplication.setDeptHeadStatus(caseStatusList);
 189 
                     caseApplication.setDeptHeadStatus(caseStatusList);
189 
                     caseApplication.setIsOtherRole(1);
 190 
                     caseApplication.setIsOtherRole(1);
260 
                     || "部门长".equals(role.getRoleName())) {
 261 
                     || "部门长".equals(role.getRoleName())) {
261 
                 caseApplication.setIsOtherRole(1);
 262 
                 caseApplication.setIsOtherRole(1);
262 
                 caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
 263 
                 caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
264 
+                caseStatusList.add(CaseApplicationConstants.CHECK_ARBITRATION);
263 
              //   caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
 265 
              //   caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
264 
                 caseApplication.setDeptHeadStatus(caseStatusList);
 266 
                 caseApplication.setDeptHeadStatus(caseStatusList);
265 
             }
 267 
             }

+ 2
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java View File

329 
         } catch (IOException e) {
 329 
         } catch (IOException e) {
330 
             throw new RuntimeException(e);
 330 
             throw new RuntimeException(e);
331 
         }
 331 
         }
332 
-
332 
+        String htmlContent = "<html><body style=\"font-size:12.0pt; font-family:宋体\">" +reservedConferenceVO.getHtmlContent()+"</body></html>";
333 
         // html转pdf并上传到服务器
 333 
         // html转pdf并上传到服务器
334 
-        boolean convertFlag = PdfUtils.htmlStringConvertToPDF(RuoYiConfig.getHtml2PDFPath() + currentFileName, reservedConferenceVO.getHtmlContent());
334 
+        boolean convertFlag = PdfUtils.htmlStringConvertToPDF(RuoYiConfig.getHtml2PDFPath() + currentFileName, htmlContent);
335
335
336 
         // 绑定案件
 336 
         // 绑定案件
337 
         if(convertFlag){
 337 
         if(convertFlag){

+ 44
- 59
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml View File

67 
                 ,t.claim_liquid_damag,t.fee_payable ,
 67 
                 ,t.claim_liquid_damag,t.fee_payable ,
68 
                 t.begin_video_date ,t.online_video_person ,t.contract_number ,t.create_by ,t.create_time ,
 68 
                 t.begin_video_date ,t.online_video_person ,t.contract_number ,t.create_by ,t.create_time ,
69 
                 t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.applicantName,
 69 
                 t.update_by ,t.update_time , t.arbitrator_name,t.name,t.application_organ_id,t.applicantName,
70 
-                t.arbitrator_id,t.identity_num , t.identity_type,t.filearbitra_url,t.lock_status,t.version,t.updateSubmitStatus
70 
+                t.arbitrator_id,t.identity_num ,
71 
+                t.identity_type,t.filearbitra_url,t.lock_status,t.version,t.updateSubmitStatus
71 
                 from(
 72 
                 from(
72 
                 select c.id ,'' AS caseLogId,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
 73 
                 select c.id ,'' AS caseLogId,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
73 
                 CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
 74 
                 CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
85 
                 END caseStatusName,
 86 
                 END caseStatusName,
86 
                 c.hear_date ,c.arbitrat_claims ,
 87 
                 c.hear_date ,c.arbitrat_claims ,
87 
                 c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
 88 
                 c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
88 
-                ,c.fee_payable ,c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time,
89 
-                c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name as applicantName,
90 
-                c.arbitrator_id,ca.identity_num ,ca.identity_type,c.filearbitra_url,c.lock_status,c.version,null as updateSubmitStatus
89 
+                ,c.fee_payable ,c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by
90 
+                ,c.create_time,
91 
+                c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name
92 
+                as applicantName,
93 
+                c.arbitrator_id,ca.identity_num ,ca.identity_type,c.filearbitra_url,c.lock_status,c.version,null as
94 
+                updateSubmitStatus
91 
                 from case_application c
 95 
                 from case_application c
92 
                 JOIN case_affiliate ca ON ca.case_appli_id = c.id
 96 
                 JOIN case_affiliate ca ON ca.case_appli_id = c.id
93 
                 <!--查询条件-->
 97 
                 <!--查询条件-->
121 
                     <!--仲裁员-->
 125 
                     <!--仲裁员-->
122 
                     <if test="userId != null and userId != ''">
 126 
                     <if test="userId != null and userId != ''">
123 
                         or ( t.identity_type=1 and
 127 
                         or ( t.identity_type=1 and
124 
-                        t.case_status in (7,8,9,12,13,17)
128 
+                        t.case_status in (7,8,9,11,13,17)
125 
                         and
 129 
                         and
126 
                         instr (t.arbitrator_id,#{userId})>0)
 130 
                         instr (t.arbitrator_id,#{userId})>0)
127 
                     </if>
 131 
                     </if>
183 
                 c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name
 187 
                 c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name
184 
                 as
 188 
                 as
185 
                 applicantName,
 189 
                 applicantName,
186 
-                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
190 
+                c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status,(select version from
191 
+                case_application_log where case_appli_id=c.id order by version desc limit 1) as version,(select
192 
+                update_submit_status from case_application_log where case_appli_id=c.id order by version desc limit 1)
193 
+                as updateSubmitStatus
187 
                 from case_application c
 194 
                 from case_application c
188 
                 JOIN case_application_log l ON c.id = l.case_appli_id and c.version=l.version
 195 
                 JOIN case_application_log l ON c.id = l.case_appli_id and c.version=l.version
189 
                 JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1
 196 
                 JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id AND ca.identity_type = 1
214 
             <if test="deptIds != null and deptIds.size() > 0">
 221 
             <if test="deptIds != null and deptIds.size() > 0">
215
222
216 
                 <!--秘书主表案件-->
 223 
                 <!--秘书主表案件-->
224 
+                select tt.* from(
217 
                 SELECT
 225 
                 SELECT
218 
                 c.id,
 226 
                 c.id,
219 
                 '' AS caseLogId,
 227 
                 '' AS caseLogId,
296 
                 FROM
 304 
                 FROM
297 
                 case_application c
 305 
                 case_application c
298 
                 JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type = 1
 306 
                 JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type = 1
299 
-                JOIN case_application_log l on l.case_appli_id=c.id and l.update_submit_status not in(1, 2) and l.version
307 
+                JOIN case_application_log l on l.case_appli_id=c.id and l.update_submit_status not in(1, 2) and
308 
+                l.version
300 
                 = (
 309 
                 = (
301 
                 SELECT
 310 
                 SELECT
302 
                 max( version ) version
 311 
                 max( version ) version
303 
                 FROM
 312 
                 FROM
304 
                 case_application_log
 313 
                 case_application_log
305 
                 WHERE case_appli_id = c.id
 314 
                 WHERE case_appli_id = c.id
306 
-                 )
315 
+                )
307 
                 WHERE
 316 
                 WHERE
308 
-                ca.identity_type=1 and c.case_status in (1,5,11,14,15,16,17,31)
309 
-                <if test="caseStatusList != null and caseStatusList.size() > 0">
310 
-                    and c.case_status in
311 
-                    <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
312 
-                        #{caseStatus}
313 
-                    </foreach>
314 
-                </if>
317 
+                ca.identity_type=1
318 
+
319 
+                and c.case_status in (1,5,14,15,16,17,31)
320 
+
315 
                 <if test="deptIds != null and deptIds.size() > 0">
 321 
                 <if test="deptIds != null and deptIds.size() > 0">
316 
                     and ca.application_organ_id in
 322 
                     and ca.application_organ_id in
317 
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
 323 
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
318 
                         #{item}
 324 
                         #{item}
319 
                     </foreach>
 325 
                     </foreach>
320 
                 </if>
 326 
                 </if>
321 
-                <if test="caseStatus != null">
322 
-                    AND c.case_status = #{caseStatus}
323 
-                </if>
324 
                 <if test="lockStatus != null">
 327 
                 <if test="lockStatus != null">
325 
                     AND c.lock_status = #{lockStatus}
 328 
                     AND c.lock_status = #{lockStatus}
326 
                 </if>
 329 
                 </if>
330 
+
327 
                 <if test="caseNum != null and caseNum != ''">
 331 
                 <if test="caseNum != null and caseNum != ''">
328 
                     AND c.case_num = #{caseNum}
 332 
                     AND c.case_num = #{caseNum}
329 
                 </if>
 333 
                 </if>
330 
                 <if test="nameId != null and nameId != ''">
 334 
                 <if test="nameId != null and nameId != ''">
331 
                     AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
 335 
                     AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
332 
-                </if>
336 
+                </if>) tt
337 
+                            <where>
338 
+                                <if test="caseStatusList != null and caseStatusList.size() > 0">
339 
+                                    and tt.case_status in
340 
+                                    <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
341 
+                                        #{caseStatus}
342 
+                                    </foreach>
343 
+                                </if>
344 
+                                <if test="caseStatus != null">
345 
+                                    AND tt.case_status = #{caseStatus}
346 
+                                </if>
347 
+
348 
+                            </where>
333 
                 union
 349 
                 union
334 
                 <!--秘书审核案件-->
 350 
                 <!--秘书审核案件-->
335 
                 SELECT
 351 
                 SELECT
415 
                 JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id
 431 
                 JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id
416 
                 AND ca.identity_type = 1
 432 
                 AND ca.identity_type = 1
417 
                 WHERE
 433 
                 WHERE
418 
-                l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1
434 
+                l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1 and c.case_status >10
435 
+                <if test="caseStatusList != null and caseStatusList.size() > 0">
436 
+                    and c.case_status in
437 
+                    <foreach item="caseStatus" collection="caseStatusList" open="(" separator="," close=")">
438 
+                        #{caseStatus}
439 
+                    </foreach>
440 
+                </if>
419 
                 <if test="deptIds != null and deptIds.size() > 0">
 441 
                 <if test="deptIds != null and deptIds.size() > 0">
420 
                     and ca.application_organ_id in
 442 
                     and ca.application_organ_id in
421 
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
 443 
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
663 
             <!--仲裁员-->
 685 
             <!--仲裁员-->
664 
             <if test="userId != null and userId != ''">
 686 
             <if test="userId != null and userId != ''">
665 
                 or ( t.identity_type=1 and
 687 
                 or ( t.identity_type=1 and
666 
-                t.case_status in (7,8,9,12,13,17)
688 
+                t.case_status in (7,8,9,11,13,17)
667 
                 and
 689 
                 and
668 
                 instr (t.arbitrator_id,#{userId})>0)
 690 
                 instr (t.arbitrator_id,#{userId})>0)
669 
             </if>
 691 
             </if>
755 
                 WHERE case_appli_id = c.id
 777 
                 WHERE case_appli_id = c.id
756 
                )
 778 
                )
757 
                 WHERE
 779 
                 WHERE
758 
-                ca.identity_type=1 and c.case_status in (1,5,11,14,15,16,17,31)
780 
+                ca.identity_type=1 and c.case_status in (1,5,14,15,16,17,31)
759 
                 <if test="deptIds != null and deptIds.size() > 0">
 781 
                 <if test="deptIds != null and deptIds.size() > 0">
760 
                     and ca.application_organ_id in
 782 
                     and ca.application_organ_id in
761 
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
 783 
                     <foreach item="item" collection="deptIds" open="(" separator="," close=")">
774 
                 <if test="nameId != null and nameId != ''">
 796 
                 <if test="nameId != null and nameId != ''">
775 
                     AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
 797 
                     AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
776 
                 </if>
 798 
                 </if>
777 
-                union
778 
-                <!--秘书审核案件-->
779
799
780 
-                select l.case_appli_id id ,
781 
-                c.case_status,ca.application_organ_id,
782 
-                c.arbitrator_id,ca.identity_num , ca.identity_type
783 
-                FROM
784 
-                case_application c
785 
-                JOIN case_application_log l ON c.id = l.case_appli_id
786 
-                JOIN case_affiliate_log ca ON ca.case_appli_log_id = l.id
787 
-                AND ca.identity_type = 1
788 
-                WHERE
789 
-                l.update_submit_status IN ( 1, 2 ) and ca.identity_type=1
790 
-                <if test="deptIds != null and deptIds.size() > 0">
791 
-                    and ca.application_organ_id in
792 
-                    <foreach item="item" collection="deptIds" open="(" separator="," close=")">
793 
-                        #{item}
794 
-                    </foreach>
795 
-                </if>
796 
-                <if test="caseStatus != null">
797 
-                    AND c.case_status = #{caseStatus}
798 
-                </if>
799 
-                <if test="lockStatus != null">
800 
-                    AND c.lock_status = #{lockStatus}
801 
-                </if>
802 
-                <if test="caseNum != null and caseNum != ''">
803 
-                    AND c.case_num = #{caseNum}
804 
-                </if>
805 
-                <if test="nameId != null and nameId != ''">
806 
-                    AND ca.application_organ_id=#{nameId} AND ca.identity_type=1
807 
-                </if>
808 
-                AND l.version = (
809 
-                SELECT
810 
-                max( version ) version
811 
-                FROM
812 
-                case_application_log
813 
-                WHERE
814 
-                 c.id = case_appli_id)
815
800
816 
             </if>
 801 
             </if>
817 
         </trim>
 802 
         </trim>