@ -65,6 +65,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign ;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign ;
import com.yxt.anrui.portal.api.sysuser.SysUserVo ;
import com.yxt.anrui.portal.api.sysuser.UserQuery ;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery ;
import com.yxt.common.base.config.component.FileUploadComponent ;
import com.yxt.common.base.service.MybatisBaseService ;
@ -72,9 +73,7 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery ;
import com.yxt.common.core.result.ResultBean ;
import com.yxt.common.core.vo.PagerVo ;
import com.yxt.messagecenter.api.message.MessageFeign ;
import com.yxt.messagecenter.api.message.MessageFlowVo ;
import com.yxt.messagecenter.api.message.MessageFlowableQuery ;
import com.yxt.messagecenter.api.message.* ;
import org.apache.commons.lang3.StringUtils ;
import org.springframework.beans.factory.annotation.Autowired ;
import org.springframework.stereotype.Service ;
@ -681,6 +680,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
public ResultBean complete ( BusinessVariables bv ) {
ResultBean rb = ResultBean . fireFail ( ) ;
SysUserVo sysUserVo = sysUserFeign . fetchBySid ( bv . getUserSid ( ) ) . getData ( ) ;
BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid ( bv . getBusinessSid ( ) ) ;
Map < String , Object > variables = new HashMap < > ( ) ;
Map < String , Object > appMap = new HashMap < > ( ) ;
@ -709,6 +709,52 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
messageFlowableQuery . setMsgContent ( busAdvanceGinvoiceapply . getApplyName ( ) + "提交的" + messageFlowableQuery . getModuleName ( ) + ",请审批" ) ;
messageFlowableQuery . setMsgTitle ( "提前开票申请" ) ;
ResultBean < String > stringResultBean = messageFeign . pushMessage ( messageFlowableQuery ) ;
} else {
AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery ( ) ;
Map < String , Object > appMaps = new HashMap < > ( ) ;
appMaps . put ( "contractSid" , busAdvanceGinvoiceapply . getSid ( ) ) ;
List < String > recipientSidList = new ArrayList < > ( ) ;
// 风控中心总经理角色用户
UserRoleQuery userRoleQuery = new UserRoleQuery ( ) ;
userRoleQuery . setRoleSid ( "537bea8f-75e8-430c-9a5f-3140bda41f39" ) ;
List < SysUserVo > list1 = sysUserFeign . getOtherOrgRoleUser ( userRoleQuery ) . getData ( ) ;
for ( SysUserVo userVo : list1 ) {
recipientSidList . add ( userVo . getSid ( ) ) ;
}
// 分公司会计角色用户
UserQuery userQuery = new UserQuery ( ) ;
userQuery . setRoleSid ( "94e3e298-e934-42d2-af02-50e93eee583a" ) ;
userQuery . setOrgSidPath ( bv . getOrgSidPath ( ) ) ;
List < SysUserVo > list = sysUserFeign . getUserByRole ( userQuery ) . getData ( ) ;
for ( SysUserVo userVo : list ) {
recipientSidList . add ( userVo . getSid ( ) ) ;
}
//财务中心总经理角色用户
UserRoleQuery userRoleQuery3 = new UserRoleQuery ( ) ;
userRoleQuery3 . setRoleSid ( "b2bcdfd6-ac51-408c-9c7a-7e9818d23155" ) ;
List < SysUserVo > list3 = sysUserFeign . getOtherOrgRoleUser ( userRoleQuery3 ) . getData ( ) ;
for ( SysUserVo userVo : list3 ) {
recipientSidList . add ( userVo . getSid ( ) ) ;
}
//事业部运营经理角色用户
UserRoleQuery userRoleQuery2 = new UserRoleQuery ( ) ;
userRoleQuery2 . setRoleSid ( "f60b30b0-c7ad-4533-8367-b3ff95cbe725" ) ;
List < SysUserVo > list2 = sysUserFeign . getOtherOrgRoleUser ( userRoleQuery2 ) . getData ( ) ;
for ( SysUserVo userVo : list2 ) {
recipientSidList . add ( userVo . getSid ( ) ) ;
}
query . setRecipientSidList ( recipientSidList ) ;
query . setAppMap ( appMaps ) ;
query . setMsgTitle ( "业务" ) ;
query . setMsgContent ( sysUserVo . getName ( ) + "提交的提前开票申请,请查阅" ) ;
query . setMsgSource ( "业务" ) ;
query . setMsgTargetUri ( MsgTargetUriEnum . TQKPSQTS . getUri ( ) ) ;
query . setApp_type ( "2" ) ;
query . setModuleSid ( "e25e13b5-f2ed-421f-bdb3-6f2eca2a3028" ) ;
query . setName ( "业务" ) ;
// 消息推送
messageFeign . sendAutoserviceMessage ( query ) ;
}
return rb . success ( ) . setData ( resultBean . getData ( ) ) ;
} else {