|
|
|
@ -49,6 +49,8 @@ import com.yxt.anrui.as.feign.message.MessageFeign; |
|
|
|
import com.yxt.anrui.as.feign.message.MessageFlowVo; |
|
|
|
import com.yxt.anrui.as.feign.message.MessageFlowableQuery; |
|
|
|
import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
@ -89,7 +91,7 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan |
|
|
|
@Autowired |
|
|
|
private FileUploadComponent fileUploadComponent; |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private SysUserFeign sysUserFeign; |
|
|
|
@Autowired |
|
|
|
@ -125,18 +127,18 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan |
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i4); |
|
|
|
qw.like("orgSidPath", orgSidPath); |
|
|
|
qw.like("s.orgSidPath", orgSidPath); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
qw.eq("createBySid", query.getUserSid()); |
|
|
|
qw.eq("aoa.createBySid", query.getUserSid()); |
|
|
|
} else { |
|
|
|
PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>(); |
|
|
|
return p; |
|
|
|
@ -147,32 +149,32 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())){ |
|
|
|
qw.like("useOrgName",query.getUseOrgName()); |
|
|
|
qw.like("aoa.useOrgName",query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateDeptName())){ |
|
|
|
qw.like("createDeptName",query.getCreateDeptName()); |
|
|
|
if (StringUtils.isNotBlank(query.getDeptName())){ |
|
|
|
qw.like("aoa.deptName",query.getDeptName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())){ |
|
|
|
qw.like("createByName",query.getCreateByName()); |
|
|
|
qw.like("aoa.createByName",query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())){ |
|
|
|
qw.like("billNo",query.getBillNo()); |
|
|
|
qw.like("aoa.billNo",query.getBillNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getHandleReasonKey())){ |
|
|
|
qw.like("handleReasonKey",query.getHandleReasonKey()); |
|
|
|
qw.like("aoa.handleReasonKey",query.getHandleReasonKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getHandleModeKey())){ |
|
|
|
qw.like("handleModeKey",query.getHandleModeKey()); |
|
|
|
qw.like("aoa.handleModeKey",query.getHandleModeKey()); |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String finishStartTime = query.getFinishStartTime(); |
|
|
|
String finishEndTime = query.getFinishEndTime(); |
|
|
|
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" |
|
|
|
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
IPage<AsOldparthandleApply> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<AsOldparthandleApplyVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
@ -274,7 +276,8 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan |
|
|
|
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
Map<String, Object> variables = new HashMap<>(); |
|
|
|
//用户的部门全路径sid
|
|
|
|
bv.setOrgSidPath(asOldparthandleApply.getOrgSidPath()); |
|
|
|
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); |
|
|
|
bv.setOrgSidPath(deptVo.getOrgSidPath()); |
|
|
|
//业务sid
|
|
|
|
bv.setBusinessSid(businessSid); |
|
|
|
//用户sid
|
|
|
|
@ -363,7 +366,9 @@ public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthan |
|
|
|
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); |
|
|
|
//=======================================
|
|
|
|
bv.setFormVariables(variables); |
|
|
|
bv.setOrgSidPath(asOldparthandleApply.getOrgSidPath()); |
|
|
|
//用户的部门全路径sid
|
|
|
|
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); |
|
|
|
bv.setOrgSidPath(deptVo.getOrgSidPath()); |
|
|
|
if (bv.getTaskId().equals(asOldparthandleApply.getTaskId())) { |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
|
God
11 months ago