Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dd_school
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqi
dd_school
Commits
01c1925b
Commit
01c1925b
authored
Sep 07, 2023
by
liuliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社团管理相关接口添加
parent
6f109867
Show whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
1380 additions
and
9 deletions
+1380
-9
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationActivationRecordController.java
+92
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationFcController.java
+110
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationInfoController.java
+93
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java
+95
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationSigninController.java
+108
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolExperimentPlanController.java
+0
-1
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationActivationRecord.java
+60
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationFc.java
+41
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationInfo.java
+45
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationMember.java
+59
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java
+64
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationActivationRecordMapper.java
+17
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationFcMapper.java
+16
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationInfoMapper.java
+16
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationMemberMapper.java
+16
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationSigninMapper.java
+19
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationActivationRecordServiceImpl.java
+21
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationFcServiceImpl.java
+20
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationInfoServiceImpl.java
+18
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationMemberServiceImpl.java
+19
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationSigninServiceImpl.java
+19
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolExperimentPlanServiceImpl.java
+0
-7
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationActivationRecordService.java
+18
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationFcService.java
+14
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationInfoService.java
+14
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationMemberService.java
+15
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationSigninService.java
+16
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolLab/ISchoolExperimentPlanService.java
+0
-1
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/fbVo.java
+13
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/signinApproveVo.java
+16
-0
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java
+118
-0
smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/SchoolOrganizationInfoListVo.java
+53
-0
smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/SchoolOrganizationInfoVo.java
+13
-0
smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/WxOrganizationSigninVo.java
+15
-0
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationActivationRecordMapper.xml
+26
-0
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationFcMapper.xml
+22
-0
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationInfoMapper.xml
+22
-0
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationMemberMapper.xml
+28
-0
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationSigninMapper.xml
+29
-0
No files found.
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationActivationRecordController.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
controller
.
organization
;
import
java.util.Arrays
;
import
java.util.List
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.ruoyi.common.utils.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationActivationRecord
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationActivationRecordService
;
/**
* 社团活动记录Controller
*
* @author liul
* @date 2023-09-06
*/
@RestController
@RequestMapping
(
"/record"
)
public
class
SchoolOrganizationActivationRecordController
extends
BaseController
{
@Autowired
private
ISchoolOrganizationActivationRecordService
schoolOrganizationActivationRecordService
;
/**
* 查询社团活动记录列表
*/
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
SchoolOrganizationActivationRecord
schoolOrganizationActivationRecord
)
{
LambdaQueryWrapper
<
SchoolOrganizationActivationRecord
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
like
(
StringUtils
.
isNotEmpty
(
schoolOrganizationActivationRecord
.
getTheme
()),
SchoolOrganizationActivationRecord:
:
getTheme
,
schoolOrganizationActivationRecord
.
getTheme
())
.
orderByDesc
(
SchoolOrganizationActivationRecord:
:
getCreateTime
);
startPage
();
List
<
SchoolOrganizationActivationRecord
>
list
=
schoolOrganizationActivationRecordService
.
list
(
wrapper
);
return
getDataTable
(
list
);
}
/**
* 获取社团活动记录详细信息
*/
@GetMapping
(
value
=
"/{id}"
)
public
AjaxResult
getInfo
(
@PathVariable
(
"id"
)
Long
id
)
{
return
AjaxResult
.
success
(
schoolOrganizationActivationRecordService
.
getById
(
id
));
}
/**
* 新增社团活动记录
*/
@Log
(
title
=
"社团活动记录"
,
businessType
=
BusinessType
.
INSERT
)
@PostMapping
public
AjaxResult
add
(
@RequestBody
SchoolOrganizationActivationRecord
schoolOrganizationActivationRecord
)
{
return
toAjax
(
schoolOrganizationActivationRecordService
.
save
(
schoolOrganizationActivationRecord
));
}
/**
* 修改社团活动记录
*/
@Log
(
title
=
"社团活动记录"
,
businessType
=
BusinessType
.
UPDATE
)
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SchoolOrganizationActivationRecord
schoolOrganizationActivationRecord
)
{
return
toAjax
(
schoolOrganizationActivationRecordService
.
updateById
(
schoolOrganizationActivationRecord
));
}
/**
* 删除社团活动记录
*/
@Log
(
title
=
"社团活动记录"
,
businessType
=
BusinessType
.
DELETE
)
@DeleteMapping
(
"/{ids}"
)
public
AjaxResult
remove
(
@PathVariable
Long
[]
ids
)
{
List
<
Long
>
list
=
Arrays
.
asList
(
ids
);
return
toAjax
(
schoolOrganizationActivationRecordService
.
removeByIds
(
list
));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationFcController.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
controller
.
organization
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationActivationRecord
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationFcService
;
import
yangtz.cs.liu.campus.vo.organization.fbVo
;
import
java.util.Arrays
;
import
java.util.List
;
/**
* 社团风采Controller
*
* @author liul
* @date 2023-09-06
*/
@RestController
@RequestMapping
(
"/fc"
)
public
class
SchoolOrganizationFcController
extends
BaseController
{
@Autowired
private
ISchoolOrganizationFcService
schoolOrganizationFcService
;
/**
* 查询社团风采列表
*/
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
SchoolOrganizationFc
schoolOrganizationFc
)
{
LambdaQueryWrapper
<
SchoolOrganizationFc
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
like
(
StringUtils
.
isNotEmpty
(
schoolOrganizationFc
.
getTheme
()),
SchoolOrganizationFc:
:
getTheme
,
schoolOrganizationFc
.
getTheme
())
.
orderByDesc
(
SchoolOrganizationFc:
:
getCreateTime
);
startPage
();
List
<
SchoolOrganizationFc
>
list
=
schoolOrganizationFcService
.
list
(
wrapper
);
return
getDataTable
(
list
);
}
/**
* 获取社团风采详细信息
*/
@GetMapping
(
value
=
"/{id}"
)
public
AjaxResult
getInfo
(
@PathVariable
(
"id"
)
Long
id
)
{
return
AjaxResult
.
success
(
schoolOrganizationFcService
.
getById
(
id
));
}
/**
* 新增社团风采
*/
@Log
(
title
=
"社团风采"
,
businessType
=
BusinessType
.
INSERT
)
@PostMapping
public
AjaxResult
add
(
@RequestBody
SchoolOrganizationFc
schoolOrganizationFc
)
{
return
toAjax
(
schoolOrganizationFcService
.
save
(
schoolOrganizationFc
));
}
/**
* 是否发布
*/
@PostMapping
(
"/isfb"
)
public
AjaxResult
fb
(
@RequestBody
fbVo
vo
)
{
SchoolOrganizationFc
fc
=
schoolOrganizationFcService
.
getById
(
vo
.
getId
());
String
isfb
=
fc
.
getIsfb
();
if
(
StringUtils
.
equals
(
isfb
,
"1"
)){
fc
.
setIsfb
(
"2"
);
}
else
{
fc
.
setIsfb
(
"1"
);
}
return
toAjax
(
schoolOrganizationFcService
.
updateById
(
fc
));
}
/**
* 修改社团风采
*/
@Log
(
title
=
"社团风采"
,
businessType
=
BusinessType
.
UPDATE
)
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SchoolOrganizationFc
schoolOrganizationFc
)
{
return
toAjax
(
schoolOrganizationFcService
.
updateById
(
schoolOrganizationFc
));
}
/**
* 删除社团风采
*/
@Log
(
title
=
"社团风采"
,
businessType
=
BusinessType
.
DELETE
)
@DeleteMapping
(
"/{ids}"
)
public
AjaxResult
remove
(
@PathVariable
Long
[]
ids
)
{
List
<
Long
>
list
=
Arrays
.
asList
(
ids
);
return
toAjax
(
schoolOrganizationFcService
.
removeByIds
(
list
));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationInfoController.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
controller
.
organization
;
import
java.util.Arrays
;
import
java.util.List
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.ruoyi.common.utils.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationInfoService
;
/**
* 社团信息Controller
*
* @author liul
* @date 2023-09-06
*/
@RestController
@RequestMapping
(
"/info"
)
public
class
SchoolOrganizationInfoController
extends
BaseController
{
@Autowired
private
ISchoolOrganizationInfoService
schoolOrganizationInfoService
;
/**
* 查询社团信息列表
*/
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
SchoolOrganizationInfo
schoolOrganizationInfo
)
{
LambdaQueryWrapper
<
SchoolOrganizationInfo
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
like
(
StringUtils
.
isNotEmpty
(
schoolOrganizationInfo
.
getName
()),
SchoolOrganizationInfo:
:
getName
,
schoolOrganizationInfo
.
getName
())
.
like
(
StringUtils
.
isNotEmpty
(
schoolOrganizationInfo
.
getTeachers
()),
SchoolOrganizationInfo:
:
getTeachers
,
schoolOrganizationInfo
.
getTeachers
())
.
orderByDesc
(
SchoolOrganizationInfo:
:
getCreateTime
);
startPage
();
List
<
SchoolOrganizationInfo
>
list
=
schoolOrganizationInfoService
.
list
(
wrapper
);
return
getDataTable
(
list
);
}
/**
* 获取社团信息详细信息
*/
@GetMapping
(
value
=
"/{id}"
)
public
AjaxResult
getInfo
(
@PathVariable
(
"id"
)
Long
id
)
{
return
AjaxResult
.
success
(
schoolOrganizationInfoService
.
getById
(
id
));
}
/**
* 新增社团信息
*/
@Log
(
title
=
"社团信息"
,
businessType
=
BusinessType
.
INSERT
)
@PostMapping
public
AjaxResult
add
(
@RequestBody
SchoolOrganizationInfo
schoolOrganizationInfo
)
{
return
toAjax
(
schoolOrganizationInfoService
.
save
(
schoolOrganizationInfo
));
}
/**
* 修改社团信息
*/
@Log
(
title
=
"社团信息"
,
businessType
=
BusinessType
.
UPDATE
)
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SchoolOrganizationInfo
schoolOrganizationInfo
)
{
return
toAjax
(
schoolOrganizationInfoService
.
updateById
(
schoolOrganizationInfo
));
}
/**
* 删除社团信息
*/
@Log
(
title
=
"社团信息"
,
businessType
=
BusinessType
.
DELETE
)
@DeleteMapping
(
"/{ids}"
)
public
AjaxResult
remove
(
@PathVariable
Long
[]
ids
)
{
List
<
Long
>
list
=
Arrays
.
asList
(
ids
);
return
toAjax
(
schoolOrganizationInfoService
.
removeByIds
(
list
));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationMemberController.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
controller
.
organization
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.ruoyi.common.utils.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService
;
import
java.util.Arrays
;
import
java.util.List
;
/**
* 社团成员Controller
*
* @author liul
* @date 2023-09-06
*/
@RestController
@RequestMapping
(
"/member"
)
public
class
SchoolOrganizationMemberController
extends
BaseController
{
@Autowired
private
ISchoolOrganizationMemberService
schoolOrganizationMemberService
;
/**
* 查询社团成员列表
*/
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
SchoolOrganizationMember
schoolOrganizationMember
)
{
LambdaQueryWrapper
<
SchoolOrganizationMember
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
like
(
StringUtils
.
isNotEmpty
(
schoolOrganizationMember
.
getName
()),
SchoolOrganizationMember:
:
getName
,
schoolOrganizationMember
.
getName
())
.
eq
(
StringUtils
.
isNotEmpty
(
schoolOrganizationMember
.
getClasses
()),
SchoolOrganizationMember:
:
getClasses
,
schoolOrganizationMember
.
getClasses
())
.
eq
(
StringUtils
.
isNotEmpty
(
schoolOrganizationMember
.
getGrade
()),
SchoolOrganizationMember:
:
getGrade
,
schoolOrganizationMember
.
getGrade
())
.
orderByDesc
(
SchoolOrganizationMember:
:
getCreateTime
);
startPage
();
List
<
SchoolOrganizationMember
>
list
=
schoolOrganizationMemberService
.
list
(
wrapper
);
return
getDataTable
(
list
);
}
/**
* 获取社团成员详细信息
*/
@GetMapping
(
value
=
"/{id}"
)
public
AjaxResult
getInfo
(
@PathVariable
(
"id"
)
Long
id
)
{
return
AjaxResult
.
success
(
schoolOrganizationMemberService
.
getById
(
id
));
}
/**
* 新增社团成员
*/
@Log
(
title
=
"社团成员"
,
businessType
=
BusinessType
.
INSERT
)
@PostMapping
public
AjaxResult
add
(
@RequestBody
SchoolOrganizationMember
schoolOrganizationMember
)
{
return
toAjax
(
schoolOrganizationMemberService
.
save
(
schoolOrganizationMember
));
}
/**
* 修改社团成员
*/
@Log
(
title
=
"社团成员"
,
businessType
=
BusinessType
.
UPDATE
)
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SchoolOrganizationMember
schoolOrganizationMember
)
{
return
toAjax
(
schoolOrganizationMemberService
.
updateById
(
schoolOrganizationMember
));
}
/**
* 删除社团成员
*/
@Log
(
title
=
"社团成员"
,
businessType
=
BusinessType
.
DELETE
)
@DeleteMapping
(
"/{ids}"
)
public
AjaxResult
remove
(
@PathVariable
Long
[]
ids
)
{
List
<
Long
>
list
=
Arrays
.
asList
(
ids
);
return
toAjax
(
schoolOrganizationMemberService
.
removeByIds
(
list
));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationSigninController.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
controller
.
organization
;
import
java.util.Arrays
;
import
java.util.List
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.ruoyi.common.utils.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.DeleteMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationSigninService
;
import
yangtz.cs.liu.campus.vo.organization.signinApproveVo
;
/**
* 社团报名审核Controller
*
* @author liul
* @date 2023-09-06
*/
@RestController
@RequestMapping
(
"/signin"
)
public
class
SchoolOrganizationSigninController
extends
BaseController
{
@Autowired
private
ISchoolOrganizationSigninService
schoolOrganizationSigninService
;
/**
* 查询社团报名审核列表
*/
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
SchoolOrganizationSignin
schoolOrganizationSignin
)
{
LambdaQueryWrapper
<
SchoolOrganizationSignin
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
like
(
StringUtils
.
isNotEmpty
(
schoolOrganizationSignin
.
getName
()),
SchoolOrganizationSignin:
:
getName
,
schoolOrganizationSignin
.
getName
())
.
eq
(
StringUtils
.
isNotEmpty
(
schoolOrganizationSignin
.
getClasses
()),
SchoolOrganizationSignin:
:
getClasses
,
schoolOrganizationSignin
.
getClasses
())
.
eq
(
StringUtils
.
isNotEmpty
(
schoolOrganizationSignin
.
getGrade
()),
SchoolOrganizationSignin:
:
getGrade
,
schoolOrganizationSignin
.
getGrade
())
.
orderByDesc
(
SchoolOrganizationSignin:
:
getCreateTime
);
startPage
();
List
<
SchoolOrganizationSignin
>
list
=
schoolOrganizationSigninService
.
list
(
wrapper
);
return
getDataTable
(
list
);
}
/**
* 获取社团报名审核详细信息
*/
@GetMapping
(
value
=
"/{id}"
)
public
AjaxResult
getInfo
(
@PathVariable
(
"id"
)
Long
id
)
{
return
AjaxResult
.
success
(
schoolOrganizationSigninService
.
getById
(
id
));
}
/**
* 新增社团报名
*/
@Log
(
title
=
"社团报名"
,
businessType
=
BusinessType
.
INSERT
)
@PostMapping
public
AjaxResult
add
(
@RequestBody
SchoolOrganizationSignin
schoolOrganizationSignin
)
{
return
toAjax
(
schoolOrganizationSigninService
.
save
(
schoolOrganizationSignin
));
}
/**
* 加入社团申请审批
*/
@PostMapping
(
"/approve"
)
public
AjaxResult
approve
(
@RequestBody
signinApproveVo
vo
)
{
SchoolOrganizationSignin
schoolOrganizationSignin
=
new
SchoolOrganizationSignin
();
schoolOrganizationSignin
.
setId
(
vo
.
getId
());
schoolOrganizationSignin
.
setStatus
(
vo
.
getStatus
());
return
toAjax
(
schoolOrganizationSigninService
.
updateById
(
schoolOrganizationSignin
));
}
/**
* 修改社团报名审核
*/
@Log
(
title
=
"社团报名审核"
,
businessType
=
BusinessType
.
UPDATE
)
@PutMapping
public
AjaxResult
edit
(
@RequestBody
SchoolOrganizationSignin
schoolOrganizationSignin
)
{
return
toAjax
(
schoolOrganizationSigninService
.
updateById
(
schoolOrganizationSignin
));
}
/**
* 删除社团报名审核
*/
@Log
(
title
=
"社团报名审核"
,
businessType
=
BusinessType
.
DELETE
)
@DeleteMapping
(
"/{ids}"
)
public
AjaxResult
remove
(
@PathVariable
Long
[]
ids
)
{
List
<
Long
>
list
=
Arrays
.
asList
(
ids
);
return
toAjax
(
schoolOrganizationSigninService
.
removeByIds
(
list
));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolExperimentPlanController.java
View file @
01c1925b
...
...
@@ -33,7 +33,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
import
yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherLabApplyService
;
import
yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeMentorService
;
import
yangtz.cs.liu.campus.service.schoolgrade.ISchoolGradeService
;
import
yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanMbVo
;
import
yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanVo
;
import
yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherLabApplyVo
;
import
yangtz.cs.liu.campus.vo.schoolgrade.GradeTreeSelect
;
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationActivationRecord.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
domain
.
organization
;
import
java.util.Date
;
import
com.core.domain.OurBaseEntity
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.ruoyi.common.annotation.Excel
;
import
com.ruoyi.common.core.domain.BaseEntity
;
/**
* 社团活动记录对象 school_organization_activation_record
*
* @author liul
* @date 2023-09-06
*/
@Data
public
class
SchoolOrganizationActivationRecord
extends
OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 活动主题 */
@Excel
(
name
=
"活动主题"
)
private
String
theme
;
/** 活动开始时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"活动开始时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
beginTime
;
/** 活动结束时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"活动结束时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
Date
endTime
;
/** 负责人 */
@Excel
(
name
=
"负责人"
)
private
String
fzr
;
/** 社团id */
@Excel
(
name
=
"社团id"
)
private
Long
cid
;
/** 社团名称 */
@Excel
(
name
=
"社团名称"
)
private
String
orgName
;
/** 附件 */
@Excel
(
name
=
"附件"
)
private
String
file
;
/** 备注 */
private
String
remark
;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationFc.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
domain
.
organization
;
import
com.core.domain.OurBaseEntity
;
import
lombok.Data
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.ruoyi.common.annotation.Excel
;
import
com.ruoyi.common.core.domain.BaseEntity
;
/**
* 社团风采对象 school_organization_fc
*
* @author liul
* @date 2023-09-06
*/
@Data
public
class
SchoolOrganizationFc
extends
OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 对应的社团id */
@Excel
(
name
=
"对应的社团id"
)
private
Long
cid
;
/** 主题 */
@Excel
(
name
=
"主题"
)
private
String
theme
;
/** 附件 */
@Excel
(
name
=
"附件"
)
private
String
file
;
/** 是否发布(1发布 2不发布) */
@Excel
(
name
=
"是否发布"
,
readConverterExp
=
"1=发布,2=不发布"
)
private
String
isfb
;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationInfo.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
domain
.
organization
;
import
com.core.domain.OurBaseEntity
;
import
lombok.Data
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.ruoyi.common.annotation.Excel
;
import
com.ruoyi.common.core.domain.BaseEntity
;
/**
* 社团信息对象 school_organization_info
*
* @author liul
* @date 2023-09-06
*/
@Data
public
class
SchoolOrganizationInfo
extends
OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 社团名称 */
@Excel
(
name
=
"社团名称"
)
private
String
name
;
/** 指导老师 */
@Excel
(
name
=
"指导老师"
)
private
String
teachers
;
/** 指导老师id */
@Excel
(
name
=
"指导老师id"
)
private
String
teachersId
;
/** 社团宗旨 */
@Excel
(
name
=
"社团宗旨"
)
private
String
aim
;
/** 社团简介 */
@Excel
(
name
=
"社团简介"
)
private
String
intro
;
/** 成员人数 */
private
String
num
;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationMember.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
domain
.
organization
;
import
com.core.domain.OurBaseEntity
;
import
lombok.Data
;
import
com.ruoyi.common.annotation.Excel
;
/**
* 社团成员对象 school_organization_member
*
* @author liul
* @date 2023-09-06
*/
@Data
public
class
SchoolOrganizationMember
extends
OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 社团id */
@Excel
(
name
=
"社团id"
)
private
Long
cid
;
/** 社团名称 */
@Excel
(
name
=
"社团名称"
)
private
String
orgName
;
/** 学生姓名 */
@Excel
(
name
=
"学生姓名"
)
private
String
name
;
/** 性别(1男 2女) */
@Excel
(
name
=
"性别(1男 2女)"
)
private
String
sex
;
/** 身份证号 */
@Excel
(
name
=
"身份证号"
)
private
String
cardid
;
/** 年级 */
@Excel
(
name
=
"年级"
)
private
String
grade
;
/** 班级 */
@Excel
(
name
=
"班级"
)
private
String
classes
;
/** 社团职位 */
@Excel
(
name
=
"社团职位"
)
private
String
orgPosition
;
/** 电话 */
@Excel
(
name
=
"电话"
)
private
String
phone
;
@Excel
private
Long
userId
;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationSignin.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
domain
.
organization
;
import
com.core.domain.OurBaseEntity
;
import
lombok.Data
;
import
com.ruoyi.common.annotation.Excel
;
/**
* 社团报名审核对象 school_organization_signin
*
* @author liul
* @date 2023-09-06
*/
@Data
public
class
SchoolOrganizationSignin
extends
OurBaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
private
Long
id
;
/** 姓名 */
@Excel
(
name
=
"姓名"
)
private
String
name
;
/** 性别(1男 2女) */
@Excel
(
name
=
"性别(1男 2女)"
)
private
String
sex
;
/** 年级 */
@Excel
(
name
=
"年级"
)
private
String
grade
;
/** 班级 */
@Excel
(
name
=
"班级"
)
private
String
classes
;
/** 兴趣爱好 */
@Excel
(
name
=
"兴趣爱好"
)
private
String
hobby
;
/** 电话 */
@Excel
(
name
=
"电话"
)
private
String
phone
;
/** 申请理由 */
@Excel
(
name
=
"申请理由"
)
private
String
reason
;
/** 审核状态(1未审核 2同意 3不同意) */
@Excel
(
name
=
"审核状态"
,
readConverterExp
=
"1=未审核,2=同意,3=不同意"
)
private
String
status
;
/** 社团id */
@Excel
(
name
=
"社团id"
)
private
Long
cid
;
/** 社团名称 */
@Excel
(
name
=
"社团名称"
)
private
String
orgName
;
/** userId */
private
Long
userId
;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationActivationRecordMapper.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
mapper
.
organization
;
import
java.util.List
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationActivationRecord
;
/**
* 社团活动记录Mapper接口
*
* @author ruoyi
* @date 2023-09-06
*/
public
interface
SchoolOrganizationActivationRecordMapper
extends
BaseMapper
<
SchoolOrganizationActivationRecord
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationFcMapper.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
mapper
.
organization
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc
;
/**
* 社团风采Mapper接口
*
* @author liul
* @date 2023-09-06
*/
public
interface
SchoolOrganizationFcMapper
extends
BaseMapper
<
SchoolOrganizationFc
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationInfoMapper.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
mapper
.
organization
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo
;
import
java.util.List
;
/**
* 社团信息Mapper接口
*
* @author liul
* @date 2023-09-06
*/
public
interface
SchoolOrganizationInfoMapper
extends
BaseMapper
<
SchoolOrganizationInfo
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationMemberMapper.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
mapper
.
organization
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember
;
/**
* 社团成员Mapper接口
*
* @author liul
* @date 2023-09-06
*/
public
interface
SchoolOrganizationMemberMapper
extends
BaseMapper
<
SchoolOrganizationMember
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationSigninMapper.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
mapper
.
organization
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin
;
import
java.util.List
;
/**
* 社团报名审核Mapper接口
*
* @author liul
* @date 2023-09-06
*/
public
interface
SchoolOrganizationSigninMapper
extends
BaseMapper
<
SchoolOrganizationSignin
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationActivationRecordServiceImpl.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
impl
.
organization
;
import
java.util.List
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationActivationRecord
;
import
yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationActivationRecordMapper
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationActivationRecordService
;
/**
* 社团活动记录Service业务层处理
*
* @author liul
* @date 2023-09-06
*/
@Service
public
class
SchoolOrganizationActivationRecordServiceImpl
extends
ServiceImpl
<
SchoolOrganizationActivationRecordMapper
,
SchoolOrganizationActivationRecord
>
implements
ISchoolOrganizationActivationRecordService
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationFcServiceImpl.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
impl
.
organization
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc
;
import
yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationFcMapper
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationFcService
;
/**
* 社团风采Service业务层处理
*
* @author liul
* @date 2023-09-06
*/
@Service
public
class
SchoolOrganizationFcServiceImpl
extends
ServiceImpl
<
SchoolOrganizationFcMapper
,
SchoolOrganizationFc
>
implements
ISchoolOrganizationFcService
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationInfoServiceImpl.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
impl
.
organization
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo
;
import
yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationInfoMapper
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationInfoService
;
/**
* 社团信息Service业务层处理
*
* @author liul
* @date 2023-09-06
*/
@Service
public
class
SchoolOrganizationInfoServiceImpl
extends
ServiceImpl
<
SchoolOrganizationInfoMapper
,
SchoolOrganizationInfo
>
implements
ISchoolOrganizationInfoService
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationMemberServiceImpl.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
impl
.
organization
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember
;
import
yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationMemberMapper
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService
;
/**
* 社团成员Service业务层处理
*
* @author liul
* @date 2023-09-06
*/
@Service
public
class
SchoolOrganizationMemberServiceImpl
extends
ServiceImpl
<
SchoolOrganizationMemberMapper
,
SchoolOrganizationMember
>
implements
ISchoolOrganizationMemberService
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationSigninServiceImpl.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
impl
.
organization
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin
;
import
yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationSigninMapper
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationSigninService
;
/**
* 社团报名审核Service业务层处理
*
* @author liul
* @date 2023-09-06
*/
@Service
public
class
SchoolOrganizationSigninServiceImpl
extends
ServiceImpl
<
SchoolOrganizationSigninMapper
,
SchoolOrganizationSignin
>
implements
ISchoolOrganizationSigninService
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolExperimentPlanServiceImpl.java
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
impl
.
schoolLab
;
import
java.text.DecimalFormat
;
import
java.text.NumberFormat
;
import
java.util.List
;
...
...
@@ -19,20 +18,14 @@ import java.util.Map;
import
com.ruoyi.common.utils.StringUtils
;
import
org.springframework.transaction.annotation.Transactional
;
import
yangtz.cs.liu.campus.domain.schoolClass.SchoolClass
;
import
yangtz.cs.liu.campus.domain.schoolLab.SchoolExperimentPlanClass
;
import
yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade
;
import
yangtz.cs.liu.campus.domain.schoolgrade.SchoolGradeMentor
;
import
yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMapper
;
import
yangtz.cs.liu.campus.mapper.schoolLab.SchoolExperimentPlanMapper
;
import
yangtz.cs.liu.campus.domain.schoolLab.SchoolExperimentPlan
;
import
yangtz.cs.liu.campus.mapper.schoolLab.SchoolLabMapper
;
import
yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMapper
;
import
yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMentorMapper
;
import
yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService
;
import
yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanMbVo
;
import
yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanVo
;
import
yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo
;
/**
* 实验计划Service业务层处理
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationActivationRecordService.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
organization
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationActivationRecord
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo
;
import
java.util.List
;
/**
* 社团活动记录Service接口
*
* @author ruoyi
* @date 2023-09-06
*/
public
interface
ISchoolOrganizationActivationRecordService
extends
IService
<
SchoolOrganizationActivationRecord
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationFcService.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
organization
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationFc
;
/**
* 社团风采Service接口
*
* @author ruoyi
* @date 2023-09-06
*/
public
interface
ISchoolOrganizationFcService
extends
IService
<
SchoolOrganizationFc
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationInfoService.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
organization
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo
;
/**
* 社团信息Service接口
*
* @author liul
* @date 2023-09-06
*/
public
interface
ISchoolOrganizationInfoService
extends
IService
<
SchoolOrganizationInfo
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationMemberService.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
organization
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember
;
/**
* 社团成员Service接口
*
* @author liul
* @date 2023-09-06
*/
public
interface
ISchoolOrganizationMemberService
extends
IService
<
SchoolOrganizationMember
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationSigninService.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
service
.
organization
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin
;
/**
* 社团报名审核Service接口
*
* @author liul
* @date 2023-09-06
*/
public
interface
ISchoolOrganizationSigninService
extends
IService
<
SchoolOrganizationSignin
>
{
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolLab/ISchoolExperimentPlanService.java
View file @
01c1925b
...
...
@@ -2,7 +2,6 @@ package yangtz.cs.liu.campus.service.schoolLab;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
yangtz.cs.liu.campus.domain.schoolLab.SchoolExperimentPlan
;
import
yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanMbVo
;
import
yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanVo
;
import
java.util.List
;
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/fbVo.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
vo
.
organization
;
import
lombok.Data
;
/**
* @USER: liul 18266668098
* @DATE: 2023/9/7 10:21
* @DESCRIPTION:
*/
@Data
public
class
fbVo
{
private
Long
id
;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/signinApproveVo.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
campus
.
vo
.
organization
;
import
lombok.Data
;
/**
* @USER: liul 18266668098
* @DATE: 2023/9/7 11:28
* @DESCRIPTION:
*/
@Data
public
class
signinApproveVo
{
private
Long
id
;
/*1未审核 2同意 3不同意*/
private
String
status
;
}
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
wechat
.
controller
.
organization
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.framework.util.UserInfoUtil
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationInfo
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationMember
;
import
yangtz.cs.liu.campus.domain.organization.SchoolOrganizationSignin
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationInfoService
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationMemberService
;
import
yangtz.cs.liu.campus.service.organization.ISchoolOrganizationSigninService
;
import
yangtz.cs.liu.wechat.vo.organization.SchoolOrganizationInfoListVo
;
import
yangtz.cs.liu.wechat.vo.organization.WxOrganizationSigninVo
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* @USER: liul 18266668098
* @DATE: 2023/9/7 14:43
* @DESCRIPTION: 移动端社团信息获取Controller
*/
@RestController
@RequestMapping
(
"/wx/info"
)
public
class
WxSchoolOrganizationController
extends
BaseController
{
@Autowired
private
ISchoolOrganizationInfoService
schoolOrganizationInfoService
;
@Autowired
private
ISchoolOrganizationSigninService
schoolOrganizationSigninService
;
@Autowired
private
ISchoolOrganizationMemberService
schoolOrganizationMemberService
;
@Autowired
private
UserInfoUtil
userInfoUtil
;
/**
* 查询社团信息列表
*/
@GetMapping
(
"/getInfo"
)
public
AjaxResult
getInfo
()
{
ArrayList
<
SchoolOrganizationInfoListVo
>
myList
=
new
ArrayList
<>();
// String studentName = userInfoUtil.getMpLoginUser().getStudentName();
// String studentIdCard = userInfoUtil.getMpLoginUser().getStudentIdCard();
Long
userId
=
userInfoUtil
.
getMpLoginUser
().
getUserId
();
LambdaQueryWrapper
<
SchoolOrganizationInfo
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
eq
(
SchoolOrganizationInfo:
:
getDelFlag
,
"0"
);
wrapper
.
orderByDesc
(
SchoolOrganizationInfo:
:
getCreateTime
);
List
<
SchoolOrganizationInfo
>
list
=
schoolOrganizationInfoService
.
list
(
wrapper
);
if
(
list
!=
null
&&
list
.
size
()>
0
){
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
SchoolOrganizationInfo
info
=
list
.
get
(
i
);
Long
id
=
info
.
getId
();
LambdaQueryWrapper
<
SchoolOrganizationMember
>
wrapper2
=
Wrappers
.
lambdaQuery
();
wrapper2
.
eq
(
SchoolOrganizationMember:
:
getCid
,
id
)
.
eq
(
SchoolOrganizationMember:
:
getUserId
,
userId
);
// .eq(StringUtils.isNotEmpty(studentName),SchoolOrganizationMember::getName,studentName)
// .eq(StringUtils.isNotEmpty(studentIdCard),SchoolOrganizationMember::getCardid,studentIdCard);
SchoolOrganizationMember
one
=
schoolOrganizationMemberService
.
getOne
(
wrapper2
);
SchoolOrganizationInfoListVo
vo
=
new
SchoolOrganizationInfoListVo
();
BeanUtils
.
copyProperties
(
info
,
vo
);
if
(
one
!=
null
){
vo
.
setIsattend
(
"1"
);
//表示已加入该社团
}
else
{
vo
.
setIsattend
(
"2"
);
}
myList
.
add
(
vo
);
}
}
return
AjaxResult
.
success
(
myList
);
}
/**
* 根据id获取社团信息详细信息
*/
@GetMapping
(
value
=
"/{id}"
)
public
AjaxResult
getInfo
(
@PathVariable
(
"id"
)
Long
id
)
{
return
AjaxResult
.
success
(
schoolOrganizationInfoService
.
getById
(
id
));
}
/**
* 通过当前登录人查询当前社团的报名情况
* */
@GetMapping
(
"/search"
)
public
AjaxResult
search
(
@RequestBody
WxOrganizationSigninVo
vo
){
Long
userId
=
userInfoUtil
.
getMpLoginUser
().
getUserId
();
//根据当前登录人 查询当前社团的报名状态
LambdaQueryWrapper
<
SchoolOrganizationSignin
>
wrapper
=
Wrappers
.
lambdaQuery
();
wrapper
.
eq
(
SchoolOrganizationSignin:
:
getUserId
,
userId
)
.
eq
(
StringUtils
.
isNotEmpty
(
vo
.
getOrgName
()),
SchoolOrganizationSignin:
:
getOrgName
,
vo
.
getOrgName
())
.
eq
(
SchoolOrganizationSignin:
:
getDelFlag
,
"0"
);
return
AjaxResult
.
success
(
schoolOrganizationSigninService
.
getOne
(
wrapper
));
}
/**
* 新增社团报名或重新报名
*/
@PostMapping
public
AjaxResult
add
(
@RequestBody
SchoolOrganizationSignin
schoolOrganizationSignin
)
{
schoolOrganizationSignin
.
setStatus
(
"1"
);
//适配重新报名的情况
return
toAjax
(
schoolOrganizationSigninService
.
save
(
schoolOrganizationSignin
));
}
}
smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/SchoolOrganizationInfoListVo.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
wechat
.
vo
.
organization
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
java.util.Date
;
/**
* @USER: liul 18266668098
* @DATE: 2023/9/7 16:39
* @DESCRIPTION:
*/
@Data
public
class
SchoolOrganizationInfoListVo
{
private
Long
id
;
/** 社团名称 */
private
String
name
;
/** 指导老师 */
private
String
teachers
;
/** 指导老师id */
private
String
teachersId
;
/** 社团宗旨 */
private
String
aim
;
/** 社团简介 */
private
String
intro
;
/** 成员人数 */
private
String
num
;
private
String
createBy
;
/** 创建时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
createTime
;
/** 更新者 */
private
String
updateBy
;
/** 更新时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm"
)
private
Date
updateTime
;
/** 是否 删除 */
private
String
delFlag
;
//是否参加 (1为已加入 2未加入)
private
String
isattend
;
}
smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/SchoolOrganizationInfoVo.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
wechat
.
vo
.
organization
;
import
lombok.Data
;
/**
* @USER: liul 18266668098
* @DATE: 2023/9/7 15:31
* @DESCRIPTION:
*/
@Data
public
class
SchoolOrganizationInfoVo
{
}
smart-campus/src/main/java/yangtz/cs/liu/wechat/vo/organization/WxOrganizationSigninVo.java
0 → 100644
View file @
01c1925b
package
yangtz
.
cs
.
liu
.
wechat
.
vo
.
organization
;
import
lombok.Data
;
/**
* @USER: liul 18266668098
* @DATE: 2023/9/7 15:03
* @DESCRIPTION:
*/
@Data
public
class
WxOrganizationSigninVo
{
//社团名称
private
String
orgName
;
}
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationActivationRecordMapper.xml
0 → 100644
View file @
01c1925b
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationActivationRecordMapper"
>
<resultMap
type=
"SchoolOrganizationActivationRecord"
id=
"SchoolOrganizationActivationRecordResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"theme"
column=
"theme"
/>
<result
property=
"beginTime"
column=
"begin_time"
/>
<result
property=
"endTime"
column=
"end_time"
/>
<result
property=
"fzr"
column=
"fzr"
/>
<result
property=
"cid"
column=
"cid"
/>
<result
property=
"orgName"
column=
"org_name"
/>
<result
property=
"remark"
column=
"remark"
/>
<result
property=
"file"
column=
"file"
/>
<result
property=
"delFlag"
column=
"del_flag"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
</resultMap>
</mapper>
\ No newline at end of file
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationFcMapper.xml
0 → 100644
View file @
01c1925b
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationFcMapper"
>
<resultMap
type=
"SchoolOrganizationFc"
id=
"SchoolOrganizationFcResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"cid"
column=
"cid"
/>
<result
property=
"theme"
column=
"theme"
/>
<result
property=
"file"
column=
"file"
/>
<result
property=
"isfb"
column=
"isfb"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"delFlag"
column=
"del_flag"
/>
</resultMap>
</mapper>
\ No newline at end of file
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationInfoMapper.xml
0 → 100644
View file @
01c1925b
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationInfoMapper"
>
<resultMap
type=
"SchoolOrganizationInfo"
id=
"SchoolOrganizationInfoResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"name"
column=
"name"
/>
<result
property=
"teachers"
column=
"teachers"
/>
<result
property=
"teachersId"
column=
"teachers_id"
/>
<result
property=
"aim"
column=
"aim"
/>
<result
property=
"intro"
column=
"intro"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"num"
column=
"num"
/>
</resultMap>
</mapper>
\ No newline at end of file
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationMemberMapper.xml
0 → 100644
View file @
01c1925b
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationMemberMapper"
>
<resultMap
type=
"SchoolOrganizationMember"
id=
"SchoolOrganizationMemberResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"cid"
column=
"cid"
/>
<result
property=
"orgName"
column=
"org_name"
/>
<result
property=
"name"
column=
"name"
/>
<result
property=
"sex"
column=
"sex"
/>
<result
property=
"cardid"
column=
"cardid"
/>
<result
property=
"grade"
column=
"grade"
/>
<result
property=
"classes"
column=
"classes"
/>
<result
property=
"orgPosition"
column=
"org_position"
/>
<result
property=
"phone"
column=
"phone"
/>
<result
property=
"delFlag"
column=
"del_flag"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"userId"
column=
"user_id"
/>
</resultMap>
</mapper>
\ No newline at end of file
smart-campus/src/main/resources/mapper/organization/SchoolOrganizationSigninMapper.xml
0 → 100644
View file @
01c1925b
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"yangtz.cs.liu.campus.mapper.organization.SchoolOrganizationSigninMapper"
>
<resultMap
type=
"SchoolOrganizationSignin"
id=
"SchoolOrganizationSigninResult"
>
<result
property=
"id"
column=
"id"
/>
<result
property=
"name"
column=
"name"
/>
<result
property=
"sex"
column=
"sex"
/>
<result
property=
"grade"
column=
"grade"
/>
<result
property=
"classes"
column=
"classes"
/>
<result
property=
"hobby"
column=
"hobby"
/>
<result
property=
"phone"
column=
"phone"
/>
<result
property=
"reason"
column=
"reason"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"cid"
column=
"cid"
/>
<result
property=
"orgName"
column=
"org_name"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"createBy"
column=
"create_by"
/>
<result
property=
"updateBy"
column=
"update_by"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"delFlag"
column=
"del_flag"
/>
<result
property=
"userId"
column=
"user_id"
/>
</resultMap>
</mapper>
\ No newline at end of file
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