Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
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
黄奎
Education
Commits
7d45527f
Commit
7d45527f
authored
Mar 11, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增字段
parent
0fd42327
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
2 deletions
+37
-2
RB_Course_Offer.cs
Edu.Model/Entity/Course/RB_Course_Offer.cs
+10
-0
RB_Course_OfferDetails.cs
Edu.Model/Entity/Course/RB_Course_OfferDetails.cs
+5
-0
CourseOfferModule.cs
Edu.Module.Course/CourseOfferModule.cs
+2
-0
RB_Course_OfferRepository.cs
Edu.Repository/Course/RB_Course_OfferRepository.cs
+10
-0
CourseOfferController.cs
Edu.WebApi/Controllers/Course/CourseOfferController.cs
+10
-2
No files found.
Edu.Model/Entity/Course/RB_Course_Offer.cs
View file @
7d45527f
...
@@ -106,5 +106,15 @@ namespace Edu.Model.Entity.Course
...
@@ -106,5 +106,15 @@ namespace Edu.Model.Entity.Course
/// 删除状态(1-删除)
/// 删除状态(1-删除)
/// </summary>
/// </summary>
public
DateStateEnum
Status
{
get
;
set
;
}
public
DateStateEnum
Status
{
get
;
set
;
}
/// <summary>
/// 客户名称
/// </summary>
public
string
CustomerName
{
get
;
set
;
}
/// <summary>
/// 客户电话
/// </summary>
public
string
CustomerTel
{
get
;
set
;
}
}
}
}
}
Edu.Model/Entity/Course/RB_Course_OfferDetails.cs
View file @
7d45527f
...
@@ -49,5 +49,10 @@ namespace Edu.Model.Entity.Course
...
@@ -49,5 +49,10 @@ namespace Edu.Model.Entity.Course
/// 备注
/// 备注
/// </summary>
/// </summary>
public
string
Remark
{
get
;
set
;
}
public
string
Remark
{
get
;
set
;
}
/// <summary>
/// 报名人数
/// </summary>
public
int
JoinNum
{
get
;
set
;
}
}
}
}
}
Edu.Module.Course/CourseOfferModule.cs
View file @
7d45527f
...
@@ -94,6 +94,8 @@ namespace Edu.Module.Course
...
@@ -94,6 +94,8 @@ namespace Edu.Module.Course
{
nameof
(
RB_Course_Offer_ViewModel
.
CustomerInfo
),
model
.
CustomerInfo
},
{
nameof
(
RB_Course_Offer_ViewModel
.
CustomerInfo
),
model
.
CustomerInfo
},
{
nameof
(
RB_Course_Offer_ViewModel
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_Course_Offer_ViewModel
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_Course_Offer_ViewModel
.
UpdateTime
),
model
.
UpdateTime
},
{
nameof
(
RB_Course_Offer_ViewModel
.
UpdateTime
),
model
.
UpdateTime
},
{
nameof
(
RB_Course_Offer_ViewModel
.
CustomerName
),
model
.
CustomerName
},
{
nameof
(
RB_Course_Offer_ViewModel
.
CustomerTel
),
model
.
CustomerTel
},
};
};
flag
=
course_OfferRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Course_Offer_ViewModel
.
Id
),
model
.
Id
));
flag
=
course_OfferRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Course_Offer_ViewModel
.
Id
),
model
.
Id
));
}
}
...
...
Edu.Repository/Course/RB_Course_OfferRepository.cs
View file @
7d45527f
...
@@ -90,6 +90,16 @@ WHERE 1=1
...
@@ -90,6 +90,16 @@ WHERE 1=1
builder
.
AppendFormat
(
" AND A.{0} LIKE @SerialNum "
,
nameof
(
RB_Course_Offer_ViewModel
.
SerialNum
));
builder
.
AppendFormat
(
" AND A.{0} LIKE @SerialNum "
,
nameof
(
RB_Course_Offer_ViewModel
.
SerialNum
));
parameters
.
Add
(
"SerialNum"
,
"%"
+
query
.
SerialNum
.
Trim
()
+
"%"
);
parameters
.
Add
(
"SerialNum"
,
"%"
+
query
.
SerialNum
.
Trim
()
+
"%"
);
}
}
if
(!
string
.
IsNullOrEmpty
(
query
.
CustomerName
))
{
builder
.
AppendFormat
(
" AND A.{0} LIKE @CustomerName "
,
nameof
(
RB_Course_Offer_ViewModel
.
CustomerName
));
parameters
.
Add
(
"CustomerName"
,
"%"
+
query
.
CustomerName
.
Trim
()
+
"%"
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
CustomerTel
))
{
builder
.
AppendFormat
(
" AND A.{0} LIKE @CustomerTel "
,
nameof
(
RB_Course_Offer_ViewModel
.
CustomerTel
));
parameters
.
Add
(
"CustomerTel"
,
"%"
+
query
.
CustomerTel
.
Trim
()
+
"%"
);
}
}
}
builder
.
AppendFormat
(
" ORDER BY A.{0} DESC "
,
nameof
(
RB_Course_Offer_ViewModel
.
Id
));
builder
.
AppendFormat
(
" ORDER BY A.{0} DESC "
,
nameof
(
RB_Course_Offer_ViewModel
.
Id
));
return
GetPage
<
RB_Course_Offer_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
return
GetPage
<
RB_Course_Offer_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
...
...
Edu.WebApi/Controllers/Course/CourseOfferController.cs
View file @
7d45527f
...
@@ -47,7 +47,9 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -47,7 +47,9 @@ namespace Edu.WebApi.Controllers.Course
CustomerType
=
(
CustomerTypeEnum
)
base
.
ParmJObj
.
GetInt
(
"CustomerType"
),
CustomerType
=
(
CustomerTypeEnum
)
base
.
ParmJObj
.
GetInt
(
"CustomerType"
),
CustomerStatus
=
(
CustomerStatusEnum
)
base
.
ParmJObj
.
GetInt
(
"CustomerStatus"
),
CustomerStatus
=
(
CustomerStatusEnum
)
base
.
ParmJObj
.
GetInt
(
"CustomerStatus"
),
SerialNum
=
base
.
ParmJObj
.
GetStringValue
(
"SerialNum"
),
SerialNum
=
base
.
ParmJObj
.
GetStringValue
(
"SerialNum"
),
IsGetDetails
=
base
.
ParmJObj
.
GetInt
(
"IsGetDetails"
)
IsGetDetails
=
base
.
ParmJObj
.
GetInt
(
"IsGetDetails"
),
CustomerName
=
base
.
ParmJObj
.
GetStringValue
(
"CustomerName"
),
CustomerTel
=
base
.
ParmJObj
.
GetStringValue
(
"CustomerTel"
)
};
};
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
query
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
query
.
School_Id
=
base
.
UserInfo
.
School_Id
;
query
.
School_Id
=
base
.
UserInfo
.
School_Id
;
...
@@ -87,7 +89,9 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -87,7 +89,9 @@ namespace Edu.WebApi.Controllers.Course
qitem
.
UpdateBy
,
qitem
.
UpdateBy
,
qitem
.
UpdateByName
,
qitem
.
UpdateByName
,
qitem
.
UpdateTimeStr
,
qitem
.
UpdateTimeStr
,
qitem
.
OfferDetails
qitem
.
OfferDetails
,
qitem
.
CustomerName
,
qitem
.
CustomerTel
,
});
});
return
ApiResult
.
Success
(
data
:
pageModel
);
return
ApiResult
.
Success
(
data
:
pageModel
);
}
}
...
@@ -128,6 +132,8 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -128,6 +132,8 @@ namespace Edu.WebApi.Controllers.Course
TotalPrice
=
base
.
ParmJObj
.
GetDecimal
(
"TotalPrice"
),
TotalPrice
=
base
.
ParmJObj
.
GetDecimal
(
"TotalPrice"
),
TotalDiscountPrice
=
base
.
ParmJObj
.
GetDecimal
(
"TotalDiscountPrice"
),
TotalDiscountPrice
=
base
.
ParmJObj
.
GetDecimal
(
"TotalDiscountPrice"
),
CustomerInfo
=
base
.
ParmJObj
.
GetStringValue
(
"CustomerInfo"
),
CustomerInfo
=
base
.
ParmJObj
.
GetStringValue
(
"CustomerInfo"
),
CustomerName
=
base
.
ParmJObj
.
GetStringValue
(
"CustomerName"
),
CustomerTel
=
base
.
ParmJObj
.
GetStringValue
(
"CustomerTel"
)
};
};
try
try
{
{
...
@@ -172,6 +178,8 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -172,6 +178,8 @@ namespace Edu.WebApi.Controllers.Course
extModel
?.
CustomerInfo
,
extModel
?.
CustomerInfo
,
extModel
?.
CustomerStatus
,
extModel
?.
CustomerStatus
,
extModel
?.
CreateBy
,
extModel
?.
CreateBy
,
extModel
?.
CustomerTel
,
extModel
?.
CustomerName
,
CreateByName
=
extModel
.
CreateBy
>
0
?
UserReidsCache
.
GetUserLoginInfo
(
extModel
.
CreateBy
)?.
AccountName
??
""
:
""
,
CreateByName
=
extModel
.
CreateBy
>
0
?
UserReidsCache
.
GetUserLoginInfo
(
extModel
.
CreateBy
)?.
AccountName
??
""
:
""
,
extModel
?.
SerialNum
,
extModel
?.
SerialNum
,
OfferDetails
=
extModel
?.
OfferDetails
??
new
List
<
RB_Course_OfferDetails_ViewModel
>()
OfferDetails
=
extModel
?.
OfferDetails
??
new
List
<
RB_Course_OfferDetails_ViewModel
>()
...
...
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