From e2884835f03080d7af577127780be8d559fe93fa Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Thu, 2 Jan 2025 11:34:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(examine):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 Dao 接口统一改为 Mapper 接口 - 更新 XML 配置文件路径和内容 - 修改 Service 实现类中的 Dao 调用 - 为 ExamineUser 实体类添加考核状态字段- 新增 ExamineUser 列表查询接口和实现 - 更新 ExamineUserController，增加分页查询功能 --- .../examine/user/ExamineUserController.java | 19 ++++- ...onfigDao.java => ExamineConfigMapper.java} | 2 +- .../impl/ExamineConfigServiceImpl.java | 12 +-- ...etailDao.java => ExamineDetailMapper.java} | 2 +- .../impl/ExamineDetailServiceImpl.java | 12 +-- ...ineTaskDao.java => ExamineTaskMapper.java} | 2 +- .../service/impl/ExamineTaskServiceImpl.java | 12 +-- .../examine/user/domain/ExamineUser.java | 8 ++ ...ineUserDao.java => ExamineUserMapper.java} | 13 +--- .../user/service/ExamineUserService.java | 3 + .../service/impl/ExamineUserServiceImpl.java | 18 +++-- .../examine/ExamineConfigMapper.xml} | 2 +- .../examine/ExamineDetailMapper.xml} | 2 +- .../examine/ExamineTaskMapper.xml} | 2 +- .../examine/ExamineUserMapper.xml} | 73 +++++++++++-------- 15 files changed, 108 insertions(+), 74 deletions(-) rename pms-business/src/main/java/tech/unissense/pms/business/examine/config/mapper/{ExamineConfigDao.java => ExamineConfigMapper.java} (98%) rename pms-business/src/main/java/tech/unissense/pms/business/examine/detail/mapper/{ExamineDetailDao.java => ExamineDetailMapper.java} (98%) rename pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/{ExamineTaskDao.java => ExamineTaskMapper.java} (98%) rename pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/{ExamineUserDao.java => ExamineUserMapper.java} (83%) rename pms-business/src/main/resources/mapper/{ExamineConfigDao.xml => business/examine/ExamineConfigMapper.xml} (99%) rename pms-business/src/main/resources/mapper/{ExamineDetailDao.xml => business/examine/ExamineDetailMapper.xml} (99%) rename pms-business/src/main/resources/mapper/{ExamineTaskDao.xml => business/examine/ExamineTaskMapper.xml} (99%) rename pms-business/src/main/resources/mapper/{ExamineUserDao.xml => business/examine/ExamineUserMapper.xml} (85%) diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/user/ExamineUserController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/user/ExamineUserController.java index 9aeb3c4..8674d86 100644 --- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/user/ExamineUserController.java +++ b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/user/ExamineUserController.java @@ -6,6 +6,8 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import tech.unissense.pms.common.core.controller.BaseController; +import tech.unissense.pms.common.core.page.TableDataInfo; import javax.annotation.Resource; @@ -16,8 +18,8 @@ import javax.annotation.Resource; * @since 2025-01-02 10:18:52 */ @RestController -@RequestMapping("examineUser") -public class ExamineUserController { +@RequestMapping("examine/user") +public class ExamineUserController extends BaseController { /** * 服务对象 */ @@ -36,6 +38,19 @@ public class ExamineUserController { return ResponseEntity.ok(this.examineUserService.queryById(id)); } + /** + * 分页查询 + * + * @param examineUser + * @return tech.unissense.pms.common.core.page.TableDataInfo + * @author ch + * @date 2025/01/02 10:36 + */ + @GetMapping + public TableDataInfo queryPage(ExamineUser examineUser) { + startPage(); + return getDataTable(examineUserService.list(examineUser)); + } /** * 新增数据 * diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/config/mapper/ExamineConfigDao.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/config/mapper/ExamineConfigMapper.java similarity index 98% rename from pms-business/src/main/java/tech/unissense/pms/business/examine/config/mapper/ExamineConfigDao.java rename to pms-business/src/main/java/tech/unissense/pms/business/examine/config/mapper/ExamineConfigMapper.java index 7618228..8c04e66 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/config/mapper/ExamineConfigDao.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/config/mapper/ExamineConfigMapper.java @@ -14,7 +14,7 @@ import java.util.List; * @since 2025-01-02 10:17:37 */ @Mapper -public interface ExamineConfigDao { +public interface ExamineConfigMapper { /** * 通过ID查询单条数据 diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/config/service/impl/ExamineConfigServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/config/service/impl/ExamineConfigServiceImpl.java index e74c4c1..d6dc548 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/config/service/impl/ExamineConfigServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/config/service/impl/ExamineConfigServiceImpl.java @@ -1,7 +1,7 @@ package tech.unissense.pms.business.examine.config.service.impl; import tech.unissense.pms.business.examine.config.domain.ExamineConfig; -import tech.unissense.pms.business.examine.config.mapper.ExamineConfigDao; +import tech.unissense.pms.business.examine.config.mapper.ExamineConfigMapper; import tech.unissense.pms.business.examine.config.service.ExamineConfigService; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import javax.annotation.Resource; @Service("examineConfigService") public class ExamineConfigServiceImpl implements ExamineConfigService { @Resource - private ExamineConfigDao examineConfigDao; + private ExamineConfigMapper examineConfigMapper; /** * 通过ID查询单条数据 @@ -26,7 +26,7 @@ public class ExamineConfigServiceImpl implements ExamineConfigService { */ @Override public ExamineConfig queryById(Integer id) { - return this.examineConfigDao.queryById(id); + return this.examineConfigMapper.queryById(id); } @@ -39,7 +39,7 @@ public class ExamineConfigServiceImpl implements ExamineConfigService { */ @Override public ExamineConfig insert(ExamineConfig examineConfig) { - this.examineConfigDao.insert(examineConfig); + this.examineConfigMapper.insert(examineConfig); return examineConfig; } @@ -51,7 +51,7 @@ public class ExamineConfigServiceImpl implements ExamineConfigService { */ @Override public ExamineConfig update(ExamineConfig examineConfig) { - this.examineConfigDao.update(examineConfig); + this.examineConfigMapper.update(examineConfig); return this.queryById(examineConfig.getId()); } @@ -63,6 +63,6 @@ public class ExamineConfigServiceImpl implements ExamineConfigService { */ @Override public boolean deleteById(Integer id) { - return this.examineConfigDao.deleteById(id) > 0; + return this.examineConfigMapper.deleteById(id) > 0; } } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/mapper/ExamineDetailDao.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/mapper/ExamineDetailMapper.java similarity index 98% rename from pms-business/src/main/java/tech/unissense/pms/business/examine/detail/mapper/ExamineDetailDao.java rename to pms-business/src/main/java/tech/unissense/pms/business/examine/detail/mapper/ExamineDetailMapper.java index 7e225af..bb4e6d2 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/mapper/ExamineDetailDao.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/mapper/ExamineDetailMapper.java @@ -14,7 +14,7 @@ import java.util.List; * @since 2025-01-02 10:18:05 */ @Mapper -public interface ExamineDetailDao { +public interface ExamineDetailMapper { /** * 通过ID查询单条数据 diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/impl/ExamineDetailServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/impl/ExamineDetailServiceImpl.java index 793f199..4d32b5e 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/impl/ExamineDetailServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/detail/service/impl/ExamineDetailServiceImpl.java @@ -1,7 +1,7 @@ package tech.unissense.pms.business.examine.detail.service.impl; import tech.unissense.pms.business.examine.detail.domain.ExamineDetail; -import tech.unissense.pms.business.examine.detail.mapper.ExamineDetailDao; +import tech.unissense.pms.business.examine.detail.mapper.ExamineDetailMapper; import tech.unissense.pms.business.examine.detail.service.ExamineDetailService; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import javax.annotation.Resource; @Service("examineDetailService") public class ExamineDetailServiceImpl implements ExamineDetailService { @Resource - private ExamineDetailDao examineDetailDao; + private ExamineDetailMapper examineDetailMapper; /** * 通过ID查询单条数据 @@ -26,7 +26,7 @@ public class ExamineDetailServiceImpl implements ExamineDetailService { */ @Override public ExamineDetail queryById(Integer id) { - return this.examineDetailDao.queryById(id); + return this.examineDetailMapper.queryById(id); } @@ -39,7 +39,7 @@ public class ExamineDetailServiceImpl implements ExamineDetailService { */ @Override public ExamineDetail insert(ExamineDetail examineDetail) { - this.examineDetailDao.insert(examineDetail); + this.examineDetailMapper.insert(examineDetail); return examineDetail; } @@ -51,7 +51,7 @@ public class ExamineDetailServiceImpl implements ExamineDetailService { */ @Override public ExamineDetail update(ExamineDetail examineDetail) { - this.examineDetailDao.update(examineDetail); + this.examineDetailMapper.update(examineDetail); return this.queryById(examineDetail.getId()); } @@ -63,6 +63,6 @@ public class ExamineDetailServiceImpl implements ExamineDetailService { */ @Override public boolean deleteById(Integer id) { - return this.examineDetailDao.deleteById(id) > 0; + return this.examineDetailMapper.deleteById(id) > 0; } } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskDao.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskMapper.java similarity index 98% rename from pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskDao.java rename to pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskMapper.java index 30101bc..2ba784a 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskDao.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/mapper/ExamineTaskMapper.java @@ -14,7 +14,7 @@ import java.util.List; * @since 2025-01-02 10:18:28 */ @Mapper -public interface ExamineTaskDao { +public interface ExamineTaskMapper { /** * 通过ID查询单条数据 diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/ExamineTaskServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/ExamineTaskServiceImpl.java index e044caf..41c6974 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/ExamineTaskServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/ExamineTaskServiceImpl.java @@ -1,7 +1,7 @@ package tech.unissense.pms.business.examine.task.service.impl; import tech.unissense.pms.business.examine.task.domain.ExamineTask; -import tech.unissense.pms.business.examine.task.mapper.ExamineTaskDao; +import tech.unissense.pms.business.examine.task.mapper.ExamineTaskMapper; import tech.unissense.pms.business.examine.task.service.ExamineTaskService; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import javax.annotation.Resource; @Service("examineTaskService") public class ExamineTaskServiceImpl implements ExamineTaskService { @Resource - private ExamineTaskDao examineTaskDao; + private ExamineTaskMapper examineTaskMapper; /** * 通过ID查询单条数据 @@ -26,7 +26,7 @@ public class ExamineTaskServiceImpl implements ExamineTaskService { */ @Override public ExamineTask queryById(Integer id) { - return this.examineTaskDao.queryById(id); + return this.examineTaskMapper.queryById(id); } @@ -39,7 +39,7 @@ public class ExamineTaskServiceImpl implements ExamineTaskService { */ @Override public ExamineTask insert(ExamineTask examineTask) { - this.examineTaskDao.insert(examineTask); + this.examineTaskMapper.insert(examineTask); return examineTask; } @@ -51,7 +51,7 @@ public class ExamineTaskServiceImpl implements ExamineTaskService { */ @Override public ExamineTask update(ExamineTask examineTask) { - this.examineTaskDao.update(examineTask); + this.examineTaskMapper.update(examineTask); return this.queryById(examineTask.getId()); } @@ -63,6 +63,6 @@ public class ExamineTaskServiceImpl implements ExamineTaskService { */ @Override public boolean deleteById(Integer id) { - return this.examineTaskDao.deleteById(id) > 0; + return this.examineTaskMapper.deleteById(id) > 0; } } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java index 44d2928..f0a05b9 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java @@ -35,6 +35,14 @@ public class ExamineUser implements Serializable { * 主管评分(权重计算后) */ private Integer manageScore; + /** + * 个人评分状态 0:待完成 1:已完成 + */ + private String examineStatusSelf; + /** + * 主管评分状态 0:待完成 1:已完成 + */ + private String examineStatus; diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserDao.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserMapper.java similarity index 83% rename from pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserDao.java rename to pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserMapper.java index 79ecfae..a25816e 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserDao.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/mapper/ExamineUserMapper.java @@ -3,7 +3,6 @@ package tech.unissense.pms.business.examine.user.mapper; import org.apache.ibatis.annotations.Mapper; import tech.unissense.pms.business.examine.user.domain.ExamineUser; import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; import java.util.List; @@ -14,7 +13,7 @@ import java.util.List; * @since 2025-01-02 10:18:52 */ @Mapper -public interface ExamineUserDao { +public interface ExamineUserMapper { /** * 通过ID查询单条数据 @@ -24,15 +23,6 @@ public interface ExamineUserDao { */ ExamineUser queryById(Integer id); - /** - * 查询指定行数据 - * - * @param examineUser 查询条件 - * @param pageable 分页对象 - * @return 对象列表 - */ - List queryAllByLimit(ExamineUser examineUser, @Param("pageable") Pageable pageable); - /** * 统计总行数 * @@ -82,5 +72,6 @@ public interface ExamineUserDao { */ int deleteById(Integer id); + List list(ExamineUser examineUser); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/ExamineUserService.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/ExamineUserService.java index 8c1788a..38cb76b 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/ExamineUserService.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/ExamineUserService.java @@ -4,6 +4,8 @@ import tech.unissense.pms.business.examine.user.domain.ExamineUser; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import java.util.List; + /** * 考核人员表(ExamineUser)表服务接口 * @@ -45,4 +47,5 @@ public interface ExamineUserService { */ boolean deleteById(Integer id); + List list(ExamineUser examineUser); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/impl/ExamineUserServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/impl/ExamineUserServiceImpl.java index 3cb3580..e3245b7 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/impl/ExamineUserServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/impl/ExamineUserServiceImpl.java @@ -1,11 +1,12 @@ package tech.unissense.pms.business.examine.user.service.impl; import tech.unissense.pms.business.examine.user.domain.ExamineUser; -import tech.unissense.pms.business.examine.user.mapper.ExamineUserDao; +import tech.unissense.pms.business.examine.user.mapper.ExamineUserMapper; import tech.unissense.pms.business.examine.user.service.ExamineUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 考核人员表(ExamineUser)表服务实现类 @@ -16,7 +17,7 @@ import javax.annotation.Resource; @Service("examineUserService") public class ExamineUserServiceImpl implements ExamineUserService { @Resource - private ExamineUserDao examineUserDao; + private ExamineUserMapper examineUserMapper; /** * 通过ID查询单条数据 @@ -26,7 +27,7 @@ public class ExamineUserServiceImpl implements ExamineUserService { */ @Override public ExamineUser queryById(Integer id) { - return this.examineUserDao.queryById(id); + return this.examineUserMapper.queryById(id); } @@ -39,7 +40,7 @@ public class ExamineUserServiceImpl implements ExamineUserService { */ @Override public ExamineUser insert(ExamineUser examineUser) { - this.examineUserDao.insert(examineUser); + this.examineUserMapper.insert(examineUser); return examineUser; } @@ -51,7 +52,7 @@ public class ExamineUserServiceImpl implements ExamineUserService { */ @Override public ExamineUser update(ExamineUser examineUser) { - this.examineUserDao.update(examineUser); + this.examineUserMapper.update(examineUser); return this.queryById(examineUser.getId()); } @@ -63,6 +64,11 @@ public class ExamineUserServiceImpl implements ExamineUserService { */ @Override public boolean deleteById(Integer id) { - return this.examineUserDao.deleteById(id) > 0; + return this.examineUserMapper.deleteById(id) > 0; + } + + @Override + public List list(ExamineUser examineUser) { + return examineUserMapper.list(examineUser); } } diff --git a/pms-business/src/main/resources/mapper/ExamineConfigDao.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineConfigMapper.xml similarity index 99% rename from pms-business/src/main/resources/mapper/ExamineConfigDao.xml rename to pms-business/src/main/resources/mapper/business/examine/ExamineConfigMapper.xml index c6725bb..57990ea 100644 --- a/pms-business/src/main/resources/mapper/ExamineConfigDao.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineConfigMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pms-business/src/main/resources/mapper/ExamineDetailDao.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineDetailMapper.xml similarity index 99% rename from pms-business/src/main/resources/mapper/ExamineDetailDao.xml rename to pms-business/src/main/resources/mapper/business/examine/ExamineDetailMapper.xml index 72ccf24..fde339a 100644 --- a/pms-business/src/main/resources/mapper/ExamineDetailDao.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineDetailMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pms-business/src/main/resources/mapper/ExamineTaskDao.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml similarity index 99% rename from pms-business/src/main/resources/mapper/ExamineTaskDao.xml rename to pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml index f92690a..e9deb53 100644 --- a/pms-business/src/main/resources/mapper/ExamineTaskDao.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/pms-business/src/main/resources/mapper/ExamineUserDao.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml similarity index 85% rename from pms-business/src/main/resources/mapper/ExamineUserDao.xml rename to pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml index 8c102a5..57af891 100644 --- a/pms-business/src/main/resources/mapper/ExamineUserDao.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml @@ -1,6 +1,6 @@ - + @@ -9,47 +9,29 @@ + + - - + where id = #{id} - - + +