更名、修复测试部署时的报错和bug

src/main/java/cn/soul2/jyjc/admin/JavaJyjcAdminApplication.java

@@ -1,15 +1,19 @@
-package cn.soul2.demo;
+package cn.soul2.jyjc.admin;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+/**
+ * @author Soul2
+ * @date 2024-03-17
+ */
 @SpringBootApplication
-@MapperScan("cn.soul2.demo.mapper")
-public class JavaDemoApplication {
+@MapperScan("cn.soul2.jyjc.admin.mapper")
+public class JavaJyjcAdminApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(JavaDemoApplication.class, args);
+        SpringApplication.run(JavaJyjcAdminApplication.class, args);
     }
 
 }

src/main/java/cn/soul2/jyjc/admin/codemessage/BackCodeMessage.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.codemessage;
+package cn.soul2.jyjc.admin.codemessage;
 
 /**
  * @author Soul2

src/main/java/cn/soul2/jyjc/admin/config/BeanConfig.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.config;
+package cn.soul2.jyjc.admin.config;
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;

src/main/java/cn/soul2/jyjc/admin/config/CorsConfig.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.config;
+package cn.soul2.jyjc.admin.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

src/main/java/cn/soul2/jyjc/admin/config/MetaObjectHandlerConfig.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.config;
+package cn.soul2.jyjc.admin.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;

src/main/java/cn/soul2/jyjc/admin/controller/DemoController.java

@@ -1,11 +1,11 @@
-package cn.soul2.demo.controller;
-
-import cn.soul2.demo.dto.DemoDTO;
-import cn.soul2.demo.dto.DemoSaveOrUpdateDTO;
-import cn.soul2.demo.service.IDemoService;
-import cn.soul2.demo.vo.DemoVO;
-import cn.soul2.demo.vo.base.Back;
-import cn.soul2.demo.vo.base.VPage;
+package cn.soul2.jyjc.admin.controller;
+
+import cn.soul2.jyjc.admin.dto.DemoDTO;
+import cn.soul2.jyjc.admin.dto.DemoSaveOrUpdateDTO;
+import cn.soul2.jyjc.admin.service.IDemoService;
+import cn.soul2.jyjc.admin.vo.DemoVO;
+import cn.soul2.jyjc.admin.vo.base.Back;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/cn/soul2/jyjc/admin/controller/ExternalBackhaulController.java

@@ -1,8 +1,8 @@
-package cn.soul2.demo.controller;
+package cn.soul2.jyjc.admin.controller;
 
-import cn.soul2.demo.repository.IExternalBackhaulRepository;
-import cn.soul2.demo.utils.base.BackUtils;
-import cn.soul2.demo.vo.base.Back;
+import cn.soul2.jyjc.admin.repository.IExternalBackhaulRepository;
+import cn.soul2.jyjc.admin.utils.base.BackUtils;
+import cn.soul2.jyjc.admin.vo.base.Back;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/soul2/jyjc/admin/controller/QrController.java

@@ -1,13 +1,13 @@
-package cn.soul2.demo.controller;
-
-import cn.soul2.demo.dto.QrDTO;
-import cn.soul2.demo.entity.QrDO;
-import cn.soul2.demo.repository.IQrRepository;
-import cn.soul2.demo.utils.base.BackUtils;
-import cn.soul2.demo.utils.base.PageUtils;
-import cn.soul2.demo.vo.QrVO;
-import cn.soul2.demo.vo.base.Back;
-import cn.soul2.demo.vo.base.VPage;
+package cn.soul2.jyjc.admin.controller;
+
+import cn.soul2.jyjc.admin.dto.QrDTO;
+import cn.soul2.jyjc.admin.entity.QrDO;
+import cn.soul2.jyjc.admin.repository.IQrRepository;
+import cn.soul2.jyjc.admin.utils.base.BackUtils;
+import cn.soul2.jyjc.admin.utils.base.PageUtils;
+import cn.soul2.jyjc.admin.vo.QrVO;
+import cn.soul2.jyjc.admin.vo.base.Back;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/soul2/jyjc/admin/controller/QuestionnaireController.java

@@ -1,14 +1,14 @@
-package cn.soul2.demo.controller;
-
-import cn.soul2.demo.dto.QnSubjectRefSaveDTO;
-import cn.soul2.demo.dto.QuestionnaireDTO;
-import cn.soul2.demo.dto.base.UpdateStatusDTO;
-import cn.soul2.demo.repository.IQuestionnaireRepository;
-import cn.soul2.demo.repository.IRefQuestionnaireSubjectRepository;
-import cn.soul2.demo.utils.base.BackUtils;
-import cn.soul2.demo.vo.QuestionnaireVO;
-import cn.soul2.demo.vo.base.Back;
-import cn.soul2.demo.vo.base.VPage;
+package cn.soul2.jyjc.admin.controller;
+
+import cn.soul2.jyjc.admin.dto.QnSubjectRefSaveDTO;
+import cn.soul2.jyjc.admin.dto.QuestionnaireDTO;
+import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO;
+import cn.soul2.jyjc.admin.repository.IQuestionnaireRepository;
+import cn.soul2.jyjc.admin.repository.IRefQuestionnaireSubjectRepository;
+import cn.soul2.jyjc.admin.utils.base.BackUtils;
+import cn.soul2.jyjc.admin.vo.QuestionnaireVO;
+import cn.soul2.jyjc.admin.vo.base.Back;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/cn/soul2/jyjc/admin/controller/SubjectController.java

@@ -1,18 +1,18 @@
-package cn.soul2.demo.controller;
+package cn.soul2.jyjc.admin.controller;
 
-import cn.soul2.demo.dto.QnSubjectRefItemDTO;
-import cn.soul2.demo.dto.SubjectDTO;
-import cn.soul2.demo.dto.base.UpdateStatusDTO;
-import cn.soul2.demo.entity.SubjectItemsDO;
-import cn.soul2.demo.entity.sqlresult.SubjectChooseListDO;
-import cn.soul2.demo.repository.IRefSubjectItemsRepository;
-import cn.soul2.demo.repository.ISubjectItemsRepository;
-import cn.soul2.demo.repository.ISubjectRepository;
-import cn.soul2.demo.utils.base.BackUtils;
-import cn.soul2.demo.vo.SubjectItemVO;
-import cn.soul2.demo.vo.SubjectVO;
-import cn.soul2.demo.vo.base.Back;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.QnSubjectRefItemDTO;
+import cn.soul2.jyjc.admin.dto.SubjectDTO;
+import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO;
+import cn.soul2.jyjc.admin.entity.SubjectItemsDO;
+import cn.soul2.jyjc.admin.entity.sqlresult.SubjectChooseListDO;
+import cn.soul2.jyjc.admin.repository.IRefSubjectItemsRepository;
+import cn.soul2.jyjc.admin.repository.ISubjectItemsRepository;
+import cn.soul2.jyjc.admin.repository.ISubjectRepository;
+import cn.soul2.jyjc.admin.utils.base.BackUtils;
+import cn.soul2.jyjc.admin.vo.SubjectItemVO;
+import cn.soul2.jyjc.admin.vo.SubjectVO;
+import cn.soul2.jyjc.admin.vo.base.Back;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/soul2/jyjc/admin/dto/AnswerDetailsSaveDTO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/dto/AnswerPageQueryDTO.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
-import cn.soul2.demo.dto.base.PageParams;
+import cn.soul2.jyjc.admin.dto.base.PageParams;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

src/main/java/cn/soul2/jyjc/admin/dto/AnswerSheetSaveDTO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/dto/DemoDTO.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
-import cn.soul2.demo.dto.base.PageParams;
+import cn.soul2.jyjc.admin.dto.base.PageParams;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

src/main/java/cn/soul2/jyjc/admin/dto/DemoSaveOrUpdateDTO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/cn/soul2/jyjc/admin/dto/ExternalBackhaulDTO.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
-import cn.soul2.demo.dto.base.PageParams;
+import cn.soul2.jyjc.admin.dto.base.PageParams;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

src/main/java/cn/soul2/jyjc/admin/dto/QnSubjectRefItemDTO.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
-import cn.soul2.demo.dto.base.PageParams;
+import cn.soul2.jyjc.admin.dto.base.PageParams;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

src/main/java/cn/soul2/jyjc/admin/dto/QnSubjectRefSaveDTO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/dto/QrDTO.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
-import cn.soul2.demo.dto.base.PageParams;
+import cn.soul2.jyjc.admin.dto.base.PageParams;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/dto/QuestionnaireDTO.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
-import cn.soul2.demo.dto.base.PageParams;
+import cn.soul2.jyjc.admin.dto.base.PageParams;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/dto/SubjectDTO.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
-import cn.soul2.demo.dto.base.PageParams;
+import cn.soul2.jyjc.admin.dto.base.PageParams;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

src/main/java/cn/soul2/jyjc/admin/dto/SubjectItemDTO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/dto/SubjectItemRefDTO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.dto;
+package cn.soul2.jyjc.admin.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/dto/base/PageParams.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.dto.base;
+package cn.soul2.jyjc.admin.dto.base;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/dto/base/UpdateStatusDTO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.dto.base;
+package cn.soul2.jyjc.admin.dto.base;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/entity/AnswerDetailsDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/AnswerSheetDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/DataTableDemoDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/ExternalBackhaulDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/QrDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/QuestionnaireDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/RefQuestionnaireSubjectDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/RefSubjectItemsDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/SubjectDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/SubjectItemsDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity;
+package cn.soul2.jyjc.admin.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/cn/soul2/jyjc/admin/entity/sqlresult/RefQuestionnaireSubjectUseCountDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity.sqlresult;
+package cn.soul2.jyjc.admin.entity.sqlresult;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/entity/sqlresult/SubjectChooseListDO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.entity.sqlresult;
+package cn.soul2.jyjc.admin.entity.sqlresult;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/mapper/AnswerDetailsMapper.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.AnswerDetailsDO;
+import cn.soul2.jyjc.admin.entity.AnswerDetailsDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/cn/soul2/jyjc/admin/mapper/AnswerSheetMapper.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.AnswerSheetDO;
+import cn.soul2.jyjc.admin.entity.AnswerSheetDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/cn/soul2/jyjc/admin/mapper/DataTableDemoMapper.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.DataTableDemoDO;
+import cn.soul2.jyjc.admin.entity.DataTableDemoDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/cn/soul2/jyjc/admin/mapper/ExternalBackhaulMapper.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.ExternalBackhaulDO;
+import cn.soul2.jyjc.admin.entity.ExternalBackhaulDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/cn/soul2/jyjc/admin/mapper/QrMapper.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.QrDO;
+import cn.soul2.jyjc.admin.entity.QrDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/cn/soul2/jyjc/admin/mapper/QuestionnaireMapper.java

@@ -1,7 +1,7 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.QuestionnaireDO;
-import cn.soul2.demo.vo.QuestionnaireVO;
+import cn.soul2.jyjc.admin.entity.QuestionnaireDO;
+import cn.soul2.jyjc.admin.vo.QuestionnaireVO;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,7 +26,7 @@ public interface QuestionnaireMapper extends BaseMapper<QuestionnaireDO> {
      * @param wrapper 查询条件
      * @return {@link IPage}<{@link QuestionnaireVO}>
      */
