Skip to content

J
jy_jxjy
提交 4b595abf authored 作者: wangmenglong's avatar wangmenglong
浏览文件
操作

首次提交

上级 da2748df
隐藏空白字符变更
内嵌 并排
正在显示 包含 2 行增加 和 637 行删除
jxjy-lib/src/main/java/data/system/DriverSchoolRecord.java deleted 100644 → 0
浏览文件 @ da2748df
package data.system;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import data.parent.IdentityObj;
import lombok.Data;
/**
* @author wangmenglong
* @description: 报名记录
* @date 2023/12/11 10:50
*/
@Data
@TableName(value = "tb_driver_school_record")
public class DriverSchoolRecord extends IdentityObj {
/**
* 人员id
**/
@TableField("person_id")
private String personId;
/**
* revisit已回访 new未回访
**/
@TableField("state")
private String state;
}
jxjy-lib/src/main/java/data/system/HigherSchoolRecord.java deleted 100644 → 0
浏览文件 @ da2748df
package data.system;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import data.parent.IdentityObj;
import lombok.Data;
/**
* @author wangmenglong
* @description: 报名记录
* @date 2023/12/11 10:50
*/
@Data
@TableName(value = "tb_higher_school_record")
public class HigherSchoolRecord extends IdentityObj {
/**
* 人员id
**/
@TableField("person_id")
private String personId;
/**
* revisit已回访 new未回访
**/
@TableField("state")
private String state;
}
jxjy-system/src/main/java/com/jyxz/system/JyxzSystemApplication.java → jxjy-system/src/main/java/com/jxjy/system/JxjySystemApplication.java
浏览文件 @ 4b595abf
......@@ -15,10 +15,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@MapperScan(basePackages = "com.jxjy.system.mapper")
@EnableCaching // 开启缓存
@EnableScheduling
public class jxjySystemApplication {
public class JxjySystemApplication {
public static void main(String[] args) {
SpringApplication.run(jxjySystemApplication.class, args);
SpringApplication.run(JxjySystemApplication.class, args);
}
}
jxjy-system/src/main/java/com/jyxz/system/service/PersonService.java → jxjy-system/src/main/java/com/jxjy/system/service/PersonService.java
浏览文件 @ 4b595abf
......@@ -28,7 +28,4 @@ public interface PersonService {
List<Person> getRecruitMessageList(String recruitId);
List<Person> listHigher(int pageNum, int pageSize, Person person);
List<Person> listDriver(int pageNum, int pageSize, Person person);
}
jxjy-system/src/main/java/com/jyxz/system/service/impl/PersonServiceImpl.java → jxjy-system/src/main/java/com/jxjy/system/service/impl/PersonServiceImpl.java
浏览文件 @ 4b595abf
......@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.jxjy.system.mapper.PersonMapper;
import com.jxjy.system.service.DriverSchoolRecordService;
import com.jxjy.system.service.HigherSchoolRecordService;
import com.jxjy.system.service.PersonService;
import com.jxjy.system.service.RecruitService;
import com.jxjy.system.xsnowflake.SnowFlakeFactory;
......@@ -37,11 +35,6 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person> impleme
@Resource
private RecruitService recruitService;
@Resource
private DriverSchoolRecordService driverSchoolRecordService;
@Resource
private HigherSchoolRecordService higherSchoolRecordService;
/**
......@@ -200,48 +193,4 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person> impleme
return personList;
}
@Override
public List<Person> listHigher(int pageNum, int pageSize, Person person) {
//启动分页工具
PageHelper.startPage(pageNum, pageSize);
//创建查询条件
LambdaQueryWrapper<Person> qw = new LambdaQueryWrapper<>();
qw.like(StringUtils.isNotBlank(person.getName()),Person::getName,person.getName())
.eq(Person::getDel,false)
.eq(StringUtils.isNotBlank(person.getBaseCode()),Person::getBaseCode, person.getBaseCode())
.eq(StringUtils.isNotBlank(person.getRecruitTypeId()),Person::getRecruitTypeId, person.getRecruitTypeId())
.like(StringUtils.isNotBlank(person.getRecruitType()),Person::getRecruitType, person.getRecruitType())
.inSql(Person::getId,"SELECT o.person_id from tb_higher_school_record as o where o.del = 0 ")
.orderByDesc(Person::getCreateTime);
List<Person> personList = super.list(qw);
personList.stream().forEach(person1 -> {
person1.setRecordState(higherSchoolRecordService.detailsByPersonId(person1.getId()).getState());
});
//返回查询结果
return personList;
}
@Override
public List<Person> listDriver(int pageNum, int pageSize, Person person) {
//启动分页工具
PageHelper.startPage(pageNum, pageSize);
//创建查询条件
LambdaQueryWrapper<Person> qw = new LambdaQueryWrapper<>();
qw.like(StringUtils.isNotBlank(person.getName()),Person::getName,person.getName())
.eq(Person::getDel,false)
.eq(StringUtils.isNotBlank(person.getBaseCode()),Person::getBaseCode, person.getBaseCode())
.eq(StringUtils.isNotBlank(person.getRecruitTypeId()),Person::getRecruitTypeId, person.getRecruitTypeId())
.like(StringUtils.isNotBlank(person.getRecruitType()),Person::getRecruitType, person.getRecruitType())
.inSql(Person::getId,"SELECT o.person_id from tb_driver_school_record as o where o.del = 0 ")
.orderByDesc(Person::getCreateTime);
List<Person> personList = super.list(qw);
personList.stream().forEach(person1 -> {
person1.setRecordState(driverSchoolRecordService.detailsByPersonId(person1.getId()).getState());
});
return personList;
}
}
jxjy-system/src/main/java/com/jyxz/system/controller/DriverSchoolRecordController.java deleted 100644 → 0
浏览文件 @ da2748df
package com.jxjy.system.controller;
import base.controller.BaseController;
import base.result.BaseResult;
import com.github.pagehelper.PageInfo;
import com.jxjy.system.bean.auth.UserContext;
import com.jxjy.system.service.DriverSchoolRecordService;
import com.jxjy.system.service.PersonService;
import com.jxjy.system.service.RecruitService;
import com.jxjy.system.util.auth.UserUtils;
import data.system.DriverSchoolRecord;
import data.system.Person;
import data.system.Recruit;
import data.system.SignRecord;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @author wangmenglong
* @description: 报名管理
* @date 2023/12/11 11:35
*/
@RestController
@RequestMapping("/driverSchool/record")
public class DriverSchoolRecordController extends BaseController {
@Resource
DriverSchoolRecordService driverSchoolRecordService;
@Resource
PersonService personService;
/**
* @description: 获取报名列表
* @author: wangmenglong
* @date; 2023/12/7 10:07
* @param: [req]
* @return: com.github.pagehelper.PageInfo
**/
@GetMapping("/l")
public BaseResult list(HttpServletRequest req, Person person){
PageInit(req);
UserContext userContext = UserUtils.getUserContext();
List<Person> list = personService.listDriver(pageNum,pageSize,person);
PageInfo<Person> pageInfo = new PageInfo<Person>(list);
return BaseResult.success(pageInfo);
}
/**
* @description: 新增报名
* @author: wangmenglong
* @param: [driverSchoolRecord]
* @return: base.result.BaseResult
**/
@PostMapping("/c")
public BaseResult create(@RequestBody DriverSchoolRecord driverSchoolRecord){
UserContext userContext = UserUtils.getUserContext();
driverSchoolRecord.setUserId(userContext.getUserId());
driverSchoolRecord.setPersonId(userContext.getUserId());
driverSchoolRecord.setBaseCode(userContext.getBaseCode());
//判断是否重复
if(driverSchoolRecordService.isHave(driverSchoolRecord.getPersonId())){
driverSchoolRecordService.del(driverSchoolRecord.getPersonId());
}else {
driverSchoolRecordService.create(driverSchoolRecord);
}
return BaseResult.success("normal_001");
}
/**
* @description: 是否报名
* @author: wangmenglong
* @param: [driverSchoolRecord]
* @return: base.result.BaseResult
**/
@PostMapping("/have")
public BaseResult have(@RequestBody DriverSchoolRecord driverSchoolRecord){
UserContext userContext = UserUtils.getUserContext();
driverSchoolRecord.setUserId(userContext.getUserId());
driverSchoolRecord.setPersonId(userContext.getUserId());
//判断是否重复
if(driverSchoolRecordService.isHave(driverSchoolRecord.getPersonId())){
return BaseResult.success("normal_001","1");
}else {
return BaseResult.success("normal_001","0");
}
}
/**
* @description: 是否报名
* @author: wangmenglong
* @param: [signRecord]
* @return: base.result.BaseResult
**/
@PostMapping("/update/state")
public BaseResult updateState(@RequestBody SignRecord signRecord){
driverSchoolRecordService.updateState(signRecord.getId());
return BaseResult.success("normal_001");
}
}
jxjy-system/src/main/java/com/jyxz/system/controller/HigherSchoolRecordController.java deleted 100644 → 0
浏览文件 @ da2748df
package com.jxjy.system.controller;
import base.controller.BaseController;
import base.result.BaseResult;
import com.github.pagehelper.PageInfo;
import com.jxjy.system.bean.auth.UserContext;
import com.jxjy.system.service.PersonService;
import com.jxjy.system.service.RecruitService;
import com.jxjy.system.service.HigherSchoolRecordService;
import com.jxjy.system.util.auth.UserUtils;
import data.system.Person;
import data.system.Recruit;
import data.system.HigherSchoolRecord;
import data.system.SignRecord;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @author wangmenglong
* @description: 报名管理
* @date 2023/12/11 11:35
*/
@RestController
@RequestMapping("/higherSchool/record")
public class HigherSchoolRecordController extends BaseController {
@Resource
HigherSchoolRecordService higherSchoolRecordService;
@Resource
PersonService personService;
/**
* @description: 获取报名列表
* @author: wangmenglong
* @date; 2023/12/7 10:07
* @param: [req]
* @return: com.github.pagehelper.PageInfo
**/
@GetMapping("/l")
public BaseResult list(HttpServletRequest req, Person person){
PageInit(req);
UserContext userContext = UserUtils.getUserContext();
List<Person> list = personService.listHigher(pageNum,pageSize,person);
PageInfo<Person> pageInfo = new PageInfo<Person>(list);
return BaseResult.success(pageInfo);
}
/**
* @description: 新增报名
* @author: wangmenglong
* @param: [higherSchoolRecord]
* @return: base.result.BaseResult
**/
@PostMapping("/c")
public BaseResult create(@RequestBody HigherSchoolRecord higherSchoolRecord){
UserContext userContext = UserUtils.getUserContext();
higherSchoolRecord.setUserId(userContext.getUserId());
higherSchoolRecord.setPersonId(userContext.getUserId());
higherSchoolRecord.setBaseCode(userContext.getBaseCode());
//判断是否重复
if(higherSchoolRecordService.isHave(higherSchoolRecord.getPersonId())){
higherSchoolRecordService.del(higherSchoolRecord.getPersonId());
}else {
higherSchoolRecordService.create(higherSchoolRecord);
}
return BaseResult.success("normal_001");
}
/**
* @description: 是否报名
* @author: wangmenglong
* @param: [higherSchoolRecord]
* @return: base.result.BaseResult
**/
@PostMapping("/have")
public BaseResult have(@RequestBody HigherSchoolRecord higherSchoolRecord){
UserContext userContext = UserUtils.getUserContext();
higherSchoolRecord.setUserId(userContext.getUserId());
higherSchoolRecord.setPersonId(userContext.getUserId());
//判断是否重复
if(higherSchoolRecordService.isHave(higherSchoolRecord.getPersonId())){
return BaseResult.success("normal_001","1");
}else {
return BaseResult.success("normal_001","0");
}
}
/**
* @description: 是否报名
* @author: wangmenglong
* @param: [signRecord]
* @return: base.result.BaseResult
**/
@PostMapping("/update/state")
public BaseResult updateState(@RequestBody SignRecord signRecord){
higherSchoolRecordService.updateState(signRecord.getId());
return BaseResult.success("normal_001");
}
}
jxjy-system/src/main/java/com/jyxz/system/mapper/DriverSchoolRecordMapper.java deleted 100644 → 0
浏览文件 @ da2748df
package com.jxjy.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import data.system.DriverSchoolRecord;
/**
* @Author: wml
* @Date 2025/5/9 10:21
*/
public interface DriverSchoolRecordMapper extends BaseMapper<DriverSchoolRecord> {
}
jxjy-system/src/main/java/com/jyxz/system/mapper/HigherSchoolRecordMapper.java deleted 100644 → 0
浏览文件 @ da2748df
package com.jxjy.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import data.system.HigherSchoolRecord;
/**
* @Author: wml
* @Date 2025/5/9 10:21
*/
public interface HigherSchoolRecordMapper extends BaseMapper<HigherSchoolRecord> {
}
jxjy-system/src/main/java/com/jyxz/system/service/DriverSchoolRecordService.java deleted 100644 → 0
浏览文件 @ da2748df
package com.jxjy.system.service;
import data.system.DriverSchoolRecord;
import data.system.HigherSchoolRecord;
/**
* @return: 报名记录
* @Author: wml
* @Date 2025/5/9 10:20
*/
public interface DriverSchoolRecordService {
String create(DriverSchoolRecord driverSchoolRecord);
boolean del(String personId);
boolean isHave(String id);
boolean updateState(String id);
DriverSchoolRecord detailsByPersonId(String personId);
}
jxjy-system/src/main/java/com/jyxz/system/service/HigherSchoolRecordService.java deleted 100644 → 0
浏览文件 @ da2748df
package com.jxjy.system.service;
import data.system.HigherSchoolRecord;
/**
* @return: 报名记录
* @Author: wml
* @Date 2025/5/9 10:20
*/
public interface HigherSchoolRecordService {
String create(HigherSchoolRecord higherSchoolRecord);
boolean del(String personId);
boolean isHave(String id);
boolean updateState(String id);
HigherSchoolRecord detailsByPersonId(String personId);
}
jxjy-system/src/main/java/com/jyxz/system/service/impl/DriverSchoolRecordServiceImpl.java deleted 100644 → 0
浏览文件 @ da2748df
package com.jxjy.system.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jxjy.system.mapper.DriverSchoolRecordMapper;
import com.jxjy.system.service.DriverSchoolRecordService;
import com.jxjy.system.xsnowflake.SnowFlakeFactory;
import data.system.DriverSchoolRecord;
import data.system.HigherSchoolRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
*
* @return: 报名管理
* @Author: wml
* @Date 2025/5/9 10:22
*/
@Service
@Transactional
public class DriverSchoolRecordServiceImpl extends ServiceImpl<DriverSchoolRecordMapper, DriverSchoolRecord> implements DriverSchoolRecordService {
@Autowired
SnowFlakeFactory snowFlakeFactory;
/**
* @description: 新增报名
* @author: wangmenglong
* @date; 2023/12/11 16:51
* @param: [driverSchoolRecord]
* @return: boolean
**/
@Override
public String create(DriverSchoolRecord driverSchoolRecord) {
driverSchoolRecord.setId(snowFlakeFactory.nextId());
driverSchoolRecord.setDel(false);
driverSchoolRecord.setCreateTime(DateUtil.now());
driverSchoolRecord.setState("new");
super.save(driverSchoolRecord);
return driverSchoolRecord.getId();
}
/**
* @description: 删除报名
* @author: wangmenglong
* @date; 2023/12/11 17:06
* @param: [id]
* @return: boolean
**/
@Override
public boolean del(String personId) {
if(StringUtils.isBlank(personId)){
return false;
}
LambdaUpdateWrapper<DriverSchoolRecord> qw = new LambdaUpdateWrapper<>();
qw.eq(DriverSchoolRecord::getPersonId,personId)
.set(DriverSchoolRecord::getDel,true)
.set(DriverSchoolRecord::getDelTime, DateUtil.now());
return super.update(qw);
}
/**
* @author: wangmenglong
* @date; 2024/1/2 14:30
* @description: 判断是否存在
* @param: [account, id]
* @return: boolean
**/
@Override
public boolean isHave(String personId) {
LambdaQueryWrapper<DriverSchoolRecord> qw = new LambdaQueryWrapper<>();
qw.eq(DriverSchoolRecord::getDel,false)
.eq(DriverSchoolRecord::getPersonId, personId);
return super.count(qw)>0;
}
/**
* @author: wangmenglong
* @date; 2024/1/2 14:30
* @description: 修改状态
* @param: [account, id]
* @return: boolean
**/
@Override
public boolean updateState(String id) {
LambdaUpdateWrapper<DriverSchoolRecord> qw = new LambdaUpdateWrapper<>();
qw.eq(DriverSchoolRecord::getDel,false)
.eq(DriverSchoolRecord::getUserId, id)
.set(DriverSchoolRecord::getState, "revisit");
return super.update(qw);
}
/**
* @author: wangmenglong
* @date; 2024/1/2 14:30
* @description: 修改状态
* @param: [account, id]
* @return: boolean
**/
@Override
public DriverSchoolRecord detailsByPersonId(String personId) {
//根据人员id查出来最后一条数据
LambdaQueryWrapper<DriverSchoolRecord> qw = new LambdaQueryWrapper<>();
qw.eq(DriverSchoolRecord::getDel,false)
.eq(DriverSchoolRecord::getPersonId, personId)
.orderByDesc(DriverSchoolRecord::getCreateTime)
.last("limit 1");
return super.getOne(qw);
}
}
jxjy-system/src/main/java/com/jyxz/system/service/impl/HigherSchoolRecordServiceImpl.java deleted 100644 → 0
浏览文件 @ da2748df
package com.jxjy.system.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jxjy.system.mapper.HigherSchoolRecordMapper;
import com.jxjy.system.service.HigherSchoolRecordService;
import com.jxjy.system.xsnowflake.SnowFlakeFactory;
import data.system.HigherSchoolRecord;
import data.system.SignRecord;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
*
* @return: 报名管理
* @Author: wml
* @Date 2025/5/9 10:22
*/
@Service
@Transactional
public class HigherSchoolRecordServiceImpl extends ServiceImpl<HigherSchoolRecordMapper, HigherSchoolRecord> implements HigherSchoolRecordService {
@Autowired
SnowFlakeFactory snowFlakeFactory;
/**
* @description: 新增报名
* @author: wangmenglong
* @date; 2023/12/11 16:51
* @param: [higherSchoolRecord]
* @return: boolean
**/
@Override
public String create(HigherSchoolRecord higherSchoolRecord) {
higherSchoolRecord.setId(snowFlakeFactory.nextId());
higherSchoolRecord.setDel(false);
higherSchoolRecord.setCreateTime(DateUtil.now());
higherSchoolRecord.setState("new");
super.save(higherSchoolRecord);
return higherSchoolRecord.getId();
}
/**
* @description: 删除报名
* @author: wangmenglong
* @date; 2023/12/11 17:06
* @param: [id]
* @return: boolean
**/
@Override
public boolean del(String personId) {
if(StringUtils.isBlank(personId)){
return false;
}
LambdaUpdateWrapper<HigherSchoolRecord> qw = new LambdaUpdateWrapper<>();
qw.eq(HigherSchoolRecord::getPersonId,personId)
.set(HigherSchoolRecord::getDel,true)
.set(HigherSchoolRecord::getDelTime, DateUtil.now());
return super.update(qw);
}
/**
* @author: wangmenglong
* @date; 2024/1/2 14:30
* @description: 判断是否存在
* @param: [account, id]
* @return: boolean
**/
@Override
public boolean isHave(String personId) {
LambdaQueryWrapper<HigherSchoolRecord> qw = new LambdaQueryWrapper<>();
qw.eq(HigherSchoolRecord::getDel,false)
.eq(HigherSchoolRecord::getPersonId, personId);
return super.count(qw)>0;
}
/**
* @author: wangmenglong
* @date; 2024/1/2 14:30
* @description: 修改状态
* @param: [account, id]
* @return: boolean
**/
@Override
public boolean updateState(String id) {
LambdaUpdateWrapper<HigherSchoolRecord> qw = new LambdaUpdateWrapper<>();
qw.eq(HigherSchoolRecord::getDel,false)
.eq(HigherSchoolRecord::getUserId, id)
.set(HigherSchoolRecord::getState, "revisit");
return super.update(qw);
}
/**
* @author: wangmenglong
* @date; 2024/1/2 14:30
* @description: 修改状态
* @param: [account, id]
* @return: boolean
**/
@Override
public HigherSchoolRecord detailsByPersonId(String personId) {
//根据人员id查出来最后一条数据
LambdaQueryWrapper<HigherSchoolRecord> qw = new LambdaQueryWrapper<>();
qw.eq(HigherSchoolRecord::getDel,false)
.eq(HigherSchoolRecord::getPersonId, personId)
.orderByDesc(HigherSchoolRecord::getCreateTime)
.last("limit 1");
return super.getOne(qw);
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论