Skip to content

D
dd_school
Commit 37a19642 by Cat
Options

Merge branch 'master' of http://49.232.152.146:6688/xhxy/smart_school

parents 63cc6622 00bbdef8
Showing with 1799 additions and 75 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/organization/SchoolOrganizationActivationRecordController.java 0 → 100644
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
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
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
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
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
......@@ -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;
......@@ -115,6 +114,7 @@ public class SchoolExperimentPlanController extends BaseController
List<SchoolExperimentPlanVo> list = schoolExperimentPlanService.selectSchoolExperimentPlanList(schoolExperimentPlanVo);
List<SchoolExperimentPlanVo> listNew = new ArrayList<>();
//去除用户所在级部和所在学科组不匹配的数据
if (StringUtils.isNotNull(schoolGradeMentors)){
for (SchoolExperimentPlanVo experimentPlanVo : list) {
......@@ -210,14 +210,26 @@ public class SchoolExperimentPlanController extends BaseController
}
/**
* 根据学年查询级部下拉框
* 查询级部下拉框
*/
@GetMapping("/getGrade/{schoolYear}")
public AjaxResult getGrade(@PathVariable("schoolYear") int schoolYear){
@GetMapping("/getGrade")
public AjaxResult getGrade(){
//获取最新学年
int schoolYear = schoolGradeService.isNewSchoolYear();
return AjaxResult.success(schoolExperimentPlanService.getGrade(schoolYear,null));
}
/**
* 查询级部下拉框(搜索条件)
*/
@GetMapping("/getGradeList")
public AjaxResult getGradeList(){
//获取最新学年
int schoolYear = schoolGradeService.isNewSchoolYear();
return AjaxResult.success(schoolExperimentPlanService.getGradeList(schoolYear));
}
/**
* 根据级部查询对应班级
*/
@GetMapping("/getClass/{gradeId}")
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolLabClassYearController.java
......@@ -196,7 +196,7 @@ public class SchoolLabClassYearController extends BaseController
List<SchoolLabClassYearRelation> schoolLabClassYearRelations = schoolLabClassYearRelationService.list(wrapper);
schoolLabClassYearVo.setSchoolLabClassYearRelationList(schoolLabClassYearRelations);
}
return AjaxResult.success();
return AjaxResult.success(schoolLabClassYearVo);
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolTeacherExperimentApplyController.java
......@@ -22,9 +22,11 @@ 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 yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYearRelation;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApplyLabs;
import yangtz.cs.liu.campus.service.accessory.IAccessoryService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherExperimentApplyService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
......@@ -47,6 +49,8 @@ public class SchoolTeacherExperimentApplyController extends BaseController
private ISchoolTeacherExperimentApplyService schoolTeacherExperimentApplyService;
@Autowired
private ISchoollTeacherExperimentApplyLabsService schoollTeacherExperimentApplyLabsService;
@Autowired
private IAccessoryService accessoryService;
/**
* 查询教师个人实验申请列表
......@@ -75,6 +79,13 @@ public class SchoolTeacherExperimentApplyController extends BaseController
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
list1.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
}
LambdaQueryWrapper<SchoolAccessory> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SchoolAccessory::getBusinessId,list1.getId())
.eq(SchoolAccessory::getAccessoryType,"教师个人实验结果附件");
List<SchoolAccessory> schoolAccessories = accessoryService.list(wrapper1);
if (schoolAccessories.size() > 0){
list1.setSchoolAccessoryList(schoolAccessories);
}
});
return getDataTable(list);
}
......@@ -96,6 +107,13 @@ public class SchoolTeacherExperimentApplyController extends BaseController
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
list1.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
}
LambdaQueryWrapper<SchoolAccessory> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SchoolAccessory::getBusinessId,list1.getId())
.eq(SchoolAccessory::getAccessoryType,"教师个人实验结果附件");
List<SchoolAccessory> schoolAccessories = accessoryService.list(wrapper1);
if (schoolAccessories.size() > 0){
list1.setSchoolAccessoryList(schoolAccessories);
}
});
return getDataTable(list);
}
......@@ -122,6 +140,45 @@ public class SchoolTeacherExperimentApplyController extends BaseController
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
schoolTeacherExperimentApplyVo.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
}
LambdaQueryWrapper<SchoolAccessory> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SchoolAccessory::getBusinessId,schoolTeacherExperimentApplyVo.getId())
.eq(SchoolAccessory::getAccessoryType,"教师个人实验结果附件");
List<SchoolAccessory> schoolAccessories = accessoryService.list(wrapper1);
if (schoolAccessories.size() > 0){
schoolTeacherExperimentApplyVo.setSchoolAccessoryList(schoolAccessories);
}
return AjaxResult.success(schoolTeacherExperimentApplyVo);
}
/**
* 实验室管理-教师个人实验申请-获取教师个人实验申请详细信息
*/
@GetMapping(value = "/detail/{id}")
public AjaxResult detail(@PathVariable("id") Long id)
{
SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo = schoolTeacherExperimentApplyService.selectSchoolTeacherExperimentApplyById(id);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String semester = "";
if (schoolTeacherExperimentApplyVo.getSemester().equals("1")){
semester = "上学期";
}else {
semester = "下学期";
}
schoolTeacherExperimentApplyVo.setSchoolYearSemester(schoolTeacherExperimentApplyVo.getSchoolYear() + semester);
schoolTeacherExperimentApplyVo.setPlannedTime(format.format(schoolTeacherExperimentApplyVo.getPlannedStartTime()) + "至" + format.format(schoolTeacherExperimentApplyVo.getPlannedEndTime()));
if (schoolTeacherExperimentApplyVo.getDeclareState().equals("3") || schoolTeacherExperimentApplyVo.getDeclareState().equals("2") ){
LambdaQueryWrapper<SchoolTeacherExperimentApplyLabs> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolTeacherExperimentApplyLabs::getTeacherExperimentApplyId,id);
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
schoolTeacherExperimentApplyVo.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
}
LambdaQueryWrapper<SchoolAccessory> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SchoolAccessory::getBusinessId,schoolTeacherExperimentApplyVo.getId())
.eq(SchoolAccessory::getAccessoryType,"教师个人实验结果附件");
List<SchoolAccessory> schoolAccessories = accessoryService.list(wrapper1);
if (schoolAccessories.size() > 0){
schoolTeacherExperimentApplyVo.setSchoolAccessoryList(schoolAccessories);
}
return AjaxResult.success(schoolTeacherExperimentApplyVo);
}
......@@ -160,14 +217,14 @@ public class SchoolTeacherExperimentApplyController extends BaseController
*/
@GetMapping("/getTeacherList")
public TableDataInfo getTeacherList(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo){
schoolTeacherExperimentApplyVo.setDeclareState("1");
schoolTeacherExperimentApplyVo.setDeclareState("0");
SysUser user = SecurityUtils.getLoginUser().getUser();
List<SysRole> roles = user.getRoles();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
//管理员返回全部
if (user.isAdmin()){
startPage();
List<SchoolTeacherExperimentApplyVo> list = schoolTeacherExperimentApplyService.selectSchoolTeacherExperimentApplyList(schoolTeacherExperimentApplyVo);
List<SchoolTeacherExperimentApplyVo> list = schoolTeacherExperimentApplyService.getTeacherList(schoolTeacherExperimentApplyVo);
list.forEach(list1 ->{
String semester = "";
if (list1.getSemester().equals("1")){
......@@ -181,6 +238,13 @@ public class SchoolTeacherExperimentApplyController extends BaseController
wrapper.eq(SchoolTeacherExperimentApplyLabs::getTeacherExperimentApplyId,list1.getId());
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
list1.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
LambdaQueryWrapper<SchoolAccessory> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SchoolAccessory::getBusinessId,list1.getId())
.eq(SchoolAccessory::getAccessoryType,"教师个人实验结果附件");
List<SchoolAccessory> schoolAccessories = accessoryService.list(wrapper1);
if (schoolAccessories.size() > 0){
list1.setSchoolAccessoryList(schoolAccessories);
}
});
return getDataTable(list);
}
......@@ -189,7 +253,7 @@ public class SchoolTeacherExperimentApplyController extends BaseController
for (SysRole role : roles) {
if (role.getRoleKey().equals("admin")){
startPage();
List<SchoolTeacherExperimentApplyVo> list = schoolTeacherExperimentApplyService.selectSchoolTeacherExperimentApplyList(schoolTeacherExperimentApplyVo);
List<SchoolTeacherExperimentApplyVo> list = schoolTeacherExperimentApplyService.getTeacherList(schoolTeacherExperimentApplyVo);
list.forEach(list1 -> {
String semester = "";
if (list1.getSemester().equals("1")){
......@@ -203,6 +267,13 @@ public class SchoolTeacherExperimentApplyController extends BaseController
wrapper.eq(SchoolTeacherExperimentApplyLabs::getTeacherExperimentApplyId,list1.getId());
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
list1.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
LambdaQueryWrapper<SchoolAccessory> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SchoolAccessory::getBusinessId,list1.getId())
.eq(SchoolAccessory::getAccessoryType,"教师个人实验结果附件");
List<SchoolAccessory> schoolAccessories = accessoryService.list(wrapper1);
if (schoolAccessories.size() > 0){
list1.setSchoolAccessoryList(schoolAccessories);
}
});
return getDataTable(list);
}
......@@ -222,7 +293,7 @@ public class SchoolTeacherExperimentApplyController extends BaseController
schoolTeacherExperimentApplyVo.setSubs(labSubs);
startPage();
List<SchoolTeacherExperimentApplyVo> list = schoolTeacherExperimentApplyService.selectSchoolTeacherExperimentApplyList(schoolTeacherExperimentApplyVo);
List<SchoolTeacherExperimentApplyVo> list = schoolTeacherExperimentApplyService.getTeacherList(schoolTeacherExperimentApplyVo);
list.forEach(list1 -> {
String semester = "";
if (list1.getSemester().equals("1")){
......@@ -232,11 +303,16 @@ public class SchoolTeacherExperimentApplyController extends BaseController
}
list1.setSchoolYearSemester(list1.getSchoolYear() + semester);
list1.setPlannedTime(format.format(list1.getPlannedStartTime()) + "至" + format.format(list1.getPlannedEndTime()));
if (list1.getDeclareState().equals("3") || list1.getDeclareState().equals("2")){
LambdaQueryWrapper<SchoolTeacherExperimentApplyLabs> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolTeacherExperimentApplyLabs::getTeacherExperimentApplyId,list1.getId());
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
list1.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
LambdaQueryWrapper<SchoolTeacherExperimentApplyLabs> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolTeacherExperimentApplyLabs::getTeacherExperimentApplyId,list1.getId());
List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabs = schoollTeacherExperimentApplyLabsService.list(wrapper);
list1.setSchoolTeacherExperimentApplyLabsList(schoolTeacherExperimentApplyLabs);
LambdaQueryWrapper<SchoolAccessory> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(SchoolAccessory::getBusinessId,list1.getId())
.eq(SchoolAccessory::getAccessoryType,"教师个人实验结果附件");
List<SchoolAccessory> schoolAccessories = accessoryService.list(wrapper1);
if (schoolAccessories.size() > 0){
list1.setSchoolAccessoryList(schoolAccessories);
}
});
return getDataTable(list);
......@@ -250,4 +326,13 @@ public class SchoolTeacherExperimentApplyController extends BaseController
public AjaxResult teacherExperimentLabs(@RequestBody SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo){
return toAjax(schoolTeacherExperimentApplyService.teacherExperimentLabs(schoolTeacherExperimentApplyVo));
}
/**
* 上传实验结果附件
*/
@PostMapping("/experimentResult")
public AjaxResult experimentResult(@RequestBody SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo){
return toAjax(schoolTeacherExperimentApplyService.experimentResult(schoolTeacherExperimentApplyVo));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolLab/SchoolTeacherLabApplyController.java
......@@ -202,4 +202,14 @@ public class SchoolTeacherLabApplyController extends BaseController
public AjaxResult updateState(@RequestBody SchoolTeacherLabApply schoolTeacherLabApply){
return toAjax(schoolTeacherLabApplyService.updateState(schoolTeacherLabApply));
}
/**
* 实验室管理-查看实验室使用记录明细
*/
@GetMapping("/getLabUserDetial")
public TableDataInfo getLabUserDetial(SchoolTeacherLabApplyVo schoolTeacherLabApplyVo){
startPage();
return getDataTable(schoolTeacherLabApplyService.selectSchoolTeacherLabApplyList(schoolTeacherLabApplyVo));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/organization/SchoolOrganizationActivationRecord.java 0 → 100644
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
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
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
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
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/domain/schoolLab/SchoolTeacherExperimentApply.java
......@@ -73,4 +73,7 @@ public class SchoolTeacherExperimentApply extends OurBaseEntity
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "申报时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date applyTime;
/** 完成状态（0未完成，1已完成） */
private String state;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/organization/SchoolOrganizationActivationRecordMapper.java 0 → 100644
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
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
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
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
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/mapper/schoolLab/SchoolLabClassYearMapper.java
......@@ -106,6 +106,13 @@ public interface SchoolLabClassYearMapper extends BaseMapper<SchoolLabClassYear>
List<Long> seletLabId(@Param("labClassYearIds") List<Long> labClassYearIds);
/**
* 获取实验室id
* @param teacherExperimentIds
* @return
*/
List<Long> seletLabIds(@Param("teacherExperimentIds") List<Long> teacherExperimentIds);
/**
* 实验室管理-年级实验室预约查看详情
* @param id
* @return
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolLab/SchoolTeacherExperimentApplyMapper.java
package yangtz.cs.liu.campus.mapper.schoolLab;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApplyLabs;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherExperimentApplyVo;
......@@ -33,6 +34,14 @@ public interface SchoolTeacherExperimentApplyMapper extends BaseMapper<SchoolTea
public List<SchoolTeacherExperimentApplyVo> selectSchoolTeacherExperimentApplyList(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo);
/**
* 查询教师个人实验申请列表
*
* @param schoolTeacherExperimentApplyVo 教师个人实验申请
* @return 教师个人实验申请集合
*/
public List<SchoolTeacherExperimentApplyVo> getTeacherList(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo);
/**
* 新增教师个人实验申请
*
* @param schoolTeacherExperimentApplyVo 教师个人实验申请
......@@ -78,4 +87,11 @@ public interface SchoolTeacherExperimentApplyMapper extends BaseMapper<SchoolTea
* 删除教师个人实验申请实验室
*/
public int deleteSchoolTeacherExperimentApplyLabsId(Long id);
/**
* 批量新增附件信息
* @param list
* @return
*/
int batchSchoolAccessory(List<SchoolAccessory> list);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/organization/SchoolOrganizationActivationRecordServiceImpl.java 0 → 100644
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
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
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
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
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/schoolEquipment/ProductCategoryServiceImpl.java
......@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -83,10 +84,9 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
throw new ServiceException("该分类编码已存在");
}
//父id
Long parentId = schoolProductCategory.getParentId();
if (null != parentId){
SchoolProductCategory schoolProductCategory1 = productCategoryMapper.selectById(parentId);
schoolProductCategory.setAncestors(schoolProductCategory1.getAncestors() + "," + parentId);
if (StringUtils.isNotNull(schoolProductCategory.getParentId())){
SchoolProductCategory schoolProductCategory1 = productCategoryMapper.selectById(schoolProductCategory.getParentId());
schoolProductCategory.setAncestors(schoolProductCategory1.getAncestors() + "," + schoolProductCategory.getParentId());
}else {
schoolProductCategory.setParentId((long) 0);
schoolProductCategory.setAncestors("0");
......@@ -108,6 +108,26 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
@Override
@Transactional
public int updateSchoolProductCategory(SchoolProductCategory schoolProductCategory) {
//查询分类编码是否重复
LambdaQueryWrapper<SchoolProductCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolProductCategory::getClassificationCode,schoolProductCategory.getClassificationCode())
.notIn(SchoolProductCategory::getId,schoolProductCategory.getId());
List<SchoolProductCategory> schoolProductCategories = productCategoryMapper.selectList(wrapper);
if (schoolProductCategories != null && schoolProductCategories.size() > 0){
throw new ServiceException("该分类编码已存在");
}
//父id
if (StringUtils.isNotNull(schoolProductCategory.getParentId())){
SchoolProductCategory schoolProductCategory1 = productCategoryMapper.selectById(schoolProductCategory.getParentId());
schoolProductCategory.setAncestors(schoolProductCategory1.getAncestors() + "," + schoolProductCategory.getParentId());
}else {
schoolProductCategory.setParentId((long) 0);
schoolProductCategory.setAncestors("0");
}
String[] split = schoolProductCategory.getAncestors().split(",");
schoolProductCategory.setRank((long) split.length);
//根据用户id获取用户名
String userName = sysUserMapper.selectUserById(schoolProductCategory.getAdminId()).getUserName();
schoolProductCategory.setAdmin(userName);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolExperimentPlanServiceImpl.java
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业务层处理
......@@ -201,6 +194,20 @@ public class SchoolExperimentPlanServiceImpl extends ServiceImpl<SchoolExperimen
}
/**
* 查询级部（搜索条件）
* @param schoolYear
* @return
*/
@Override
public List<Map<String, Object>> getGradeList(int schoolYear) {
List<Map<String, Object>> gradeList = schoolExperimentPlanMapper.getGrade(schoolYear,null);
if(StringUtils.isNull(gradeList) || gradeList.size() == 0){
throw new ServiceException("当前学年为" + schoolYear + "学年，该学年没有级部信息");
}
return gradeList;
}
/**
* 根据级部查询对应班级
* @param gradeId
* @return
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolLabClassYearServiceImpl.java
......@@ -24,9 +24,7 @@ import yangtz.cs.liu.campus.mapper.schoolLab.*;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolLabClassYear;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolExperimentPlanService;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolLabClassYearService;
import yangtz.cs.liu.campus.vo.schoolLab.ClassSituationVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolExperimentPlanVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo;
import yangtz.cs.liu.campus.vo.schoolLab.*;
/**
* 年级实验室预约Service业务层处理
......@@ -50,9 +48,10 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea
private SchoolLabClassYearRelationMapper relationMapper;
@Autowired
private SchoolClassMapper schoolClassMapper;
@Autowired
private SchoolTeacherLabApplyMapper schoolTeacherLabApplyMapper;
@Autowired
private SchoolTeacherExperimentApplyMapper teacherExperimentApplyMapper;
/**
* 查询年级实验室预约
......@@ -275,7 +274,7 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea
}
SchoolLabClassYear schoolLabClassYear = new SchoolLabClassYear();
BeanUtils.copyProperties(schoolLabClassYearVo,schoolLabClassYear);
return schoolLabClassYearMapper.updateById(schoolLabClassYear);
return schoolLabClassYearMapper.updateSchoolLabClassYear(schoolLabClassYear);
}
/**
......@@ -294,16 +293,28 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea
LambdaQueryWrapper<SchoolLab> wrapper = new LambdaQueryWrapper<>();
List<SchoolLab> schoolLabs = schoolLabMapper.selectList(wrapper);
//查询所有已分配实验室的年级实验室预约
LambdaQueryWrapper<SchoolLabClassYear> lqw = new LambdaQueryWrapper<>();
lqw.eq(SchoolLabClassYear::getDeclareState,"3");
List<SchoolLabClassYear> schoolLabClassYears = schoolLabClassYearMapper.selectList(lqw);
List<String> declareStates = new ArrayList<>();
declareStates.add("2");
declareStates.add("3");
//查询所有已保存已分配实验室的年级实验室预约
SchoolLabClassYearVo labClassYearVo = new SchoolLabClassYearVo();
labClassYearVo.setDeclareStates(declareStates);
List<SchoolLabClassYearVo> schoolLabClassYears = schoolLabClassYearMapper.selectSchoolLabClassYearList(labClassYearVo);
//查询所有已保存已分配实验室的教师个人实验申请
SchoolTeacherExperimentApplyVo teacherExperimentApplyVo = new SchoolTeacherExperimentApplyVo();
teacherExperimentApplyVo.setDeclareStates(declareStates);
List<SchoolTeacherExperimentApplyVo> teacherExperimentApplyVoList = teacherExperimentApplyMapper.selectSchoolTeacherExperimentApplyList(teacherExperimentApplyVo);
//在时间范围内的年级实验室预约id集合
List<Long> labClassYearIds = new ArrayList<>();
//在时间范围内的教师个人实验申请id集合
List<Long> teacherExperimentIds = new ArrayList<>();
//筛选在计划时间范围内的年级实验室预约
for (SchoolLabClassYear schoolLabClassYear : schoolLabClassYears) {
for (SchoolLabClassYearVo schoolLabClassYear : schoolLabClassYears) {
//开始时间
Date startTime = schoolLabClassYear.getPlannedStartTime();
//结束时间
......@@ -311,10 +322,43 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea
if ((startTime.after(plannedStartTime) && startTime.before(plannedEndTime)) || (endTime.after(plannedStartTime) && endTime.before(plannedEndTime))){
labClassYearIds.add(schoolLabClassYear.getId());
}
if (startTime.equals(plannedStartTime) && endTime.equals(plannedEndTime)){
labClassYearIds.add(schoolLabClassYear.getId());
}
}
//筛选在计划时间范围内的教师个人实验申请
for (SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo : teacherExperimentApplyVoList) {
//开始时间
Date startTime = schoolTeacherExperimentApplyVo.getPlannedStartTime();
//结束时间
Date endTime = schoolTeacherExperimentApplyVo.getPlannedEndTime();
if ((startTime.after(plannedStartTime) && startTime.before(plannedEndTime)) || (endTime.after(plannedStartTime) && endTime.before(plannedEndTime))){
teacherExperimentIds.add(schoolTeacherExperimentApplyVo.getId());
}
if (startTime.equals(plannedStartTime) && endTime.equals(plannedEndTime)){
teacherExperimentIds.add(schoolTeacherExperimentApplyVo.getId());
}
}
List<Long> labIds = new ArrayList<>();
if (labClassYearIds.size() > 0){
//根据年级实验室预约主键id查询实验室id
List<Long> labIds = schoolLabClassYearMapper.seletLabId(labClassYearIds);
List<Long> seletLabId = schoolLabClassYearMapper.seletLabId(labClassYearIds);
if (seletLabId.size() > 0){
labIds.addAll(seletLabId);
}
}
if (teacherExperimentIds.size() > 0){
//根据教师个人实验申请主键id查询实验室id
List<Long> labIds1 = schoolLabClassYearMapper.seletLabIds(teacherExperimentIds);
if (labIds1.size() > 0){
labIds.addAll(labIds1);
}
}
if (labIds.size() > 0){
for (SchoolLab schoolLab : schoolLabs) {
Map<String, Object> map = new HashMap<>();
map.put("labId",schoolLab.getId());
......@@ -331,6 +375,7 @@ public class SchoolLabClassYearServiceImpl extends ServiceImpl<SchoolLabClassYea
}
return list;
}
for (SchoolLab schoolLab : schoolLabs) {
Map<String, Object> map = new HashMap<>();
map.put("labId",schoolLab.getId());
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolTeacherExperimentApplyServiceImpl.java
......@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApplyLabs;
import yangtz.cs.liu.campus.mapper.schoolLab.SchoolTeacherExperimentApplyMapper;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApply;
......@@ -57,6 +58,11 @@ public class SchoolTeacherExperimentApplyServiceImpl extends ServiceImpl<SchoolT
return schoolTeacherExperimentApplyMapper.selectSchoolTeacherExperimentApplyList(schoolTeacherExperimentApplyVo);
}
@Override
public List<SchoolTeacherExperimentApplyVo> getTeacherList(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo) {
return schoolTeacherExperimentApplyMapper.getTeacherList(schoolTeacherExperimentApplyVo);
}
/**
* 新增教师个人实验申请
*
......@@ -138,4 +144,34 @@ public class SchoolTeacherExperimentApplyServiceImpl extends ServiceImpl<SchoolT
}
return schoolTeacherExperimentApplyMapper.updateSchoolTeacherExperimentApply(schoolTeacherExperimentApplyVo);
}
/**
* 上传实验结果附件
* @param schoolTeacherExperimentApplyVo
* @return
*/
@Override
public int experimentResult(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo) {
//教师个人实验申请id
Long id = schoolTeacherExperimentApplyVo.getId();
//附件信息集合
List<SchoolAccessory> schoolAccessoryList = schoolTeacherExperimentApplyVo.getSchoolAccessoryList();
List<SchoolAccessory> list = new ArrayList<>();
for (SchoolAccessory schoolAccessory : schoolAccessoryList) {
schoolAccessory.setBusinessId(id);
schoolAccessory.setModuleName("教师-教师个人实验申请");
schoolAccessory.setAccessoryType("教师个人实验结果附件");
schoolAccessory.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
schoolAccessory.setCreateTime(DateUtils.getNowDate());
list.add(schoolAccessory);
}
if (list.size() > 0){
schoolTeacherExperimentApplyMapper.batchSchoolAccessory(list);
}
SchoolTeacherExperimentApply schoolTeacherExperimentApply = new SchoolTeacherExperimentApply();
schoolTeacherExperimentApply.setId(id);
schoolTeacherExperimentApply.setState("1");
return schoolTeacherExperimentApplyMapper.updateById(schoolTeacherExperimentApply);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolLab/SchoolTeacherLabApplyServiceImpl.java
......@@ -23,6 +23,7 @@ import yangtz.cs.liu.campus.mapper.schoolLab.SchoolTeacherLabApplyMapper;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherLabApply;
import yangtz.cs.liu.campus.service.schoolLab.ISchoolTeacherLabApplyService;
import yangtz.cs.liu.campus.vo.schoolLab.ClassSituationVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolLabClassYearVo;
import yangtz.cs.liu.campus.vo.schoolLab.SchoolTeacherLabApplyVo;
/**
......@@ -133,9 +134,7 @@ public class SchoolTeacherLabApplyServiceImpl extends ServiceImpl<SchoolTeacherL
@Override
public List<Map<String, Object>> getTeacherLab(SchoolTeacherLabApplyVo schoolTeacherLabApplyVo) {
//判断实验时间是否在计划之间之内
LambdaQueryWrapper<SchoolLabClassYear> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolLabClassYear::getId,schoolTeacherLabApplyVo.getLabClassYearId());
SchoolLabClassYear schoolLabClassYear = schoolLabClassYearMapper.selectOne(wrapper);
SchoolLabClassYearVo schoolLabClassYear = schoolLabClassYearMapper.selectSchoolLabClassYearById(schoolTeacherLabApplyVo.getLabClassYearId());
//计划开始时间
Date plannedStartTime = schoolLabClassYear.getPlannedStartTime();
//计划结束时间
......@@ -411,9 +410,7 @@ public class SchoolTeacherLabApplyServiceImpl extends ServiceImpl<SchoolTeacherL
throw new ServiceException("已存在该班级此次实验申请");
}
//判断实验时间是否在计划之间之内
LambdaQueryWrapper<SchoolLabClassYear> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolLabClassYear::getId,schoolTeacherLabApplyVo.getLabClassYearId());
SchoolLabClassYear schoolLabClassYear = schoolLabClassYearMapper.selectOne(wrapper);
SchoolLabClassYearVo schoolLabClassYear = schoolLabClassYearMapper.selectSchoolLabClassYearById(schoolTeacherLabApplyVo.getLabClassYearId());
//计划开始时间
Date plannedStartTime = schoolLabClassYear.getPlannedStartTime();
//计划结束时间
......@@ -446,9 +443,7 @@ public class SchoolTeacherLabApplyServiceImpl extends ServiceImpl<SchoolTeacherL
@Transactional
public int updateSchoolTeacherLabApplyVo(SchoolTeacherLabApplyVo schoolTeacherLabApplyVo) {
//判断实验时间是否在计划之间之内
LambdaQueryWrapper<SchoolLabClassYear> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SchoolLabClassYear::getId,schoolTeacherLabApplyVo.getLabClassYearId());
SchoolLabClassYear schoolLabClassYear = schoolLabClassYearMapper.selectOne(wrapper);
SchoolLabClassYearVo schoolLabClassYear = schoolLabClassYearMapper.selectSchoolLabClassYearById(schoolTeacherLabApplyVo.getLabClassYearId());
//计划开始时间
Date plannedStartTime = schoolLabClassYear.getPlannedStartTime();
//计划结束时间
......@@ -472,7 +467,7 @@ public class SchoolTeacherLabApplyServiceImpl extends ServiceImpl<SchoolTeacherL
@Override
public List<SchoolTeacherLabApplyVo> getTeacherExperimentList(ClassSituationVo one) {
SchoolTeacherLabApplyVo schoolTeacherLabApply = new SchoolTeacherLabApplyVo();
schoolTeacherLabApply.setLabClassYearId(one.getLabClassYearId().toString());
schoolTeacherLabApply.setLabClassYearId(one.getLabClassYearId());
schoolTeacherLabApply.setSchoolYear(one.getSchoolYear().toString());
schoolTeacherLabApply.setSemester(one.getSemester());
schoolTeacherLabApply.setExperimentTime(StringUtils.isNull(one.getExperimentTime())? null: new Date(one.getExperimentTime()));
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/organization/ISchoolOrganizationActivationRecordService.java 0 → 100644
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
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
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
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
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
......@@ -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;
......@@ -73,6 +72,13 @@ public interface ISchoolExperimentPlanService extends IService<SchoolExperimentP
List<Map<String,Object>> getGrade(int schoolYear,Long userId);
/**
* 查询级部下拉框(搜索条件)
* @param schoolYear
* @return
*/
List<Map<String,Object>> getGradeList(int schoolYear);
/**
* 根据级部查询对应班级
* @param gradeId
* @return
......@@ -108,4 +114,6 @@ public interface ISchoolExperimentPlanService extends IService<SchoolExperimentP
* @return
*/
List<Map<String, Object>> gradeCountExperiment(SchoolExperimentPlanVo schoolExperimentPlanVo);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolLab/ISchoolTeacherExperimentApplyService.java
......@@ -31,6 +31,14 @@ public interface ISchoolTeacherExperimentApplyService extends IService<SchoolTea
public List<SchoolTeacherExperimentApplyVo> selectSchoolTeacherExperimentApplyList(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo);
/**
* 查询教师个人实验申请列表
*
* @param schoolTeacherExperimentApplyVo 教师个人实验申请
* @return 教师个人实验申请集合
*/
public List<SchoolTeacherExperimentApplyVo> getTeacherList(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo);
/**
* 新增教师个人实验申请
*
* @param schoolTeacherExperimentApply 教师个人实验申请
......@@ -69,4 +77,10 @@ public interface ISchoolTeacherExperimentApplyService extends IService<SchoolTea
*/
int teacherExperimentLabs(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo);
/**
* 上传实验结果附件
* @param schoolTeacherExperimentApplyVo
* @return
*/
int experimentResult(SchoolTeacherExperimentApplyVo schoolTeacherExperimentApplyVo);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/organization/fbVo.java 0 → 100644
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
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/campus/vo/schoolLab/SchoolLabClassYearVo.java
......@@ -87,6 +87,8 @@ public class SchoolLabClassYearVo extends BaseEntity
@Excel(name = "申报状态", readConverterExp = "0=未申报,1=已申报,2=已阅读,3=已分配")
private String declareState;
private List<String> declareStates;
/** 申报人id */
private Long applyId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolLab/SchoolTeacherExperimentApplyVo.java
......@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
import yangtz.cs.liu.campus.domain.schoolLab.SchoolTeacherExperimentApplyLabs;
/**
......@@ -81,6 +82,8 @@ public class SchoolTeacherExperimentApplyVo extends BaseEntity
@Excel(name = "申报状态", readConverterExp = "0=未申报,1=已申报,2=已阅读,3=已分配")
private String declareState;
private List<String> declareStates;
/** 申报人id */
private Long applyId;
......@@ -93,6 +96,12 @@ public class SchoolTeacherExperimentApplyVo extends BaseEntity
@Excel(name = "申报时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date applyTime;
/** 完成状态（0未完成，1已完成） */
private String state;
/** 教师个人实验申请实验室列表 */
private List<SchoolTeacherExperimentApplyLabs> schoolTeacherExperimentApplyLabsList;
/** 附件信息集合 */
private List<SchoolAccessory> schoolAccessoryList;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolLab/SchoolTeacherLabApplyVo.java
......@@ -28,7 +28,7 @@ public class SchoolTeacherLabApplyVo extends BaseEntity
private Long id;
/** 年级实验室预约主键id */
private String labClassYearId;
private Long labClassYearId;
/** 教师id */
private Long teacherId;
......@@ -81,6 +81,10 @@ public class SchoolTeacherLabApplyVo extends BaseEntity
@Excel(name = "章节内容")
private String chapterContent;
/** 实验用品 */
@Excel(name = "实验用品")
private String experimentUseGoods;
/** 实验时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "实验时间", width = 30, dateFormat = "yyyy-MM-dd")
......
smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/organization/WxSchoolOrganizationController.java 0 → 100644
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
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
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
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
<?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
<?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
<?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
<?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
<?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
smart-campus/src/main/resources/mapper/schoolLab/SchoolLabClassYearMapper.xml
......@@ -72,6 +72,12 @@
#{gradeId}
</foreach>
</if>
<if test="declareStates != null">
and declare_state in
<foreach item="declareState" collection="declareStates" open="(" separator="," close=")">
#{declareState}
</foreach>
</if>
</where>
order by create_time DESC
</select>
......@@ -236,6 +242,13 @@
</foreach>
</select>
<select id="seletLabIds" resultType="Long">
select lab_id from school_teacher_experiment_apply_labs where del_flag = '0' and teacher_experiment_apply_id in
<foreach item="teacherExperimentId" collection="teacherExperimentIds" open="(" separator="," close=")">
#{teacherExperimentId}
</foreach>
</select>
<select id="getTeacherLabList" parameterType="SchoolLabClassYearVo" resultMap="SchoolLabClassYearVoResult">
<include refid="selectSchoolLabClassYearVo"/>
WHERE del_flag = '0'
......@@ -265,7 +278,6 @@
</select>
<select id="getexperimentList" parameterType="ClassSituationVo" resultType="ClassSituationVo">
SELECT ep.id,ep.experiment_name,ep.school_year,ep.grade, ep.semester,COUNT(pc.class_id) as count FROM school_experiment_plan ep
LEFT JOIN school_experiment_plan_class pc on ep.id = pc.experiment_plan_id
......
smart-campus/src/main/resources/mapper/schoolLab/SchoolTeacherExperimentApplyMapper.xml
......@@ -20,6 +20,7 @@
<result property="applyId" column="apply_id" />
<result property="applyName" column="apply_name" />
<result property="applyTime" column="apply_time" />
<result property="state" column="state" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
......@@ -28,7 +29,7 @@
</resultMap>
<sql id="selectSchoolTeacherExperimentApplyVo">
select id, sub, grade_id, grade, school_year, semester, planned_start_time, planned_end_time, experiment_name, experiment_classify, experiment_use_goods, declare_state, apply_id, apply_name, apply_time, create_by, create_time, update_by, update_time, del_flag from school_teacher_experiment_apply
select id, sub, grade_id, grade, school_year, semester, planned_start_time, planned_end_time, experiment_name, experiment_classify, experiment_use_goods, declare_state, apply_id, apply_name, apply_time, state, create_by, create_time, update_by, update_time, del_flag from school_teacher_experiment_apply
</sql>
<select id="selectSchoolTeacherExperimentApplyList" parameterType="SchoolTeacherExperimentApplyVo" resultMap="SchoolTeacherExperimentApplyVoResult">
......@@ -51,6 +52,43 @@
<if test="applyId != null "> and apply_id = #{applyId}</if>
<if test="applyName != null and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
<if test="applyTime != null "> and apply_time = #{applyTime}</if>
<if test="state != null "> and state = #{state}</if>
<if test="subs != null ">
and sub in
<foreach item="sub" collection="subs" open="(" separator="," close=")">
#{sub}
</foreach>
</if>
<if test="declareStates != null">
and declare_state in
<foreach item="declareState" collection="declareStates" open="(" separator="," close=")">
#{declareState}
</foreach>
</if>
</where>
</select>
<select id="getTeacherList" parameterType="SchoolTeacherExperimentApplyVo" resultMap="SchoolTeacherExperimentApplyVoResult">
<include refid="selectSchoolTeacherExperimentApplyVo"/>
<where>
del_flag = '0'
<if test="sub != null and sub != ''"> and sub = #{sub}</if>
<if test="gradeId != null "> and grade_id = #{gradeId}</if>
<if test="grade != null and grade != ''"> and grade = #{grade}</if>
<if test="schoolYear != null and schoolYear != ''"> and school_year = #{schoolYear}</if>
<if test="semester != null and semester != ''"> and semester = #{semester}</if>
<if test="plannedStartTime != null and plannedEndTime != null">
and planned_start_time between #{plannedStartTime} and #{plannedEndTime}
and planned_end_time between #{plannedStartTime} and #{plannedEndTime}
</if>
<if test="experimentName != null and experimentName != ''"> and experiment_name like concat('%', #{experimentName}, '%')</if>
<if test="experimentClassify != null and experimentClassify != ''"> and experiment_classify = #{experimentClassify}</if>
<if test="experimentUseGoods != null and experimentUseGoods != ''"> and experiment_use_goods = #{experimentUseGoods}</if>
<if test="declareState != null and declareState != ''"> and declare_state != #{declareState}</if>
<if test="applyId != null "> and apply_id = #{applyId}</if>
<if test="applyName != null and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
<if test="applyTime != null "> and apply_time = #{applyTime}</if>
<if test="state != null "> and state = #{state}</if>
<if test="subs != null ">
and sub in
<foreach item="sub" collection="subs" open="(" separator="," close=")">
......@@ -82,6 +120,7 @@
<if test="applyId != null">apply_id,</if>
<if test="applyName != null">apply_name,</if>
<if test="applyTime != null">apply_time,</if>
<if test="state != null">state,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
......@@ -103,6 +142,7 @@
<if test="applyId != null">#{applyId},</if>
<if test="applyName != null">#{applyName},</if>
<if test="applyTime != null">#{applyTime},</if>
<if test="state != null">#{state},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
......@@ -128,6 +168,7 @@
<if test="applyId != null">apply_id = #{applyId},</if>
<if test="applyName != null">apply_name = #{applyName},</if>
<if test="applyTime != null">apply_time = #{applyTime},</if>
<if test="state != null">state = #{state},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
......@@ -165,4 +206,11 @@
( #{item.id}, #{item.teacherExperimentApplyId}, #{item.labId},#{item.labName})
</foreach>
</insert>
<insert id="batchSchoolAccessory">
insert into school_accessory( id, business_id, module_name, accessory_type, accessory_url, accessory_name, create_by,create_time) values
<foreach item="item" index="index" collection="list" separator=",">
( 0, #{item.businessId}, #{item.moduleName}, #{item.accessoryType}, #{item.accessoryUrl}, #{item.accessoryName}, #{item.createBy}, #{item.createTime})
</foreach>
</insert>
</mapper>
\ No newline at end of file
smart-campus/src/main/resources/mapper/schoolLab/SchoolTeacherLabApplyMapper.xml
......@@ -18,6 +18,7 @@
<result property="classId" column="class_id" />
<result property="className" column="class_name" />
<result property="chapterContent" column="chapter_content" />
<result property="experimentUseGoods" column="experiment_use_goods" />
<result property="experimentTime" column="experiment_time" />
<result property="section" column="section" />
<result property="labId" column="lab_id" />
......@@ -40,37 +41,43 @@
</sql>
<select id="selectSchoolTeacherLabApplyList" parameterType="SchoolTeacherLabApplyVo" resultMap="SchoolTeacherLabApplyVoResult">
<include refid="selectSchoolTeacherLabApplyVo"/>
select tla.id, tla.lab_class_year_id, tla.experiment_classify, tla.experiment_plan_id,
tla.experiment_name, tla.sub, tla.grade_id, tla.grade, tla.school_year,
tla.semester, tla.class_id, tla.class_name, tla.chapter_content, lcy.experiment_use_goods, tla.experiment_time,
tla.section, tla.lab_id, tla.lab_name, tla.apply_state, tla.apply_id, tla.apply_name, tla.apply_time,
tla.remark,tla.state, tla.create_by, tla.create_time, tla.update_by, tla.update_time, tla.del_flag
from school_teacher_lab_apply tla
LEFT JOIN school_lab_class_year lcy ON tla.lab_class_year_id = lcy.id
<where>
del_flag = '0'
<if test="labClassYearId != null and labClassYearId != ''"> and lab_class_year_id = #{labClassYearId}</if>
<if test="experimentClassify != null and experimentClassify != ''"> and experiment_classify = #{experimentClassify}</if>
<if test="experimentName != null and experimentName != ''"> and experiment_name like concat('%', #{experimentName}, '%')</if>
<if test="sub != null and sub != ''"> and sub = #{sub}</if>
<if test="gradeId != null"> and grade_id = #{gradeId}</if>
<if test="grade != null and grade != ''"> and grade like concat('%', #{grade}, '%')</if>
<if test="schoolYear != null and schoolYear != ''"> and school_year = #{schoolYear}</if>
<if test="semester != null and semester != ''"> and semester = #{semester}</if>
<if test="classId != null and classId != ''"> and class_id = #{classId}</if>
<if test="className != null and className != ''"> and class_name like concat('%', #{className}, '%')</if>
<if test="chapterContent != null and chapterContent != ''"> and chapter_content = #{chapterContent}</if>
<if test="startTime != null and endTime != null "> and experiment_time between #{startTime} and #{endTime}</if>
<if test="section != null and section != ''"> and section = #{section}</if>
<if test="labId != null "> and lab_id = #{labId}</if>
<if test="labName != null and labName != ''"> and lab_name like concat('%', #{labName}, '%')</if>
<if test="applyState != null and applyState != ''"> and apply_state = #{applyState}</if>
<if test="applyId != null "> and apply_id = #{applyId}</if>
<if test="applyName != null and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
<if test="applyTime != null "> and apply_time = #{applyTime}</if>
<if test="state != null "> and state = #{state}</if>
tla.del_flag = '0'
<if test="labClassYearId != null and labClassYearId != ''"> and tla.lab_class_year_id = #{labClassYearId}</if>
<if test="experimentClassify != null and experimentClassify != ''"> and tla.experiment_classify = #{experimentClassify}</if>
<if test="experimentName != null and experimentName != ''"> and tla.experiment_name like concat('%', #{experimentName}, '%')</if>
<if test="sub != null and sub != ''"> and tla.sub = #{sub}</if>
<if test="gradeId != null"> and tla.grade_id = #{gradeId}</if>
<if test="grade != null and grade != ''"> and tla.grade like concat('%', #{grade}, '%')</if>
<if test="schoolYear != null and schoolYear != ''"> and tla.school_year = #{schoolYear}</if>
<if test="semester != null and semester != ''"> and tla.semester = #{semester}</if>
<if test="classId != null and classId != ''"> and tla.class_id = #{classId}</if>
<if test="className != null and className != ''"> and tla.class_name like concat('%', #{className}, '%')</if>
<if test="chapterContent != null and chapterContent != ''"> and tla.chapter_content = #{chapterContent}</if>
<if test="startTime != null and endTime != null "> and tla.experiment_time between #{startTime} and #{endTime}</if>
<if test="section != null and section != ''"> and tla.section = #{section}</if>
<if test="labId != null "> and tla.lab_id = #{labId}</if>
<if test="labName != null and labName != ''"> and tla.lab_name like concat('%', #{labName}, '%')</if>
<if test="applyState != null and applyState != ''"> and tla.apply_state = #{applyState}</if>
<if test="applyId != null "> and tla.apply_id = #{applyId}</if>
<if test="applyName != null and applyName != ''"> and tla.apply_name like concat('%', #{applyName}, '%')</if>
<if test="applyTime != null "> and tla.apply_time = #{applyTime}</if>
<if test="state != null "> and tla.state = #{state}</if>
<if test="subs != null ">
and sub in
and tla.sub in
<foreach item="sub" collection="subs" open="(" separator="," close=")">
#{sub}
</foreach>
</if>
</where>
order by create_time DESC
order by tla.create_time DESC
</select>
<select id="selectSchoolTeacherLabApplyById" parameterType="Long" resultMap="SchoolTeacherLabApplyVoResult">
......@@ -243,7 +250,10 @@
COUNT(CASE WHEN experiment_classify = 2 THEN experiment_classify END) as sycount,
COUNT(CASE WHEN experiment_classify = 3 THEN experiment_classify END) as sjcount,
COUNT(CASE WHEN state = 1 THEN state END) ywccount
FROM school_teacher_lab_apply WHERE school_year = #{schoolYear} AND semester = #{semester}
FROM school_teacher_lab_apply WHERE school_year = #{schoolYear}
<if test="semester != null and semester != ''">
AND semester = #{semester}
</if>
<if test="applyName != null and applyName != ''">
AND apply_name like concat('%', #{applyName}, '%')
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment