Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java

@@ -283,8 +283,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
        boolean isMediatorRole=false;
         // 查询申请人和被申请人
         List<Long> caseIds = list.stream().map(MsCaseApplicationVO::getId).collect(Collectors.toList());
-        Integer mediatorSort = flowNameMap.get("待调解");
+        Integer signSort = flowNameMap.get("待签名");
         Integer sendSort = flowNameMap.get("待送达");
+        Integer mediatorSort = flowNameMap.get("待调解");
         List<MsCaseAffiliate> affiliateList = msCaseAffiliateMapper.selectUserRoleByCaseIds(caseIds);
         // 根据案件id分组
         Map<Long, List<MsCaseAffiliate>> affiliateMap=null;
@@ -378,11 +379,22 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
             }else {
                 vo.setSignButtonFlag(0);
             }
-            // 调解员，并且在待调节后，送达前，显示
-            if(mediatorSort!=null && sendSort!=null && isMediatorRole
-                    && null!=flowNameMap.get(vo.getCaseStatusName())
-                    && flowNameMap.get(vo.getCaseStatusName())>mediatorSort
-                    && flowNameMap.get(vo.getCaseStatusName())<=sendSort){
+            // 1需要用印
+            boolean sealFlag = vo.getSealFlag() == null || !vo.getSealFlag().equals(1);
+            // 调解书按钮，线下调解（待调解后，送达前）或者线上调解（调解员，法律顾问在不用印，签名后，送达前，）显示
+
+            boolean sendFlag=sendSort != null && null != flowNameMap.get(vo.getCaseStatusName()) && flowNameMap.get(vo.getCaseStatusName()) <= sendSort;
+            // 是否线上调解
+            boolean offlineMediatorFlag=vo.getMediationMethod()!=null && vo.getMediationMethod().equals("1");
+           // 线上调解调解书按钮
+            boolean onlineMediatorFileFlag = offlineMediatorFlag && sealFlag && signSort != null
+                    && flowNameMap.get(vo.getCaseStatusName()) > signSort
+                    && sendFlag;
+            // 线下调解调解书按钮
+            boolean offlineMediatorFileFlag=!offlineMediatorFlag && mediatorSort!=null &&   flowNameMap.get(vo.getCaseStatusName()) > mediatorSort
+                    && sendFlag;
+            // 调解员调解书按钮
+            if ( isMediatorRole && (onlineMediatorFileFlag || offlineMediatorFileFlag)) {
                 vo.setMediationFileFlag(1);
             }
             for (SysRole role : roles) {
@@ -394,10 +406,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
                     ){
                        vo.setOtherFlag(1);
                     }
-                    if(role.getRoleName().equals("法律顾问") && mediatorSort!=null && sendSort!=null
-                            && null!=flowNameMap.get(vo.getCaseStatusName())
-                            && flowNameMap.get(vo.getCaseStatusName())>mediatorSort
-                            && flowNameMap.get(vo.getCaseStatusName())<=sendSort){
+
+                    if(role.getRoleName().equals("法律顾问") && (onlineMediatorFileFlag || offlineMediatorFileFlag) ){
                         // 顾问可以上传下载调解书
                         vo.setMediationFileFlag(1);
                     }
@@ -2613,7 +2623,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
         }
         // 线上调解
         if (application.getMediationMethod().equals("1")) {
-            Integer mediaResult = application.getMediaResult();
+            Integer mediaResult = application.getMediaResult()==null ? req.getMediaResult():application.getMediaResult();
             if (mediaResult == null) {
                 return AjaxResult.error("请选择调解结果");
             }

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml

@@ -113,7 +113,7 @@
   <select id="list" resultType="com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO">
     select t.* from(
     SELECT
-    c.id,c.mediator_id mediatorId,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,0 AS pendingStatus,
+    c.id,c.seal_flag sealFlag,c.mediator_id mediatorId,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,0 AS pendingStatus,
     c.case_flow_id caseFlowId,c.batch_number batchNumber,c.case_num caseNum,
     u1.nick_name mediatorName,c.hear_date hearDate,c.case_status_name caseStatusName,c.create_time createTime,
     c.mediation_method mediationMethod,
@@ -123,7 +123,7 @@
     c.id
     union
     SELECT
-    c.id,c.mediator_id mediatorId,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,1 AS pendingStatus,
+    c.id,c.seal_flag sealFlag,c.mediator_id mediatorId,c.case_source caseSource,c.media_result mediaResult,c.room_id roomId,1 AS pendingStatus,
     c.case_flow_id caseFlowId,c.batch_number batchNumber,c.case_num caseNum,
     u1.nick_name mediatorName,c.hear_date hearDate,c.case_status_name caseStatusName,c.create_time createTime,
     c.mediation_method mediationMethod,