From e7652ccba51bca69f1a8da50b959b694544267f8 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 27 二月 2025 11:08:25 +0800
Subject: [PATCH] 检验任务查询回调
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java | 6 +-
cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml | 54 +++++++++++++++++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 41 +++++++++-----------
4 files changed, 76 insertions(+), 27 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
index e94a9ec..c96a957 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
@@ -6,12 +6,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.numgen.NumberGenerator;
-import com.ruoyi.common.utils.GZipUtil;
-import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.mapper.StandardTemplateMapper;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.basic.service.StandardTemplateService;
+import com.ruoyi.common.numgen.NumberGenerator;
+import com.ruoyi.common.utils.GZipUtil;
+import com.ruoyi.common.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
index 59fb849..4740b22 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java
@@ -69,7 +69,7 @@
@ApiOperation(value = "瀹℃牳鏂囦欢鍙楁帶")
@PostMapping("/checkManageDocumentControlled")
- public Result checkManageDocumentControlled(@RequestBody ManageDocumentControlled manageDocumentControlled){
+ public Result checkManageDocumentControlled(ManageDocumentControlled manageDocumentControlled){
return Result.success(manageDocumentControlledService.checkManageDocumentControlled(manageDocumentControlled));
}
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
new file mode 100644
index 0000000..97653c7
--- /dev/null
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
@@ -0,0 +1,54 @@
+<?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.ruoyi.personnel.mapper.PersonTrainingDetailedMapper">
+
+ <select id="queryTheAnnualPlanDetailsTable" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
+ SELECT cptd.*,
+ u1.name training_lecturer_name,
+ dl.name holding_department_name, !isnull(cptr.training_record_id) whether_claim
+ FROM cnas_person_training_detailed cptd
+ left join user u1 on cptd.training_lecturer_id = u1.id
+ left join department_lims dl on dl.id = cptd.holding_department
+ left join cnas_person_training_record cptr on cptr.user_id = #{loginUserId} and cptr.course_id = cptd.id
+ <where>
+ <if test="id != null">
+ and cptd.plan_id = #{id}
+ </if>
+ <if test="userId != null">
+ and u1.id = #{userId}
+ </if>
+ <if test="trainingLecturerName != null and trainingLecturerName != ''">
+ and u1.name like concat('%', #{trainingLecturerName}, '%')
+ </if>
+ <if test="trainingDate != null and trainingDate != ''">
+ and date_format(cptd.training_date,'%Y-%m-%d') = #{trainingDate}
+ </if>
+ </where>
+ </select>
+
+ <!-- 鏍规嵁涓昏〃id鏌ヨ璇︽儏 -->
+ <select id="selectTrainingList" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
+ SELECT cptd.*,
+ u1.name training_lecturer_name
+ FROM cnas_person_training_detailed cptd
+ left join user u1 on cptd.training_lecturer_id = u1.id
+ where cptd.plan_id = #{trainingId}
+ </select>
+
+ <!-- 鏌ヨ璇︾粏 -->
+ <select id="selectTrainingDetail" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
+ SELECT cptd.*,
+ u1.name training_lecturer_name
+ FROM cnas_person_training_detailed cptd
+ left join user u1 on cptd.training_lecturer_id = u1.id
+ where cptd.id = #{id}
+ </select>
+
+ <!-- 鏌ヨ浠婂勾浜哄憳鍩硅淇℃伅 -->
+ <select id="getThisYearTrainingDetailed" resultType="com.ruoyi.personnel.pojo.PersonTrainingDetailed">
+ select cptd.id,
+ cptd.training_objectives
+ from cnas_person_training_detailed cptd
+ where training_date like concat('%', YEAR(NOW()), '%')
+ </select>
+</mapper>
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 66ce538..c1f9c46 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -599,19 +599,19 @@
private void getTemplateThing(InsOrder order, List<InsProduct> insProducts) {
Set<Integer> set = new HashSet<>();
// 妫�楠岄」鍒嗙被+妫�楠岄」+妫�楠屽瓙椤圭殑鎷兼帴
- List<String> itemNameList = insProducts.stream().map(insProduct -> {
- String itemName = "";
- if (StringUtils.isNotBlank(insProduct.getInspectionItemClass())) {
- itemName += insProduct.getInspectionItemClass().trim();
- }
- if (StringUtils.isNotBlank(insProduct.getInspectionItem())) {
- itemName += insProduct.getInspectionItem().trim();
- }
- if (StringUtils.isNotBlank(insProduct.getInspectionItemSubclass())) {
- itemName += insProduct.getInspectionItemSubclass().trim();
- }
- return itemName;
- }).collect(Collectors.toList());
+// List<String> itemNameList = insProducts.stream().map(insProduct -> {
+// String itemName = "";
+// if (StringUtils.isNotBlank(insProduct.getInspectionItemClass())) {
+// itemName += insProduct.getInspectionItemClass().trim();
+// }
+// if (StringUtils.isNotBlank(insProduct.getInspectionItem())) {
+// itemName += insProduct.getInspectionItem().trim();
+// }
+// if (StringUtils.isNotBlank(insProduct.getInspectionItemSubclass())) {
+// itemName += insProduct.getInspectionItemSubclass().trim();
+// }
+// return itemName;
+// }).collect(Collectors.toList());
// 鏌ヨ璁㈠崟鐘舵�佸垽鏂槸鍚︽槸鏌ュ巻鍙叉ā鏉�
if (order.getIsFirstSubmit() != null && order.getIsFirstSubmit().equals(1)) {
InsOrderState insOrderState = insOrderStateMapper.selectOne(Wrappers.<InsOrderState>lambdaQuery()
@@ -632,11 +632,8 @@
thing = one.getThing();
if (StrUtil.isNotEmpty(thing)) {
thing = GZipUtil.uncompress(thing);
- JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
- // 娓呴櫎娌℃湁鍏宠仈鐨勬楠岄」
- eliminateItem(sheet, itemNameList);
-
- JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
+ JSONObject sheet = JSON.parseObject(thing).getJSONArray("data").getJSONObject(0);
+ JSONObject config = sheet.getJSONObject("config");
List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
Map<String, Object> style = new HashMap<>();
style.put("rowlen", config.get("rowlen"));
@@ -659,10 +656,8 @@
thing = standardTemplateService.getStandTempThingById(product.getTemplateId());
}
if (StrUtil.isNotEmpty(thing)) {
- JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
- // 娓呴櫎娌℃湁鍏宠仈鐨勬楠岄」
- eliminateItem(sheet, itemNameList);
- JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
+ JSONObject sheet = JSON.parseObject(thing).getJSONArray("data").getJSONObject(0);
+ JSONObject config = sheet.getJSONObject("config");
List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
Map<String, Object> style = new HashMap<>();
style.put("rowlen", config.get("rowlen"));
@@ -675,7 +670,7 @@
}
/**
- * 娓呴櫎娌℃湁浣跨敤鐨勬楠岄」
+ * todo: 娓呴櫎娌℃湁浣跨敤鐨勬楠岄」
* @param sheet
* @param itemNameList
*/
--
Gitblit v1.9.3