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

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

@@ -235,7 +235,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
         if (CollectionUtil.isNotEmpty(list)) {
         // 判断调解员签名按钮权限，0-显示，1-不显示
             for (MsCaseApplicationVO vo : list) {
-                if (isMediatorRole && vo.getMediaResult()!=null && vo.getMediaResult()==5) {
+                // 如果是调解员并且是和解协议并且是代签名状态，不显示
+                if (isMediatorRole && vo.getMediaResult()!=null && vo.getMediaResult()==5 && vo.getCaseStatusName().equals("待签名")) {
                     // 是调解员并且是和解协议，不显示
                     vo.setSignButtonFlag(1);
 
@@ -2965,6 +2966,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
      * @param req
      * @return
      */
+    @Transactional
     @Override
     public AjaxResult confirmMeetingResult(MsCaseApplicationReq req) {
         // 查询案件是否存在
@@ -2989,6 +2991,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
 
         }
         AjaxResult result = caseApplicationService.generateApplication(req);
+        // 修改案件结果
+        application.setMediaResult(req.getMediaResult());
+        msCaseApplicationMapper.updateByPrimaryKeySelective(application);
         return AjaxResult.success();
     }