Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
Project
Project
Details
Activity
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
licc
volunteer_service
Commits
17991b8b
Commit
17991b8b
authored
Jan 15, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
志愿表新增两个字段
parent
147bf1eb
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
34 deletions
+36
-34
VolunteerMapper.xml
...ergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
+11
-4
Volunteer.java
...model/src/main/java/cn/wisenergy/model/app/Volunteer.java
+19
-22
BannerDto.java
...model/src/main/java/cn/wisenergy/model/dto/BannerDto.java
+3
-0
BannerServiceImpl.java
...java/cn/wisenergy/service/app/impl/BannerServiceImpl.java
+1
-8
RefillCardServiceImpl.java
.../cn/wisenergy/service/app/impl/RefillCardServiceImpl.java
+2
-0
No files found.
wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
View file @
17991b8b
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
<mapper
namespace=
"cn.wisenergy.mapper.VolunteerMapper"
>
<mapper
namespace=
"cn.wisenergy.mapper.VolunteerMapper"
>
<resultMap
id=
"userMap"
type=
"cn.wisenergy.model.app.Volunteer"
>
<resultMap
id=
"userMap"
type=
"cn.wisenergy.model.app.Volunteer"
>
<id
column=
"id"
property=
"id"
/>
<id
column=
"id"
property=
"id"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"major_name"
property=
"majorName"
/>
<result
column=
"major_name"
property=
"majorName"
/>
<result
column=
"academy"
property=
"academy"
/>
<result
column=
"academy"
property=
"academy"
/>
<result
column=
"course_demand"
property=
"courseDemand"
/>
<result
column=
"course_demand"
property=
"courseDemand"
/>
...
@@ -14,6 +15,7 @@
...
@@ -14,6 +15,7 @@
<result
column=
"launch_num"
property=
"launchNum"
/>
<result
column=
"launch_num"
property=
"launchNum"
/>
<result
column=
"lowest_mark"
property=
"lowestMark"
/>
<result
column=
"lowest_mark"
property=
"lowestMark"
/>
<result
column=
"lowest_rank"
property=
"lowestRank"
/>
<result
column=
"lowest_rank"
property=
"lowestRank"
/>
<result
column=
"is_delete"
property=
"isDelete"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
<result
column=
"update_time"
property=
"updateTime"
/>
</resultMap>
</resultMap>
...
@@ -28,16 +30,18 @@
...
@@ -28,16 +30,18 @@
</sql>
</sql>
<sql
id=
"cols_exclude_id"
>
<sql
id=
"cols_exclude_id"
>
major_name,academy, course_demand,nature,year_limit,plan_num, castArchives_num,launch_num,lowest_mark,
type,
major_name,academy, course_demand,nature,year_limit,plan_num, castArchives_num,launch_num,lowest_mark,
lowest_rank,create_time,update_time
lowest_rank,
is_delete,
create_time,update_time
</sql>
</sql>
<sql
id=
"vals"
>
<sql
id=
"vals"
>
#{majorName},#{academy},#{courseDemand},#{nature},#{yearLimit},#{planNum},#{castArchivesNum}, #{launchNum},
#{type},#{majorName},#{academy},#{courseDemand},#{nature},#{yearLimit},#{planNum},#{castArchivesNum},
#{lowestMark}, #{lowestRank},now(),now()
#{launchNum},
#{lowestMark}, #{lowestRank},#{isDelete},now(),now()
</sql>
</sql>
<sql
id=
"updateCondition"
>
<sql
id=
"updateCondition"
>
<if
test=
"type != null"
>
type = #{type},
</if>
<if
test=
"majorName != null"
>
major_name = #{majorName},
</if>
<if
test=
"majorName != null"
>
major_name = #{majorName},
</if>
<if
test=
"academy != null"
>
academy =#{academy},
</if>
<if
test=
"academy != null"
>
academy =#{academy},
</if>
<if
test=
"courseDemand != null"
>
course_demand =#{courseDemand},
</if>
<if
test=
"courseDemand != null"
>
course_demand =#{courseDemand},
</if>
...
@@ -48,11 +52,13 @@
...
@@ -48,11 +52,13 @@
<if
test=
"launchNum != null"
>
launch_num = #{launchNum},
</if>
<if
test=
"launchNum != null"
>
launch_num = #{launchNum},
</if>
<if
test=
"lowestMark != null"
>
lowest_mark = #{lowestMark},
</if>
<if
test=
"lowestMark != null"
>
lowest_mark = #{lowestMark},
</if>
<if
test=
"lowestRank != null"
>
lowestMark = #{lowestRank},
</if>
<if
test=
"lowestRank != null"
>
lowestMark = #{lowestRank},
</if>
<if
test=
"isDelete != null"
>
is_delete = #{isDelete},
</if>
update_time =now()
update_time =now()
</sql>
</sql>
<sql
id=
"criteria"
>
<sql
id=
"criteria"
>
<if
test=
"id != null"
>
id = #{id}
</if>
<if
test=
"id != null"
>
id = #{id}
</if>
<if
test=
"type != null"
>
and type = #{type}
</if>
<if
test=
"majorName != null"
>
and major_name = #{majorName}
</if>
<if
test=
"majorName != null"
>
and major_name = #{majorName}
</if>
<if
test=
"academy != null"
>
and academy =#{academy}
</if>
<if
test=
"academy != null"
>
and academy =#{academy}
</if>
<if
test=
"courseDemand != null"
>
and course_demand =#{courseDemand}
</if>
<if
test=
"courseDemand != null"
>
and course_demand =#{courseDemand}
</if>
...
@@ -63,6 +69,7 @@
...
@@ -63,6 +69,7 @@
<if
test=
"launchNum != null"
>
and launch_num = #{launchNum}
</if>
<if
test=
"launchNum != null"
>
and launch_num = #{launchNum}
</if>
<if
test=
"lowestMark != null"
>
and lowest_mark = #{lowestMark}
</if>
<if
test=
"lowestMark != null"
>
and lowest_mark = #{lowestMark}
</if>
<if
test=
"lowestRank != null"
>
and lowestMark = #{lowestRank}
</if>
<if
test=
"lowestRank != null"
>
and lowestMark = #{lowestRank}
</if>
<if
test=
"isDelete != null"
>
and is_delete = #{isDelete}
</if>
<if
test=
"createTime != null"
>
and create_time
>
= #{createTime}
</if>
<if
test=
"createTime != null"
>
and create_time
>
= #{createTime}
</if>
<if
test=
"updateTime != null"
>
and #{updateTime}
>
= update_time
</if>
<if
test=
"updateTime != null"
>
and #{updateTime}
>
= update_time
</if>
</sql>
</sql>
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java
View file @
17991b8b
package
cn
.
wisenergy
.
model
.
app
;
package
cn
.
wisenergy
.
model
.
app
;
import
cn.wisenergy.model.common.BaseEntity
;
import
com.alibaba.excel.annotation.ExcelIgnoreUnannotated
;
import
com.alibaba.excel.annotation.ExcelIgnoreUnannotated
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
...
@@ -23,7 +24,7 @@ import java.util.Date;
...
@@ -23,7 +24,7 @@ import java.util.Date;
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
@ExcelIgnoreUnannotated
@ExcelIgnoreUnannotated
public
class
Volunteer
implements
Serializable
{
public
class
Volunteer
extends
BaseEntity
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7880251929353475087L
;
private
static
final
long
serialVersionUID
=
-
7880251929353475087L
;
/**
/**
...
@@ -32,85 +33,81 @@ public class Volunteer implements Serializable {
...
@@ -32,85 +33,81 @@ public class Volunteer implements Serializable {
@ApiModelProperty
(
value
=
"志愿主键id"
,
name
=
"id"
)
@ApiModelProperty
(
value
=
"志愿主键id"
,
name
=
"id"
)
private
Integer
id
;
private
Integer
id
;
/**
* 方案类型:1:本科文化一批 2:本科美术一批 3:艺术本科批文学编导 4:本科体育 5:专科专业分类6:专科美术一批 7:专科文学编导一批 8:专科体育一批
*/
@ApiModelProperty
(
value
=
"方案类型:1:本科文化一批 2:本科美术一批 3:艺术本科批文学编导 4:本科体育 "
+
"5:专科专业分类6:专科美术一批 7:专科文学编导一批 8:专科体育一批"
,
name
=
"type"
)
private
Integer
type
;
/**
/**
* 专业名称
* 专业名称
*/
*/
@ApiModelProperty
(
value
=
"专业名称"
,
name
=
"majorName"
)
@ApiModelProperty
(
value
=
"专业名称"
,
name
=
"majorName"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
专业名称
"
)
private
String
majorName
;
private
String
majorName
;
/**
/**
* 院校
* 院校
*/
*/
@ApiModelProperty
(
value
=
"院校"
,
name
=
"academy"
)
@ApiModelProperty
(
value
=
"院校"
,
name
=
"academy"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
院校
"
)
private
String
academy
;
private
String
academy
;
/**
/**
* 选考科目要求
* 选考科目要求
*/
*/
@ApiModelProperty
(
value
=
"选考科目要求"
,
name
=
"courseDemand"
)
@ApiModelProperty
(
value
=
"选考科目要求"
,
name
=
"courseDemand"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
选考科目要求
"
)
private
String
courseDemand
;
private
String
courseDemand
;
/**
/**
* 学校性质
* 学校性质
*/
*/
@ApiModelProperty
(
value
=
"学校性质"
,
name
=
"nature"
)
@ApiModelProperty
(
value
=
"学校性质"
,
name
=
"nature"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
学校性质
"
)
private
String
nature
;
private
String
nature
;
/**
/**
* 学年制(年)
* 学年制(年)
*/
*/
@ApiModelProperty
(
value
=
"学年制(年)"
,
name
=
"yearLimit"
)
@ApiModelProperty
(
value
=
"学年制(年)"
,
name
=
"yearLimit"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
学年制(年)
"
)
private
Integer
yearLimit
;
private
Integer
yearLimit
;
/**
/**
* 计划数
* 计划数
*/
*/
@ApiModelProperty
(
value
=
"计划数"
,
name
=
"planNum"
)
@ApiModelProperty
(
value
=
"计划数"
,
name
=
"planNum"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
计划数
"
)
private
Integer
planNum
;
private
Integer
planNum
;
/**
/**
* 计划投档数
* 计划投档数
*/
*/
@ApiModelProperty
(
value
=
"计划投档数"
,
name
=
"castArchivesNum"
)
@ApiModelProperty
(
value
=
"计划投档数"
,
name
=
"castArchivesNum"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
计划投档数
"
)
private
Integer
castArchivesNum
;
private
Integer
castArchivesNum
;
/**
/**
* 投出数
* 投出数
*/
*/
@ApiModelProperty
(
value
=
"投出数"
,
name
=
"launchNum"
)
@ApiModelProperty
(
value
=
"投出数"
,
name
=
"launchNum"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
投出数
"
)
private
Integer
launchNum
;
private
Integer
launchNum
;
/**
/**
* 最低分
* 最低分
*/
*/
@ApiModelProperty
(
value
=
"最低分"
,
name
=
"lowestMark"
)
@ApiModelProperty
(
value
=
"最低分"
,
name
=
"lowestMark"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
最低分
"
)
private
String
lowestMark
;
private
String
lowestMark
;
/**
/**
* 最低位次
* 最低位次
*/
*/
@ApiModelProperty
(
value
=
"最低位次"
,
name
=
"lowestRank"
)
@ApiModelProperty
(
value
=
"最低位次"
,
name
=
"lowestRank"
)
@ExcelProperty
(
value
=
"
姓名
"
)
@ExcelProperty
(
value
=
"
最低位次
"
)
private
String
lowestRank
;
private
String
lowestRank
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
,
name
=
"createTime"
)
private
Date
createTime
;
/**
* 更新时间
*/
@ApiModelProperty
(
value
=
"更新时间"
,
name
=
"updateTime"
)
private
Date
updateTime
;
}
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/BannerDto.java
View file @
17991b8b
...
@@ -6,6 +6,9 @@ import lombok.Data;
...
@@ -6,6 +6,9 @@ import lombok.Data;
import
java.util.Date
;
import
java.util.Date
;
/**
* @author 86187
*/
@Data
@Data
@ApiModel
(
value
=
"BannerDto"
)
@ApiModel
(
value
=
"BannerDto"
)
public
class
BannerDto
{
public
class
BannerDto
{
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BannerServiceImpl.java
View file @
17991b8b
...
@@ -77,7 +77,6 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
...
@@ -77,7 +77,6 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
return
R
.
error
(
"传入参数无效"
);
return
R
.
error
(
"传入参数无效"
);
}
}
Banner
banner
=
bannerMapper
.
getById
(
id
);
Banner
banner
=
bannerMapper
.
getById
(
id
);
if
(
null
==
banner
)
{
if
(
null
==
banner
)
{
return
R
.
error
(
"数据获取失败"
);
return
R
.
error
(
"数据获取失败"
);
}
}
...
@@ -127,13 +126,7 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
...
@@ -127,13 +126,7 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
public
R
<
Boolean
>
putIn
(
Integer
id
,
Integer
status
)
{
public
R
<
Boolean
>
putIn
(
Integer
id
,
Integer
status
)
{
log
.
info
(
"BannerServiceImpl[].putIn[].input.param,status:{},id"
+
status
,
id
);
log
.
info
(
"BannerServiceImpl[].putIn[].input.param,status:{},id"
+
status
,
id
);
//判断数据是否正确
//判断数据是否正确
if
(
null
==
id
)
{
if
(
null
==
id
||
status
==
null
)
{
return
R
.
error
(
"缺少重要数据"
);
}
if
(
status
==
null
)
{
return
R
.
error
(
"缺少重要数据"
);
}
if
(
status
<
0
||
status
>
1
)
{
return
R
.
error
(
"缺少重要数据"
);
return
R
.
error
(
"缺少重要数据"
);
}
}
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java
View file @
17991b8b
...
@@ -33,6 +33,8 @@ public class RefillCardServiceImpl implements RefillCardService {
...
@@ -33,6 +33,8 @@ public class RefillCardServiceImpl implements RefillCardService {
@Autowired
@Autowired
private
CardMapper
cardMapper
;
private
CardMapper
cardMapper
;
@Override
@Override
@Transactional
@Transactional
public
R
add
(
RefillCard
refillCard
)
{
public
R
add
(
RefillCard
refillCard
)
{
...
...
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