From 30a6e9981f9739081194a120bb0032f5b96bd556 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期六, 11 十月 2025 15:31:10 +0800
Subject: [PATCH] 修改
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/MonthlyInspectionServiceImpl.java | 8 ++
multi-system/src/main/resources/mapper/system/ContinuousImproveMapper.xml | 27 +++++++++
multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml | 25 ++++++++
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ContinuousImproveController.java | 16 ++++-
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java | 16 ++++-
multi-system/src/main/java/com/gkhy/exam/system/service/QualitySystemPlanService.java | 2
multi-system/src/main/java/com/gkhy/exam/system/mapper/MonthlyInspectionMapper.java | 3 +
multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualitySystemPlanServiceImpl.java | 9 ++
multi-system/src/main/java/com/gkhy/exam/system/service/CustomerInventoryService.java | 1
multi-system/src/main/java/com/gkhy/exam/system/mapper/ContinuousImproveMapper.java | 3 +
multi-system/src/main/java/com/gkhy/exam/system/mapper/QualitySystemPlanMapper.java | 3 +
multi-system/src/main/java/com/gkhy/exam/system/service/MonthlyInspectionService.java | 2
multi-system/src/main/java/com/gkhy/exam/system/service/impl/ContinuousImproveServiceImpl.java | 9 ++
multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/MarketController.java | 22 +++++++
multi-system/src/main/java/com/gkhy/exam/system/service/impl/CustomerInventoryServiceImpl.java | 6 ++
multi-system/src/main/resources/mapper/system/MonthlyInspectionMapper.xml | 21 +++++++
multi-system/src/main/java/com/gkhy/exam/system/service/ContinuousImproveService.java | 2
17 files changed, 165 insertions(+), 10 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ContinuousImproveController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ContinuousImproveController.java
index e92c24a..1c8504a 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ContinuousImproveController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/ContinuousImproveController.java
@@ -27,16 +27,24 @@
* @return
*/
@ApiOperation(value = "持续改进列表(分页)")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
- @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"),
- })
@GetMapping("/inside/list")
public CommonResult listContinuousImprove(ContinuousImprove continuousImprove){
return CommonResult.success(continuousImproveService.selectContinuousImproveList(continuousImprove));
}
/**
+ * 持续改进id查
+ * @param improveId
+ * @return
+ */
+ @ApiOperation(value = "持续改进id查")
+ @GetMapping("/inside/listByid")
+ public CommonResult listdContinuousImproveByid(@RequestParam("improveId") Integer improveId){
+ return continuousImproveService.listContinuousImproveById(improveId);
+ }
+
+
+ /**
* 持续改进新增
* @param continuousImprove
* @return
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/MarketController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/MarketController.java
index 1d75833..433176b 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/MarketController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/MarketController.java
@@ -54,6 +54,17 @@
return CommonResult.success(customerInventoryService.selectCustomerInventoryList(customerInventory));
}
+ /**
+ * 顾客清单列表所有
+ * @param customerInventory
+ * @return
+ */
+ @ApiOperation(value = "顾客清单列表(所有)")
+ @GetMapping("/inventory/listAll")
+ public CommonResult listCustomerAll(CustomerInventory customerInventory){
+ return CommonResult.success(customerInventoryService.selectCustomerInventoryListAll(customerInventory));
+ }
+
/**
* 顾客清单新增
@@ -358,6 +369,17 @@
return CommonResult.success(monthlyInspectionService.selectMonthlyInspectionList(monthlyInspection));
}
+ /**
+ * 月度检查记录id查
+ * @param monthlyId
+ * @return
+ */
+ @ApiOperation(value = "月度检查记录id查")
+ @GetMapping("/monthly/listByid")
+ public CommonResult listMonthlyInspectionByid(@RequestParam("monthlyId") Integer monthlyId){
+ return monthlyInspectionService.listMonthlyInspectionById(monthlyId);
+ }
+
/**
* 月度检查记录新增
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java
index 8a9d02a..62faf49 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/web/TemplateController.java
@@ -140,15 +140,23 @@
* @return
*/
@ApiOperation(value = "质量体系策划列表(分页)")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
- @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"),
- })
@GetMapping("/list")
public CommonResult listQualitySystemPlan(QualitySystemPlan qualitySystemPlan){
return CommonResult.success(qualitySystemPlanService.selectQualitySystemPlanList(qualitySystemPlan));
}
+ /**
+ * 质量体系策划id查
+ * @param planId
+ * @return
+ */
+ @ApiOperation(value = "质量体系策划id查")
+ @GetMapping("/listByid")
+ public CommonResult listQualitySystemPlanByid(@RequestParam("planId") Integer planId){
+ return qualitySystemPlanService.listQualitySystemPlanByid(planId);
+ }
+
+
/**
* 质量体系策划新增
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/ContinuousImproveMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/ContinuousImproveMapper.java
index caac8cc..67980ce 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/ContinuousImproveMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/ContinuousImproveMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.system.domain.ContinuousImprove;
+import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;
import java.util.List;
@@ -11,4 +12,6 @@
List<ContinuousImprove> selectImproveList(ContinuousImprove continuousImprove);
List<ContinuousImprove> selectByCompanyId(ContinuousImprove continuousImprove);
+
+ ContinuousImprove selectListById(@Param("improveId") Integer improveId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/MonthlyInspectionMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/MonthlyInspectionMapper.java
index 5256055..8ea2f82 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/MonthlyInspectionMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/MonthlyInspectionMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.system.domain.MonthlyInspection;
+import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;
import java.util.List;
@@ -9,4 +10,6 @@
@Mapper
public interface MonthlyInspectionMapper extends BaseMapper<MonthlyInspection> {
List<MonthlyInspection> selectInspectionList(MonthlyInspection monthlyInspection);
+
+ MonthlyInspection selectListById(@Param("monthlyId") Integer monthlyId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualitySystemPlanMapper.java b/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualitySystemPlanMapper.java
index ab354d4..26d28aa 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualitySystemPlanMapper.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/mapper/QualitySystemPlanMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.exam.system.domain.QualitySystemPlan;
+import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;
import java.util.List;
@@ -9,4 +10,6 @@
@Mapper
public interface QualitySystemPlanMapper extends BaseMapper<QualitySystemPlan> {
List<QualitySystemPlan> selectSystemPlanList(QualitySystemPlan qualitySystemPlan);
+
+ QualitySystemPlan selectListById(@Param("planId") Integer planId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/ContinuousImproveService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/ContinuousImproveService.java
index 190fa6a..5233c4a 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/ContinuousImproveService.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/ContinuousImproveService.java
@@ -13,4 +13,6 @@
CommonResult updateContinuousImprove(ContinuousImprove continuousImprove);
CommonResult deletedContinuousImprove(Integer improveId);
+
+ CommonResult listContinuousImproveById(Integer improveId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/CustomerInventoryService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/CustomerInventoryService.java
index 0c7d0f1..d74b12b 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/CustomerInventoryService.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/CustomerInventoryService.java
@@ -16,4 +16,5 @@
CommonResult deletedCustomerInventory(Integer customerId);
+ CommonResult selectCustomerInventoryListAll(CustomerInventory customerInventory);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/MonthlyInspectionService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/MonthlyInspectionService.java
index b0466cb..54b4254 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/MonthlyInspectionService.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/MonthlyInspectionService.java
@@ -13,4 +13,6 @@
CommonResult updateMonthlyInspection(MonthlyInspection monthlyInspection);
CommonResult deletedMonthlyInspection(Integer monthlyId);
+
+ CommonResult listMonthlyInspectionById(Integer monthlyId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/QualitySystemPlanService.java b/multi-system/src/main/java/com/gkhy/exam/system/service/QualitySystemPlanService.java
index 6ead156..dc13fbf 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/QualitySystemPlanService.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/QualitySystemPlanService.java
@@ -13,4 +13,6 @@
CommonResult updateQualitySystemPlan(QualitySystemPlan qualitySystemPlan);
CommonResult deletedQualitySystemPlan(Integer planId);
+
+ CommonResult listQualitySystemPlanByid(Integer planId);
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ContinuousImproveServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ContinuousImproveServiceImpl.java
index e135a8e..b807290 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ContinuousImproveServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/ContinuousImproveServiceImpl.java
@@ -33,7 +33,6 @@
throw new RuntimeException("非管理员操作，查询条件不可为空");
}
}
- PageUtils.startPage();
List<ContinuousImprove> continuousImproves = continuousImproveMapper.selectImproveList(continuousImprove);
for (ContinuousImprove improve : continuousImproves) {
List<ContinuousImprovePlan> continuousImprovePlans = continuousImprovePlanMapper.selectByImproveId(improve.getId());
@@ -99,4 +98,12 @@
}
return CommonResult.failed();
}
+
+ @Override
+ public CommonResult listContinuousImproveById(Integer improveId) {
+ ContinuousImprove continuousImprove = continuousImproveMapper.selectListById(improveId);
+ List<ContinuousImprovePlan> continuousImprovePlans = continuousImprovePlanMapper.selectByImproveId(improveId);
+ continuousImprove.setPlans(continuousImprovePlans);
+ return CommonResult.success(continuousImprove);
+ }
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CustomerInventoryServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CustomerInventoryServiceImpl.java
index 1756632..e4616a4 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CustomerInventoryServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/CustomerInventoryServiceImpl.java
@@ -79,4 +79,10 @@
return CommonResult.failed();
}
+ @Override
+ public CommonResult selectCustomerInventoryListAll(CustomerInventory customerInventory) {
+ List<CustomerInventory> customerInventories = customerInventoryMapper.selectInventoryList(customerInventory);
+ return CommonResult.success(customerInventories);
+ }
+
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/MonthlyInspectionServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/MonthlyInspectionServiceImpl.java
index f42f7e5..8542c7d 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/MonthlyInspectionServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/MonthlyInspectionServiceImpl.java
@@ -87,4 +87,12 @@
}
return CommonResult.failed();
}
+
+ @Override
+ public CommonResult listMonthlyInspectionById(Integer monthlyId) {
+ MonthlyInspection monthlyInspection = monthlyInspectionMapper.selectListById(monthlyId);
+ List<MonthlyInspectionMess> monthlyInspectionMesses = monthlyInspectionMessMapper.selectByMonthlyId(monthlyId);
+ monthlyInspection.setInspectionMesses(monthlyInspectionMesses);
+ return CommonResult.success(monthlyInspection);
+ }
}
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualitySystemPlanServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualitySystemPlanServiceImpl.java
index 8e2ae9f..6859b2d 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualitySystemPlanServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/QualitySystemPlanServiceImpl.java
@@ -33,7 +33,6 @@
throw new ApiException("非管理员操作，企业id不可为空");
}
}
- PageUtils.startPage();
List<QualitySystemPlan> qualitySystemPlans = qualitySystemPlanMapper.selectSystemPlanList(qualitySystemPlan);
for (QualitySystemPlan systemPlan : qualitySystemPlans) {
List<QualitySystemPlanMess> qualitySystemPlanMesses = qualitySystemPlanMessMapper.selectByPlanId(systemPlan.getId());
@@ -80,4 +79,12 @@
qualitySystemPlanMapper.updateById(qualitySystemPlan);
return CommonResult.success();
}
+
+ @Override
+ public CommonResult listQualitySystemPlanByid(Integer planId) {
+ QualitySystemPlan qualitySystemPlan = qualitySystemPlanMapper.selectListById(planId);
+ List<QualitySystemPlanMess> qualitySystemPlanMesses = qualitySystemPlanMessMapper.selectByPlanId(planId);
+ qualitySystemPlan.setPlanMesses(qualitySystemPlanMesses);
+ return CommonResult.success(qualitySystemPlan);
+ }
}
diff --git a/multi-system/src/main/resources/mapper/system/ContinuousImproveMapper.xml b/multi-system/src/main/resources/mapper/system/ContinuousImproveMapper.xml
index fb7cded..2671884 100644
--- a/multi-system/src/main/resources/mapper/system/ContinuousImproveMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/ContinuousImproveMapper.xml
@@ -63,4 +63,31 @@
and id != #{id}
</if>
</select>
+ <select id="selectListById" resultType="com.gkhy.exam.system.domain.ContinuousImprove">
+ SELECT
+ ci.`id`,
+ ci.`company_id`,
+ sc.`name` AS company_name,
+ ci.`year`,
+ ci.`fiction_id`,
+ su1.`name` AS fiction_name,
+ ci.`check_id`,
+ su2.`name` AS check_name,
+ ci.`ratify_id`,
+ su3.`name` AS ratify_name,
+ ci.`del_flag`,
+ ci.`create_by`,
+ ci.`create_time`,
+ ci.`update_by`,
+ ci.`update_time`
+ FROM
+ `continuous_improve` ci
+ LEFT JOIN sys_user su1 ON ci.fiction_id = su1.id
+ LEFT JOIN sys_user su2 ON ci.check_id = su2.id
+ LEFT JOIN sys_user su3 ON ci.ratify_id = su3.id
+ LEFT JOIN sys_company sc ON ci.company_id = sc.id
+ WHERE
+ ci.del_flag = 0
+ and ci.id = #{improveId}
+ </select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/MonthlyInspectionMapper.xml b/multi-system/src/main/resources/mapper/system/MonthlyInspectionMapper.xml
index 3ac56f5..93d73b2 100644
--- a/multi-system/src/main/resources/mapper/system/MonthlyInspectionMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/MonthlyInspectionMapper.xml
@@ -21,7 +21,28 @@
<if test="companyId!=null">
and mi.company_id =#{companyId}
</if>
+ <if test="id!=null">
+ and mi.id = #{id}
+ </if>
ORDER BY
mi.create_time DESC
</select>
+ <select id="selectListById" resultType="com.gkhy.exam.system.domain.MonthlyInspection">
+ SELECT
+ mi.`id`,
+ mi.`company_id`,
+ sc.`name` AS company_name,
+ mi.`record_name`,
+ mi.`del_flag`,
+ mi.`create_by`,
+ mi.`create_time`,
+ mi.`update_by`,
+ mi.`update_time`
+ FROM
+ `monthly_inspection` mi
+ LEFT JOIN sys_company sc ON mi.company_id = sc.id
+ WHERE
+ mi.del_flag = 1
+ and mi.id = #{monthlyId}
+ </select>
</mapper>
diff --git a/multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml b/multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml
index a3836fa..2b44359 100644
--- a/multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/QualitySystemPlanMapper.xml
@@ -34,4 +34,29 @@
</if>
ORDER BY qsp.create_time DESC
</select>
+ <select id="selectListById" resultType="com.gkhy.exam.system.domain.QualitySystemPlan">
+ SELECT
+ qsp.`id`,
+ qsp.`company_id`,
+ sc.`name` as company_name,
+ qsp.`year`,
+ qsp.`write_id`,
+ su1.`name` as write_name,
+ qsp.`check_id`,
+ su2.`name` as check_name,
+ qsp.`ratify_id`,
+ su3.`name` as ratify_name,
+ qsp.`del_flag`,
+ qsp.`create_by`,
+ qsp.`create_time`,
+ qsp.`update_by`,
+ qsp.`update_time`
+ FROM
+ `quality_system_plan` qsp
+ INNER JOIN sys_company sc on qsp.company_id = sc.id
+ LEFT JOIN sys_user su1 on qsp.write_id = su1.id
+ LEFT JOIN sys_user su2 on qsp.check_id = su2.id
+ LEFT JOIN sys_user su3 on qsp.ratify_id = su3.id
+ WHERE qsp.del_flag = 1 and qsp.id = #{planId}
+ </select>
</mapper>
--
Gitblit v1.9.2