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
69fa9237
Commit
69fa9237
authored
Nov 24, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
c3aa9798
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
7 deletions
+61
-7
RB_Customer_TaskDetails_Extend.cs
...odel/ViewModel/Customer/RB_Customer_TaskDetails_Extend.cs
+9
-2
RB_Customer_Task_Extend.cs
Edu.Model/ViewModel/Customer/RB_Customer_Task_Extend.cs
+33
-1
CustomerTaskModule.cs
Edu.Module.Customer/CustomerTaskModule.cs
+1
-1
B2BCustomerController.cs
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
+18
-3
No files found.
Edu.Model/ViewModel/Customer/RB_Customer_TaskDetails_Extend.cs
View file @
69fa9237
...
@@ -8,7 +8,7 @@ namespace Edu.Model.ViewModel.Customer
...
@@ -8,7 +8,7 @@ namespace Edu.Model.ViewModel.Customer
/// <summary>
/// <summary>
/// 同业客户任务详情扩展实体类
/// 同业客户任务详情扩展实体类
/// </summary>
/// </summary>
public
class
RB_Customer_TaskDetails_Extend
:
RB_Customer_TaskDetails
public
class
RB_Customer_TaskDetails_Extend
:
RB_Customer_TaskDetails
{
{
/// <summary>
/// <summary>
/// 任务编号【逗号分割】
/// 任务编号【逗号分割】
...
@@ -23,6 +23,13 @@ namespace Edu.Model.ViewModel.Customer
...
@@ -23,6 +23,13 @@ namespace Edu.Model.ViewModel.Customer
/// <summary>
/// <summary>
/// 目标值数组
/// 目标值数组
/// </summary>
/// </summary>
public
List
<
string
>
TargetIdList
{
get
;
set
;
}
public
List
<
int
>
TargetIdList
{
get
{
List
<
int
>
ids
=
Common
.
ConvertHelper
.
StringToList
(
this
.
TargetId
);
return
ids
;
}
}
}
}
}
}
Edu.Model/ViewModel/Customer/RB_Customer_Task_Extend.cs
View file @
69fa9237
...
@@ -13,7 +13,7 @@ namespace Edu.Model.ViewModel.Customer
...
@@ -13,7 +13,7 @@ namespace Edu.Model.ViewModel.Customer
/// <summary>
/// <summary>
/// 创建人
/// 创建人
/// </summary>
/// </summary>
public
string
CreateByName
{
get
;
set
;}
public
string
CreateByName
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 任务详情列表
/// 任务详情列表
...
@@ -34,5 +34,37 @@ namespace Edu.Model.ViewModel.Customer
...
@@ -34,5 +34,37 @@ namespace Edu.Model.ViewModel.Customer
/// 创建时间
/// 创建时间
/// </summary>
/// </summary>
public
string
CreateTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
CreateTime
);
}
}
public
string
CreateTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
CreateTime
);
}
}
/// <summary>
/// 任务图片数组
/// </summary>
public
List
<
string
>
TaskImageList
{
get
{
List
<
string
>
list
=
new
List
<
string
>();
if
(!
string
.
IsNullOrEmpty
(
this
.
TaskImage
))
{
list
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
List
<
string
>>(
this
.
TaskImage
);
}
return
list
;
}
}
/// <summary>
/// 奖品图片数组
/// </summary>
public
List
<
string
>
TaskKudoImgList
{
get
{
List
<
string
>
list
=
new
List
<
string
>();
if
(!
string
.
IsNullOrEmpty
(
this
.
TaskKudoImg
))
{
list
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
List
<
string
>>(
this
.
TaskKudoImg
);
}
return
list
;
}
}
}
}
}
}
Edu.Module.Customer/CustomerTaskModule.cs
View file @
69fa9237
...
@@ -71,7 +71,7 @@ namespace Edu.Module.Customer
...
@@ -71,7 +71,7 @@ namespace Edu.Module.Customer
{
nameof
(
RB_Customer_Task_Extend
.
TaskSubTitle
),
model
.
TaskSubTitle
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskSubTitle
),
model
.
TaskSubTitle
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskImage
),
model
.
TaskImage
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskImage
),
model
.
TaskImage
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskKudo
),
model
.
TaskKudo
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskKudo
),
model
.
TaskKudo
},
{
nameof
(
RB_Customer_Task_Extend
.
Task
Image
),
model
.
TaskImage
},
{
nameof
(
RB_Customer_Task_Extend
.
Task
KudoImg
),
model
.
TaskKudoImg
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskStartTime
),
model
.
TaskStartTime
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskStartTime
),
model
.
TaskStartTime
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskEndTime
),
model
.
TaskEndTime
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskEndTime
),
model
.
TaskEndTime
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskDesc
),
model
.
TaskDesc
},
{
nameof
(
RB_Customer_Task_Extend
.
TaskDesc
),
model
.
TaskDesc
},
...
...
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
View file @
69fa9237
...
@@ -196,13 +196,28 @@ namespace Edu.WebApi.Controllers.Customer
...
@@ -196,13 +196,28 @@ namespace Edu.WebApi.Controllers.Customer
Id
=
base
.
ParmJObj
.
GetInt
(
"Id"
),
Id
=
base
.
ParmJObj
.
GetInt
(
"Id"
),
TaskName
=
base
.
ParmJObj
.
GetStringValue
(
"TaskName"
),
TaskName
=
base
.
ParmJObj
.
GetStringValue
(
"TaskName"
),
TaskSubTitle
=
base
.
ParmJObj
.
GetStringValue
(
"TaskSubTitle"
),
TaskSubTitle
=
base
.
ParmJObj
.
GetStringValue
(
"TaskSubTitle"
),
TaskImage
=
base
.
ParmJObj
.
GetStringValue
(
"TaskImage"
),
TaskKudo
=
base
.
ParmJObj
.
GetStringValue
(
"TaskKudo"
),
TaskKudo
=
base
.
ParmJObj
.
GetStringValue
(
"TaskKudo"
),
TaskKudoImg
=
base
.
ParmJObj
.
GetStringValue
(
"TaskKudoImg"
),
TaskStartTime
=
base
.
ParmJObj
.
GetDateTime
(
"TaskStartTime"
),
TaskStartTime
=
base
.
ParmJObj
.
GetDateTime
(
"TaskStartTime"
),
TaskEndTime
=
base
.
ParmJObj
.
GetDateTime
(
"TaskEndTime"
),
TaskEndTime
=
base
.
ParmJObj
.
GetDateTime
(
"TaskEndTime"
),
TaskDesc
=
base
.
ParmJObj
.
GetStringValue
(
"TaskDesc"
),
TaskDesc
=
base
.
ParmJObj
.
GetStringValue
(
"TaskDesc"
),
};
};
string
taskImageList
=
base
.
ParmJObj
.
GetStringValue
(
"TaskImageList"
);
List
<
string
>
imgList
=
new
List
<
string
>();
if
(!
string
.
IsNullOrEmpty
(
taskImageList
))
{
imgList
=
JsonHelper
.
DeserializeObject
<
List
<
string
>>(
taskImageList
);
}
model
.
TaskImage
=
JsonHelper
.
Serialize
(
imgList
);
string
taskKudoImgList
=
base
.
ParmJObj
.
GetStringValue
(
"TaskKudoImgList"
);
List
<
string
>
KudoImgList
=
new
List
<
string
>();
if
(!
string
.
IsNullOrEmpty
(
taskKudoImgList
))
{
KudoImgList
=
JsonHelper
.
DeserializeObject
<
List
<
string
>>(
taskKudoImgList
);
}
model
.
TaskKudoImg
=
JsonHelper
.
Serialize
(
KudoImgList
);
model
.
Status
=
Common
.
Enum
.
DateStateEnum
.
Normal
;
model
.
Status
=
Common
.
Enum
.
DateStateEnum
.
Normal
;
model
.
CreateBy
=
base
.
UserInfo
.
Id
;
model
.
CreateBy
=
base
.
UserInfo
.
Id
;
model
.
CreateTime
=
DateTime
.
Now
;
model
.
CreateTime
=
DateTime
.
Now
;
...
@@ -231,7 +246,7 @@ namespace Edu.WebApi.Controllers.Customer
...
@@ -231,7 +246,7 @@ namespace Edu.WebApi.Controllers.Customer
TaskId
=
jobj
.
GetInt
(
"TaskId"
),
TaskId
=
jobj
.
GetInt
(
"TaskId"
),
TaskType
=
(
TaskTypeEnum
)
jobj
.
GetInt
(
"TaskType"
),
TaskType
=
(
TaskTypeEnum
)
jobj
.
GetInt
(
"TaskType"
),
TargetId
=
string
.
Join
(
","
,
targetIds
),
TargetId
=
string
.
Join
(
","
,
targetIds
),
TaskFinishType
=
jobj
.
GetInt
(
"Task
TypeEnum
"
),
TaskFinishType
=
jobj
.
GetInt
(
"Task
FinishType
"
),
TaskFinishValue
=
jobj
.
GetDecimal
(
"TaskFinishValue"
),
TaskFinishValue
=
jobj
.
GetDecimal
(
"TaskFinishValue"
),
});
});
}
}
...
...
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