From 476740c4330135b38be6a32f54dbe1bbcd32476a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 13 一月 2025 13:20:56 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
index 6b5c035..04ce217 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
@@ -1,15 +1,13 @@
package com.yuanchu.mom.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.mapper.StandardTemplateMapper;
import com.yuanchu.mom.pojo.StandardTemplate;
import com.yuanchu.mom.service.StandardTemplateService;
-import com.yuanchu.mom.mapper.StandardTemplateMapper;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -49,6 +47,9 @@
@Override
public int upStandardTemplate(StandardTemplate standardTemplate) {
+ if(standardTemplate.getThing().equals("")){
+ standardTemplate.setThing(null);
+ }
return standardTemplateMapper.updateById(standardTemplate);
}
@@ -63,11 +64,27 @@
}
@Override
- public String getStandTempThingByTIdAndPName(Integer templateId, String inspectionItem, String inspectionItemSubclass) {
- return standardTemplateMapper.selectById(templateId).getThing();
+ public String getStandTempThingById(Integer templateId) {
+ StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId);
+ if(standardTemplate==null){
+ return null;
+ }else{
+ return standardTemplate.getThing();
+ }
}
-}
+ @Override
+ public String getStandTempNameById(Integer templateId) {
+ StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId);
+ if(standardTemplate==null){
+ return null;
+ }else{
+ return standardTemplate.getName();
+ }
+ }
-
-
+ @Override
+ public StandardTemplate getStandTempIdByName(String name) {
+ return standardTemplateMapper.getStandTempIdByName(name);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3