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