联调
This commit is contained in:
+27
-31
@@ -143,7 +143,17 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
|
||||
*/
|
||||
@Override
|
||||
public List<MsCaseApplicationVO> list(MsCaseApplicationReq req) {
|
||||
// admin查询所有案件
|
||||
if (StrUtil.equals(SecurityUtils.getUsername(), "admin")) {
|
||||
|
||||
if(req.getHearDateFlag()!=null){
|
||||
// todo 暂时写死
|
||||
req.setCaseFlowId(9);
|
||||
}
|
||||
startPage();
|
||||
|
||||
return msCaseApplicationMapper.list(req, null);
|
||||
}
|
||||
// 根据用户查询角色
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
// 根据id查询用户
|
||||
@@ -168,22 +178,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
|
||||
throw new ServiceException("该角色为绑定案件流程");
|
||||
}
|
||||
Map<String, MsCaseFlow> flowMap = caseFlows.stream().collect(Collectors.toMap(MsCaseFlow::getButtonAuthFlag, Function.identity()));
|
||||
// admin查询所有案件
|
||||
if (StrUtil.equals(SecurityUtils.getUsername(), "admin")) {
|
||||
MsCaseFlow caseFlow =null;
|
||||
if(req.getHearDateFlag()!=null){
|
||||
caseFlow = flowMap.get("caseManagement:list:mediate");
|
||||
}else {
|
||||
// 根据按钮权限标识符查询待选择调解员流程id
|
||||
caseFlow = flowMap.get("caseManagement:list:selectmediator");
|
||||
}
|
||||
if(caseFlow!=null) {
|
||||
req.setCaseFlowId(caseFlow.getId());
|
||||
}
|
||||
startPage();
|
||||
|
||||
return msCaseApplicationMapper.list(req, null);
|
||||
}
|
||||
List<String> caseStatusNames = caseFlows.stream().map(MsCaseFlow::getCaseStatusName).collect(Collectors.toList());
|
||||
for (SysRole role : roles) {
|
||||
if(StrUtil.isNotEmpty(role.getRoleName())&&StrUtil.equals(role.getRoleName(),"申请人")){
|
||||
if(sysUser.getDeptId()!=null) {
|
||||
@@ -194,25 +189,30 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
|
||||
|
||||
}
|
||||
if(StrUtil.isNotEmpty(role.getRoleName())&&StrUtil.equals(role.getRoleName(),"被申请人")){
|
||||
caseStatusNames=new ArrayList<>();
|
||||
// todo 被申请人案件根据被申请人身份证号查询案件列表
|
||||
req.setRespondentIdentityNum(sysUser.getIdCard());
|
||||
MsCaseFlow caseFlow =null;
|
||||
// 查询待调解流程id
|
||||
if(req.getHearDateFlag()!=null){
|
||||
caseFlow = flowMap.get("caseManagement:list:mediate");
|
||||
// todo 查询待调解流程id被申请人暂时写死
|
||||
if(req.getMiniProgressFlag()!=null) {
|
||||
if (req.getHearDateFlag() != null) {
|
||||
// caseFlow = flowMap.get("caseManagement:list:mediate");
|
||||
caseStatusNames.add("待调解");
|
||||
} else {
|
||||
// 待选择调解员
|
||||
caseStatusNames.add("待选择调解员");
|
||||
}
|
||||
}else {
|
||||
// 根据按钮权限标识符查询待选择调解员流程id
|
||||
caseFlow = flowMap.get("caseManagement:list:selectmediator");
|
||||
}
|
||||
if(caseFlow!=null) {
|
||||
req.setCaseFlowId(caseFlow.getId());
|
||||
// PC端
|
||||
caseStatusNames.add("待被申请人签收");
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
startPage();
|
||||
// 查询案件列表
|
||||
List<MsCaseApplicationVO> caseApplicationList = msCaseApplicationMapper.list(req, caseFlows.stream().map(MsCaseFlow::getCaseStatusName).collect(Collectors.toList()));
|
||||
List<MsCaseApplicationVO> caseApplicationList = msCaseApplicationMapper.list(req, caseStatusNames);
|
||||
return caseApplicationList;
|
||||
}
|
||||
|
||||
@@ -599,7 +599,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
|
||||
if(templateManage==null||StrUtil.isEmpty(templateManage.getTemOrigPath())){
|
||||
throw new ServiceException("未找到模板");
|
||||
}
|
||||
String templatePath = "/home/ruoyi/" + templateManage.getTemOrigPath();
|
||||
String templatePath = "/home/ruoyi" + templateManage.getTemOrigPath();
|
||||
templatePath=templatePath.replace("/profile","/uploadPath");
|
||||
|
||||
try {
|
||||
@@ -1057,12 +1057,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
|
||||
|
||||
// MsCaseApplication caseApplication = msCaseApplicationMapper.selectByPrimaryKey(id);
|
||||
// todo 返回申请人预约信息,预约信息查预约表
|
||||
Example example = new Example(MsCaseMediator.class);
|
||||
Example.Criteria criteria = example.createCriteria();
|
||||
criteria.andIsNull("type");
|
||||
criteria.andEqualTo("caseAppliId", id);
|
||||
// criteria.andEqualTo("mediatorId", SecurityUtils.getUserId());
|
||||
MsCaseMediator msCaseMediator = msCaseMediatorMapper.selectOneByExample(example);
|
||||
MsCaseMediator msCaseMediator = msCaseMediatorMapper.selectLastApplicant(id);
|
||||
if(msCaseMediator==null){
|
||||
return AjaxResult.success(result);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user