Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PropertyEdu
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liudong1993
PropertyEdu
Commits
3a7e30ec
Commit
3a7e30ec
authored
May 10, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消息推送
parent
6fd4c9ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
5 deletions
+36
-5
PropertyModule.cs
Property.Modele.FixedAssets/PropertyModule.cs
+24
-3
WorkFlowModule.cs
Property.Modele.FixedAssets/WorkFlowModule.cs
+12
-2
No files found.
Property.Modele.FixedAssets/PropertyModule.cs
View file @
3a7e30ec
...
...
@@ -2115,6 +2115,16 @@ namespace Property.Module.FixedAssets
public
void
PushAuditMessage
(
List
<
EmAccoutIdModel
>
account
,
int
workFlowId
,
string
content
,
string
title
,
int
?
empId
,
Common
.
Models
.
PushMessageCategoryEnum
type
)
{
List
<
Common
.
Message
.
PushMessageModel
>
SendList
=
new
List
<
Common
.
Message
.
PushMessageModel
>();
string
JumpUrl
=
""
;
switch
(
type
)
{
case
Common
.
Models
.
PushMessageCategoryEnum
.
Property
:
JumpUrl
=
$"/AssetsShenpi?Id=
{
workFlowId
}
&compType=shenpi"
;
break
;
case
Common
.
Models
.
PushMessageCategoryEnum
.
BuyingRequisition
:
JumpUrl
=
$"/RequisitionShenpi?Id=
{
workFlowId
}
&compType=shenpi"
;
break
;
case
Common
.
Models
.
PushMessageCategoryEnum
.
PurchaseRequisition
:
JumpUrl
=
"/PurchaseRequisitionExamine?showTable=4"
;
break
;
}
foreach
(
var
item
in
account
)
{
Common
.
Message
.
PushMessageModel
model
=
new
Common
.
Message
.
PushMessageModel
()
...
...
@@ -2123,7 +2133,7 @@ namespace Property.Module.FixedAssets
Content
=
content
,
CoverImg
=
""
,
CreateByName
=
item
.
EmAccount
,
JumpUrl
=
$""
,
JumpUrl
=
JumpUrl
,
SendTime
=
DateTime
.
Now
,
SendType
=
0
,
Title
=
title
,
...
...
@@ -4071,6 +4081,16 @@ namespace Property.Module.FixedAssets
public
void
PushBuyingMessage
(
List
<
EmAccoutIdModel
>
account
,
int
workFlowId
,
string
content
,
string
title
,
int
?
empId
,
Common
.
Models
.
PushMessageCategoryEnum
type
)
{
List
<
Common
.
Message
.
PushMessageModel
>
SendList
=
new
List
<
Common
.
Message
.
PushMessageModel
>();
string
JumpUrl
=
""
;
switch
(
type
)
{
case
Common
.
Models
.
PushMessageCategoryEnum
.
Property
:
JumpUrl
=
$"/AssetsShenpi?Id=
{
workFlowId
}
&compType=shenpi"
;
break
;
case
Common
.
Models
.
PushMessageCategoryEnum
.
BuyingRequisition
:
JumpUrl
=
$"/RequisitionShenpi?Id=
{
workFlowId
}
&compType=shenpi"
;
break
;
case
Common
.
Models
.
PushMessageCategoryEnum
.
PurchaseRequisition
:
JumpUrl
=
"/PurchaseRequisitionExamine?showTable=4"
;
break
;
}
foreach
(
var
item
in
account
)
{
Common
.
Message
.
PushMessageModel
model
=
new
Common
.
Message
.
PushMessageModel
()
...
...
@@ -4079,7 +4099,7 @@ namespace Property.Module.FixedAssets
Content
=
content
,
CoverImg
=
""
,
CreateByName
=
item
.
EmAccount
,
JumpUrl
=
$""
,
JumpUrl
=
JumpUrl
,
SendTime
=
DateTime
.
Now
,
SendType
=
0
,
Title
=
title
,
...
...
@@ -4357,7 +4377,7 @@ namespace Property.Module.FixedAssets
});
}
//发送通知 经办人有变更(让其快速处理采购)
PushBuyingMessage
(
account
,
0
,
"您有请购单待采购,请往资产管理系统查看"
,
"请购单通知"
,
userInfo
.
EmployeeId
,
Common
.
Models
.
PushMessageCategoryEnum
.
Buying
Requisition
);
PushBuyingMessage
(
account
,
0
,
"您有请购单待采购,请往资产管理系统查看"
,
"请购单通知"
,
userInfo
.
EmployeeId
,
Common
.
Models
.
PushMessageCategoryEnum
.
Purchase
Requisition
);
}
}
return
flag
;
...
...
@@ -4447,6 +4467,7 @@ namespace Property.Module.FixedAssets
}
model
.
DetailList
=
dlist
;
model
.
SchoolName
=
schoolRepository
.
GetEntity
(
model
.
SchoolId
)?.
SName
??
""
;
model
.
CreateByName
=
employeeRepository
.
GetEmployeeInfo
(
model
.
CreateBy
)?.
EmployeeName
??
""
;
}
return
model
;
}
...
...
Property.Modele.FixedAssets/WorkFlowModule.cs
View file @
3a7e30ec
...
...
@@ -2404,6 +2404,15 @@ namespace Property.Module.FixedAssets
public
void
PushAuditMessage
(
List
<
EmAccoutIdModel
>
account
,
int
workFlowId
,
string
content
,
string
title
,
int
?
empId
,
Common
.
Models
.
PushMessageCategoryEnum
type
)
{
List
<
Common
.
Message
.
PushMessageModel
>
SendList
=
new
List
<
Common
.
Message
.
PushMessageModel
>();
string
JumpUrl
=
""
;
switch
(
type
)
{
case
Common
.
Models
.
PushMessageCategoryEnum
.
Property
:
JumpUrl
=
$"/AssetsShenpi?Id=
{
workFlowId
}
&compType=shenpi"
;
break
;
case
Common
.
Models
.
PushMessageCategoryEnum
.
BuyingRequisition
:
JumpUrl
=
$"/RequisitionShenpi?Id=
{
workFlowId
}
&compType=shenpi"
;
break
;
case
Common
.
Models
.
PushMessageCategoryEnum
.
PurchaseRequisition
:
JumpUrl
=
"/PurchaseRequisitionExamine?showTable=4"
;
break
;
}
foreach
(
var
item
in
account
)
{
Common
.
Message
.
PushMessageModel
model
=
new
Common
.
Message
.
PushMessageModel
()
{
...
...
@@ -2411,7 +2420,7 @@ namespace Property.Module.FixedAssets
Content
=
content
,
CoverImg
=
""
,
CreateByName
=
item
.
EmAccount
,
JumpUrl
=
$""
,
JumpUrl
=
JumpUrl
,
SendTime
=
DateTime
.
Now
,
SendType
=
0
,
Title
=
title
,
...
...
@@ -4219,7 +4228,8 @@ namespace Property.Module.FixedAssets
//抄送人通知
PushAuditMessage
(
CopyAccountList
,
WorkFlowId
,
$@"有审核完成的请购单抄送通知!"
,
"请购抄送通知"
,
empId
,
Common
.
Models
.
PushMessageCategoryEnum
.
BuyingRequisition
);
//给经办人推送
PushAuditMessage
(
EmNameList
,
WorkFlowId
,
$@"您有待采购的请购单!"
,
"请购单采购"
,
empId
,
Common
.
Models
.
PushMessageCategoryEnum
.
PurchaseRequisition
);
List
<
EmAccoutIdModel
>
OperatorList
=
new
List
<
EmAccoutIdModel
>()
{
new
EmAccoutIdModel
{
EmAccount
=
userInfo
.
emName
,
EmployeeId
=
usemodel
.
ManagersId
}
};
PushAuditMessage
(
OperatorList
,
WorkFlowId
,
$@"您有待采购的请购单!"
,
"请购单采购"
,
empId
,
Common
.
Models
.
PushMessageCategoryEnum
.
PurchaseRequisition
);
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment