From 6a8504afd3b3622e66f26ae506f40740c8d44142 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 七月 2025 10:01:30 +0800
Subject: [PATCH] 新功能加问题修复
---
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ManagementPlanController.java | 5 +++--
multi-system/src/main/java/com/gkhy/exam/system/service/impl/ManagementPlanServiceImpl.java | 9 ++++++---
multi-system/src/main/java/com/gkhy/exam/system/mapper/ManagementPlanMapper.java | 2 +-
multi-system/src/main/java/com/gkhy/exam/system/service/ManagementPlanService.java | 2 +-
multi-system/src/main/resources/mapper/system/ManagementPlanMapper.xml | 5 ++++-
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ManagementPlanController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ManagementPlanController.java
index 0ed45bc..55e4ac8 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ManagementPlanController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ManagementPlanController.java
@@ -36,10 +36,11 @@
@ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
@ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"),
@ApiImplicitParam(paramType = "query", name = "companyId", dataType = "int", required = false, value = "公司id"),
+ @ApiImplicitParam(paramType = "query", name = "year", dataType = "String", required = false, value = "年份"),
})
@GetMapping("/selectManagementPlanList")
- public CommonResult selectManagementPlanList(Integer companyId){
- return CommonResult.success(managementPlanService.selectManagementPlanList(companyId));
+ public CommonResult selectManagementPlanList(ManagementPlan managementPlan){
+ return CommonResult.success(managementPlanService.selectManagementPlanList(managementPlan));
}
@RepeatSubmit
@ApiOperation(value = "新增管理审批计划")
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/ManagementPlanMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/ManagementPlanMapper.java
index 01ead9c..19d7cb5 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/ManagementPlanMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/ManagementPlanMapper.java
@@ -16,6 +16,6 @@
*/
@Mapper
public interface ManagementPlanMapper extends BaseMapper<ManagementPlan> {
- List<ManagementPlan> selectManagementPlanById(Integer companyId);
+ List<ManagementPlan> selectManagementPlanById(ManagementPlan managementPlan);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/ManagementPlanService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/ManagementPlanService.java
index cf7e51d..3111b40 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/ManagementPlanService.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/ManagementPlanService.java
@@ -16,7 +16,7 @@
*/
public interface ManagementPlanService extends IService<ManagementPlan> {
- CommonPage selectManagementPlanList(Integer companyId);
+ CommonPage selectManagementPlanList(ManagementPlan managementPlan);
CommonResult insertManagementPlan(ManagementPlan managementPlan);
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ManagementPlanServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ManagementPlanServiceImpl.java
index b4f5e20..bc700aa 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ManagementPlanServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ManagementPlanServiceImpl.java
@@ -30,15 +30,18 @@
private ManagementPlanMapper managementPlanMapper;
@Override
- public CommonPage selectManagementPlanList(Integer companyId) {
+ public CommonPage selectManagementPlanList(ManagementPlan managementPlan) {
PageUtils.startPage();
- List<ManagementPlan> managementPlans = managementPlanMapper.selectManagementPlanById(companyId);
+ List<ManagementPlan> managementPlans = managementPlanMapper.selectManagementPlanById(managementPlan);
return CommonPage.restPage(managementPlans);
}
@Override
public CommonResult insertManagementPlan(ManagementPlan managementPlan) {
- List<ManagementPlan> managementPlans = managementPlanMapper.selectManagementPlanById(managementPlan.getCompanyId());
+ if (managementPlan == null || managementPlan.getCompanyId() == null){
+ return CommonResult.failed("企业id不能为空");
+ }
+ List<ManagementPlan> managementPlans = managementPlanMapper.selectManagementPlanById(managementPlan);
if (ObjectUtil.isNotEmpty(managementPlans)) {
return CommonResult.failed("当前企业已有数据，请勿重复添加");
}
diff --git a/multi-system/src/main/resources/mapper/system/ManagementPlanMapper.xml b/multi-system/src/main/resources/mapper/system/ManagementPlanMapper.xml
index 8d48686..2edf0e2 100644
--- a/multi-system/src/main/resources/mapper/system/ManagementPlanMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ManagementPlanMapper.xml
@@ -1,11 +1,14 @@
<?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="com.gkhy.exam.system.mapper.ManagementPlanMapper">
- <select id="selectManagementPlanById" resultType="com.gkhy.exam.system.domain.ManagementPlan">
+ <select id="selectManagementPlanById" resultType="com.gkhy.exam.system.domain.ManagementPlan" parameterType="com.gkhy.exam.system.domain.ManagementPlan">
select * from management_plan where del_flag=0
<if test="companyId != null">
and company_id = #{companyId}
</if>
+ <if test="year != null and year != ''">
+ and year = #{year}
+ </if>
order by create_time desc
</select>
--
Gitblit v1.9.2