-    @Select("select a.*, IFNULL(r.has_subject_count,0) as has_subject_count from (SELECT * FROM tb_questionnaire WHERE removed=0) a left join (select qn_id, count(subject_id) as has_subject_count from tb_ref_questionnaire_subject WHERE removed=0) r on a.id=r.qn_id " +
+    @Select("select a.*, IFNULL(r.has_subject_count,0) as has_subject_count from (SELECT * FROM tb_questionnaire WHERE removed=0) a left join (select max(qn_id) as qn_id, count(subject_id) as has_subject_count from tb_ref_questionnaire_subject WHERE removed=0) r on a.id=r.qn_id " +
             "${ew.customSqlSegment}")
     IPage<QuestionnaireVO> page(IPage<QuestionnaireDO> page, @Param(Constants.WRAPPER) Wrapper wrapper);
 

src/main/java/cn/soul2/jyjc/admin/mapper/RefQuestionnaireSubjectMapper.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.RefQuestionnaireSubjectDO;
+import cn.soul2.jyjc.admin.entity.RefQuestionnaireSubjectDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/cn/soul2/jyjc/admin/mapper/RefSubjectItemsMapper.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.RefSubjectItemsDO;
+import cn.soul2.jyjc.admin.entity.RefSubjectItemsDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/cn/soul2/jyjc/admin/mapper/SubjectItemsMapper.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.SubjectItemsDO;
+import cn.soul2.jyjc.admin.entity.SubjectItemsDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/cn/soul2/jyjc/admin/mapper/SubjectMapper.java

@@ -1,7 +1,7 @@
-package cn.soul2.demo.mapper;
+package cn.soul2.jyjc.admin.mapper;
 
-import cn.soul2.demo.entity.SubjectDO;
-import cn.soul2.demo.entity.sqlresult.SubjectChooseListDO;
+import cn.soul2.jyjc.admin.entity.SubjectDO;
+import cn.soul2.jyjc.admin.entity.sqlresult.SubjectChooseListDO;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -27,7 +27,7 @@ public interface SubjectMapper extends BaseMapper<SubjectDO> {
      * @param qnId    问卷id
      * @return {@link IPage}<{@link SubjectChooseListDO}>
      */
-    @Select("select a.id, ifnull(r.use_count, 0) as use_count, a.content, a.sort, a.title, a.type, (CASE WHEN EXISTS (SELECT 1 FROM tb_ref_questionnaire_subject WHERE removed = 0 and qn_id = #{qnId} AND subject_id = a.id) THEN 1 ELSE 0 END) AS selected from (select * from tb_subject WHERE removed = 0) a left join (select subject_id, count(qn_id) as use_count from tb_ref_questionnaire_subject WHERE removed = 0) r on a.id=r.subject_id " +
+    @Select("select a.id, ifnull(r.use_count, 0) as use_count, a.content, a.sort, a.title, a.type, (CASE WHEN EXISTS (SELECT 1 FROM tb_ref_questionnaire_subject WHERE removed = 0 and qn_id = #{qnId} AND subject_id = a.id) THEN 1 ELSE 0 END) AS selected from (select * from tb_subject WHERE removed = 0) a left join (select min(subject_id) subject_id, count(qn_id) as use_count from tb_ref_questionnaire_subject WHERE removed = 0) r on a.id=r.subject_id " +
             "${ew.customSqlSegment}")
     IPage<SubjectChooseListDO> useCounts(IPage<SubjectChooseListDO> page, @Param(Constants.WRAPPER) Wrapper wrapper, String qnId);
 

src/main/java/cn/soul2/jyjc/admin/repository/IAnswerDetailsRepository.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.entity.AnswerDetailsDO;
+import cn.soul2.jyjc.admin.entity.AnswerDetailsDO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;

src/main/java/cn/soul2/jyjc/admin/repository/IAnswerSheetRepository.java

@@ -1,9 +1,9 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.dto.AnswerPageQueryDTO;
-import cn.soul2.demo.entity.AnswerSheetDO;
-import cn.soul2.demo.vo.AnswerSheetVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.AnswerPageQueryDTO;
+import cn.soul2.jyjc.admin.entity.AnswerSheetDO;
+import cn.soul2.jyjc.admin.vo.AnswerSheetVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;

src/main/java/cn/soul2/jyjc/admin/repository/IDataTableDemoRepository.java

@@ -1,9 +1,9 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.dto.DemoDTO;
-import cn.soul2.demo.dto.DemoSaveOrUpdateDTO;
-import cn.soul2.demo.entity.DataTableDemoDO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.DemoDTO;
+import cn.soul2.jyjc.admin.dto.DemoSaveOrUpdateDTO;
+import cn.soul2.jyjc.admin.entity.DataTableDemoDO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;

src/main/java/cn/soul2/jyjc/admin/repository/IExternalBackhaulRepository.java

@@ -1,9 +1,9 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.dto.ExternalBackhaulDTO;
-import cn.soul2.demo.entity.ExternalBackhaulDO;
-import cn.soul2.demo.vo.ExternalBackhaulVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.ExternalBackhaulDTO;
+import cn.soul2.jyjc.admin.entity.ExternalBackhaulDO;
+import cn.soul2.jyjc.admin.vo.ExternalBackhaulVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 

src/main/java/cn/soul2/jyjc/admin/repository/IQrRepository.java

@@ -1,9 +1,9 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.dto.QrDTO;
-import cn.soul2.demo.entity.QrDO;
-import cn.soul2.demo.vo.QrVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.QrDTO;
+import cn.soul2.jyjc.admin.entity.QrDO;
+import cn.soul2.jyjc.admin.vo.QrVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;

src/main/java/cn/soul2/jyjc/admin/repository/IQuestionnaireRepository.java

@@ -1,10 +1,10 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.dto.QuestionnaireDTO;
-import cn.soul2.demo.dto.base.UpdateStatusDTO;
-import cn.soul2.demo.entity.QuestionnaireDO;
-import cn.soul2.demo.vo.QuestionnaireVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.QuestionnaireDTO;
+import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO;
+import cn.soul2.jyjc.admin.entity.QuestionnaireDO;
+import cn.soul2.jyjc.admin.vo.QuestionnaireVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/cn/soul2/jyjc/admin/repository/IRefQuestionnaireSubjectRepository.java

@@ -1,8 +1,8 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.dto.QnSubjectRefSaveDTO;
-import cn.soul2.demo.entity.RefQuestionnaireSubjectDO;
-import cn.soul2.demo.entity.SubjectDO;
+import cn.soul2.jyjc.admin.dto.QnSubjectRefSaveDTO;
+import cn.soul2.jyjc.admin.entity.RefQuestionnaireSubjectDO;
+import cn.soul2.jyjc.admin.entity.SubjectDO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;

src/main/java/cn/soul2/jyjc/admin/repository/IRefSubjectItemsRepository.java

@@ -1,8 +1,8 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.dto.SubjectItemRefDTO;
-import cn.soul2.demo.entity.RefSubjectItemsDO;
-import cn.soul2.demo.entity.SubjectItemsDO;
+import cn.soul2.jyjc.admin.dto.SubjectItemRefDTO;
+import cn.soul2.jyjc.admin.entity.RefSubjectItemsDO;
+import cn.soul2.jyjc.admin.entity.SubjectItemsDO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;

src/main/java/cn/soul2/jyjc/admin/repository/ISubjectItemsRepository.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.entity.SubjectItemsDO;
+import cn.soul2.jyjc.admin.entity.SubjectItemsDO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;

src/main/java/cn/soul2/jyjc/admin/repository/ISubjectRepository.java

@@ -1,12 +1,12 @@
-package cn.soul2.demo.repository;
+package cn.soul2.jyjc.admin.repository;
 
-import cn.soul2.demo.dto.QnSubjectRefItemDTO;
-import cn.soul2.demo.dto.SubjectDTO;
-import cn.soul2.demo.dto.base.UpdateStatusDTO;
-import cn.soul2.demo.entity.SubjectDO;
-import cn.soul2.demo.entity.sqlresult.SubjectChooseListDO;
-import cn.soul2.demo.vo.SubjectVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.QnSubjectRefItemDTO;
+import cn.soul2.jyjc.admin.dto.SubjectDTO;
+import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO;
+import cn.soul2.jyjc.admin.entity.SubjectDO;
+import cn.soul2.jyjc.admin.entity.sqlresult.SubjectChooseListDO;
+import cn.soul2.jyjc.admin.vo.SubjectVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;

src/main/java/cn/soul2/jyjc/admin/repository/impl/AnswerDetailsRepositoryImpl.java

@@ -1,8 +1,8 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.entity.AnswerDetailsDO;
-import cn.soul2.demo.mapper.AnswerDetailsMapper;
-import cn.soul2.demo.repository.IAnswerDetailsRepository;
+import cn.soul2.jyjc.admin.entity.AnswerDetailsDO;
+import cn.soul2.jyjc.admin.mapper.AnswerDetailsMapper;
+import cn.soul2.jyjc.admin.repository.IAnswerDetailsRepository;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

src/main/java/cn/soul2/jyjc/admin/repository/impl/AnswerSheetRepositoryImpl.java

@@ -1,19 +1,19 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.dto.AnswerPageQueryDTO;
-import cn.soul2.demo.entity.AnswerDetailsDO;
-import cn.soul2.demo.entity.AnswerSheetDO;
-import cn.soul2.demo.entity.QrDO;
-import cn.soul2.demo.entity.QuestionnaireDO;
-import cn.soul2.demo.mapper.AnswerSheetMapper;
-import cn.soul2.demo.repository.IAnswerDetailsRepository;
-import cn.soul2.demo.repository.IAnswerSheetRepository;
-import cn.soul2.demo.repository.IQrRepository;
-import cn.soul2.demo.repository.IQuestionnaireRepository;
-import cn.soul2.demo.utils.base.PageUtils;
-import cn.soul2.demo.vo.AnswerDetailsVO;
-import cn.soul2.demo.vo.AnswerSheetVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.AnswerPageQueryDTO;
+import cn.soul2.jyjc.admin.entity.AnswerDetailsDO;
+import cn.soul2.jyjc.admin.entity.AnswerSheetDO;
+import cn.soul2.jyjc.admin.entity.QrDO;
+import cn.soul2.jyjc.admin.entity.QuestionnaireDO;
+import cn.soul2.jyjc.admin.mapper.AnswerSheetMapper;
+import cn.soul2.jyjc.admin.repository.IAnswerDetailsRepository;
+import cn.soul2.jyjc.admin.repository.IAnswerSheetRepository;
+import cn.soul2.jyjc.admin.repository.IQrRepository;
+import cn.soul2.jyjc.admin.repository.IQuestionnaireRepository;
+import cn.soul2.jyjc.admin.utils.base.PageUtils;
+import cn.soul2.jyjc.admin.vo.AnswerDetailsVO;
+import cn.soul2.jyjc.admin.vo.AnswerSheetVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

src/main/java/cn/soul2/jyjc/admin/repository/impl/DataTableDemoRepositoryImpl.java

@@ -1,12 +1,12 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.dto.DemoDTO;
-import cn.soul2.demo.dto.DemoSaveOrUpdateDTO;
-import cn.soul2.demo.entity.DataTableDemoDO;
-import cn.soul2.demo.mapper.DataTableDemoMapper;
-import cn.soul2.demo.repository.IDataTableDemoRepository;
-import cn.soul2.demo.utils.base.PageUtils;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.DemoDTO;
+import cn.soul2.jyjc.admin.dto.DemoSaveOrUpdateDTO;
+import cn.soul2.jyjc.admin.entity.DataTableDemoDO;
+import cn.soul2.jyjc.admin.mapper.DataTableDemoMapper;
+import cn.soul2.jyjc.admin.repository.IDataTableDemoRepository;
+import cn.soul2.jyjc.admin.utils.base.PageUtils;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

src/main/java/cn/soul2/jyjc/admin/repository/impl/ExternalBackhaulRepositoryImpl.java

@@ -1,12 +1,12 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.dto.ExternalBackhaulDTO;
-import cn.soul2.demo.entity.ExternalBackhaulDO;
-import cn.soul2.demo.mapper.ExternalBackhaulMapper;
-import cn.soul2.demo.repository.IExternalBackhaulRepository;
-import cn.soul2.demo.utils.base.PageUtils;
-import cn.soul2.demo.vo.ExternalBackhaulVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.ExternalBackhaulDTO;
+import cn.soul2.jyjc.admin.entity.ExternalBackhaulDO;
+import cn.soul2.jyjc.admin.mapper.ExternalBackhaulMapper;
+import cn.soul2.jyjc.admin.repository.IExternalBackhaulRepository;
+import cn.soul2.jyjc.admin.utils.base.PageUtils;
+import cn.soul2.jyjc.admin.vo.ExternalBackhaulVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

src/main/java/cn/soul2/jyjc/admin/repository/impl/QrRepositoryImpl.java

@@ -1,12 +1,12 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.dto.QrDTO;
-import cn.soul2.demo.entity.QrDO;
-import cn.soul2.demo.mapper.QrMapper;
-import cn.soul2.demo.repository.IQrRepository;
-import cn.soul2.demo.utils.base.PageUtils;
-import cn.soul2.demo.vo.QrVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.QrDTO;
+import cn.soul2.jyjc.admin.entity.QrDO;
+import cn.soul2.jyjc.admin.mapper.QrMapper;
+import cn.soul2.jyjc.admin.repository.IQrRepository;
+import cn.soul2.jyjc.admin.utils.base.PageUtils;
+import cn.soul2.jyjc.admin.vo.QrVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

src/main/java/cn/soul2/jyjc/admin/repository/impl/QuestionnaireRepositoryImpl.java

@@ -1,13 +1,13 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.dto.QuestionnaireDTO;
-import cn.soul2.demo.dto.base.UpdateStatusDTO;
-import cn.soul2.demo.entity.QuestionnaireDO;
-import cn.soul2.demo.mapper.QuestionnaireMapper;
-import cn.soul2.demo.repository.IQuestionnaireRepository;
-import cn.soul2.demo.utils.base.PageUtils;
-import cn.soul2.demo.vo.QuestionnaireVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.QuestionnaireDTO;
+import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO;
+import cn.soul2.jyjc.admin.entity.QuestionnaireDO;
+import cn.soul2.jyjc.admin.mapper.QuestionnaireMapper;
+import cn.soul2.jyjc.admin.repository.IQuestionnaireRepository;
+import cn.soul2.jyjc.admin.utils.base.PageUtils;
+import cn.soul2.jyjc.admin.vo.QuestionnaireVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -57,7 +57,7 @@ public class QuestionnaireRepositoryImpl extends ServiceImpl<QuestionnaireMapper
     public Boolean saveOrUpdate(QuestionnaireDTO dto) {
         QuestionnaireDO entity = new QuestionnaireDO();
         BeanUtils.copyProperties(dto, entity);
-        return super.save(entity);
+        return super.saveOrUpdate(entity);
     }
 
     @Override

src/main/java/cn/soul2/jyjc/admin/repository/impl/RefQuestionnaireSubjectRepositoryImpl.java

@@ -1,11 +1,11 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.dto.QnSubjectRefSaveDTO;
-import cn.soul2.demo.entity.RefQuestionnaireSubjectDO;
-import cn.soul2.demo.entity.SubjectDO;
-import cn.soul2.demo.mapper.RefQuestionnaireSubjectMapper;
-import cn.soul2.demo.repository.IRefQuestionnaireSubjectRepository;
-import cn.soul2.demo.repository.ISubjectRepository;
+import cn.soul2.jyjc.admin.dto.QnSubjectRefSaveDTO;
+import cn.soul2.jyjc.admin.entity.RefQuestionnaireSubjectDO;
+import cn.soul2.jyjc.admin.entity.SubjectDO;
+import cn.soul2.jyjc.admin.mapper.RefQuestionnaireSubjectMapper;
+import cn.soul2.jyjc.admin.repository.IRefQuestionnaireSubjectRepository;
+import cn.soul2.jyjc.admin.repository.ISubjectRepository;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

src/main/java/cn/soul2/jyjc/admin/repository/impl/RefSubjectItemsRepositoryImpl.java

@@ -1,11 +1,11 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.dto.SubjectItemRefDTO;
-import cn.soul2.demo.entity.RefSubjectItemsDO;
-import cn.soul2.demo.entity.SubjectItemsDO;
-import cn.soul2.demo.mapper.RefSubjectItemsMapper;
-import cn.soul2.demo.repository.IRefSubjectItemsRepository;
-import cn.soul2.demo.repository.ISubjectItemsRepository;
+import cn.soul2.jyjc.admin.dto.SubjectItemRefDTO;
+import cn.soul2.jyjc.admin.entity.RefSubjectItemsDO;
+import cn.soul2.jyjc.admin.entity.SubjectItemsDO;
+import cn.soul2.jyjc.admin.mapper.RefSubjectItemsMapper;
+import cn.soul2.jyjc.admin.repository.IRefSubjectItemsRepository;
+import cn.soul2.jyjc.admin.repository.ISubjectItemsRepository;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

src/main/java/cn/soul2/jyjc/admin/repository/impl/SubjectItemsRepositoryImpl.java

@@ -1,8 +1,8 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.entity.SubjectItemsDO;
-import cn.soul2.demo.mapper.SubjectItemsMapper;
-import cn.soul2.demo.repository.ISubjectItemsRepository;
+import cn.soul2.jyjc.admin.entity.SubjectItemsDO;
+import cn.soul2.jyjc.admin.mapper.SubjectItemsMapper;
+import cn.soul2.jyjc.admin.repository.ISubjectItemsRepository;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

src/main/java/cn/soul2/jyjc/admin/repository/impl/SubjectRepositoryImpl.java

@@ -1,18 +1,18 @@
-package cn.soul2.demo.repository.impl;
+package cn.soul2.jyjc.admin.repository.impl;
 
-import cn.soul2.demo.dto.QnSubjectRefItemDTO;
-import cn.soul2.demo.dto.SubjectDTO;
-import cn.soul2.demo.dto.SubjectItemDTO;
-import cn.soul2.demo.dto.base.UpdateStatusDTO;
-import cn.soul2.demo.entity.SubjectDO;
-import cn.soul2.demo.entity.SubjectItemsDO;
-import cn.soul2.demo.entity.sqlresult.SubjectChooseListDO;
-import cn.soul2.demo.mapper.SubjectMapper;
-import cn.soul2.demo.repository.ISubjectItemsRepository;
-import cn.soul2.demo.repository.ISubjectRepository;
-import cn.soul2.demo.utils.base.PageUtils;
-import cn.soul2.demo.vo.SubjectVO;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.QnSubjectRefItemDTO;
+import cn.soul2.jyjc.admin.dto.SubjectDTO;
+import cn.soul2.jyjc.admin.dto.SubjectItemDTO;
+import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO;
+import cn.soul2.jyjc.admin.entity.SubjectDO;
+import cn.soul2.jyjc.admin.entity.SubjectItemsDO;
+import cn.soul2.jyjc.admin.entity.sqlresult.SubjectChooseListDO;
+import cn.soul2.jyjc.admin.mapper.SubjectMapper;
+import cn.soul2.jyjc.admin.repository.ISubjectItemsRepository;
+import cn.soul2.jyjc.admin.repository.ISubjectRepository;
+import cn.soul2.jyjc.admin.utils.base.PageUtils;
+import cn.soul2.jyjc.admin.vo.SubjectVO;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

src/main/java/cn/soul2/jyjc/admin/service/IDemoService.java

@@ -1,10 +1,10 @@
-package cn.soul2.demo.service;
+package cn.soul2.jyjc.admin.service;
 
-import cn.soul2.demo.dto.DemoDTO;
-import cn.soul2.demo.dto.DemoSaveOrUpdateDTO;
-import cn.soul2.demo.vo.DemoVO;
-import cn.soul2.demo.vo.base.Back;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.DemoDTO;
+import cn.soul2.jyjc.admin.dto.DemoSaveOrUpdateDTO;
+import cn.soul2.jyjc.admin.vo.DemoVO;
+import cn.soul2.jyjc.admin.vo.base.Back;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 
 import java.util.Collection;
 

src/main/java/cn/soul2/jyjc/admin/service/impl/DemoServiceImpl.java

@@ -1,15 +1,15 @@
-package cn.soul2.demo.service.impl;
-
-import cn.soul2.demo.dto.DemoDTO;
-import cn.soul2.demo.dto.DemoSaveOrUpdateDTO;
-import cn.soul2.demo.entity.DataTableDemoDO;
-import cn.soul2.demo.repository.IDataTableDemoRepository;
-import cn.soul2.demo.service.IDemoService;
-import cn.soul2.demo.utils.base.BackUtils;
-import cn.soul2.demo.utils.base.PageUtils;
-import cn.soul2.demo.vo.DemoVO;
-import cn.soul2.demo.vo.base.Back;
-import cn.soul2.demo.vo.base.VPage;
+package cn.soul2.jyjc.admin.service.impl;
+
+import cn.soul2.jyjc.admin.dto.DemoDTO;
+import cn.soul2.jyjc.admin.dto.DemoSaveOrUpdateDTO;
+import cn.soul2.jyjc.admin.entity.DataTableDemoDO;
+import cn.soul2.jyjc.admin.repository.IDataTableDemoRepository;
+import cn.soul2.jyjc.admin.service.IDemoService;
+import cn.soul2.jyjc.admin.utils.base.BackUtils;
+import cn.soul2.jyjc.admin.utils.base.PageUtils;
+import cn.soul2.jyjc.admin.vo.DemoVO;
+import cn.soul2.jyjc.admin.vo.base.Back;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/cn/soul2/jyjc/admin/utils/MybatisFastGenerator.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.utils;
+package cn.soul2.jyjc.admin.utils;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;

src/main/java/cn/soul2/jyjc/admin/utils/Test.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.utils;
+package cn.soul2.jyjc.admin.utils;
 
 import java.time.LocalDate;
 import java.util.UUID;

src/main/java/cn/soul2/jyjc/admin/utils/base/BackUtils.java

@@ -1,7 +1,7 @@
-package cn.soul2.demo.utils.base;
+package cn.soul2.jyjc.admin.utils.base;
 
-import cn.soul2.demo.codemessage.BackCodeMessage;
-import cn.soul2.demo.vo.base.Back;
+import cn.soul2.jyjc.admin.codemessage.BackCodeMessage;
+import cn.soul2.jyjc.admin.vo.base.Back;
 
 /**
  * @author Soul2

src/main/java/cn/soul2/jyjc/admin/utils/base/PageUtils.java

@@ -1,7 +1,7 @@
-package cn.soul2.demo.utils.base;
+package cn.soul2.jyjc.admin.utils.base;
 
-import cn.soul2.demo.dto.base.PageParams;
-import cn.soul2.demo.vo.base.VPage;
+import cn.soul2.jyjc.admin.dto.base.PageParams;
+import cn.soul2.jyjc.admin.vo.base.VPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;

src/main/java/cn/soul2/jyjc/admin/vo/AnswerDetailsVO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo;
+package cn.soul2.jyjc.admin.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/vo/AnswerSheetVO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo;
+package cn.soul2.jyjc.admin.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/vo/DemoVO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo;
+package cn.soul2.jyjc.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/cn/soul2/jyjc/admin/vo/ExternalBackhaulVO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo;
+package cn.soul2.jyjc.admin.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/vo/QrVO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo;
+package cn.soul2.jyjc.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/cn/soul2/jyjc/admin/vo/QuestionnaireVO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo;
+package cn.soul2.jyjc.admin.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/vo/SubjectItemVO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo;
+package cn.soul2.jyjc.admin.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/vo/SubjectVO.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo;
+package cn.soul2.jyjc.admin.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/java/cn/soul2/jyjc/admin/vo/base/Back.java

@@ -1,6 +1,6 @@
-package cn.soul2.demo.vo.base;
+package cn.soul2.jyjc.admin.vo.base;
 
-import cn.soul2.demo.codemessage.BackCodeMessage;
+import cn.soul2.jyjc.admin.codemessage.BackCodeMessage;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

src/main/java/cn/soul2/jyjc/admin/vo/base/VPage.java

@@ -1,4 +1,4 @@
-package cn.soul2.demo.vo.base;
+package cn.soul2.jyjc.admin.vo.base;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

src/main/resources/application-cors.yml

@@ -17,3 +17,6 @@ spring:
   config:
     activate:
       on-profile: prod
+
+cors:
+  allow-origin: http://test.soul2.cn

src/main/resources/application-datasource.yml

@@ -1,8 +1,11 @@
 spring.datasource.druid:
   # MySQL
-  url: jdbc:mysql://localhost:3306/pioneer?characterEncoding=utf8&serverTimezone=GMT%2B8
-  username: root
-  password: 123456
+  url: jdbc:mysql://soul2.cn:3306/thli_upline?characterEncoding=utf8&serverTimezone=GMT%2B8
+  username: thli
+  password: thli@20180913
+  #  url: jdbc:mysql://localhost:3306/pioneer?characterEncoding=utf8&serverTimezone=GMT%2B8
+  #  username: root
+  #  password: 123456
   driver-class-name: com.mysql.cj.jdbc.Driver
   # 连接池配置
   initial-size: 1

src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   #端口
   port: 7600
   #上下文
-  servlet.context-path: /
+  servlet.context-path: /thli/jyjc/api
 
 
 spring:

src/test/java/cn/soul2/jyjc/admin/JavaJyjcAdminApplicationTests.java

@@ -1,10 +1,10 @@
-package cn.soul2.demo;
+package cn.soul2.jyjc.admin;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class JavaDemoApplicationTests {
+class JavaJyjcAdminApplicationTests {
 
     @Test
     void contextLoads() {