首次提交

jxjy-lib/src/main/java/data/system/DriverSchoolRecord.java

-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

-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

@@ -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

@@ -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

@@ -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;
-    }
 }