From 75d81c7784c30a10568c7880d51f2584c441e110 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 13 三月 2024 14:15:50 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 23 +++++++----
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java | 8 +++
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTemplateService.java | 3 +
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 4 +
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 8 +++-
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 18 ++++++--
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 4 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 6 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java | 7 +++
10 files changed, 64 insertions(+), 19 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index 83ab2fa..51ec312 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -41,12 +41,16 @@
@ApiModelProperty(value = "瀹為獙瀹�")
private String laboratory;
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "瀛愬疄楠屽")
+ private String sonLaboratory;
+
@ValueTableShow(5)
@ApiModelProperty(value = "璁￠噺鍗曚綅")
private String unit;
@ValueTableShow(5)
- @ApiModelProperty(value = "妫�楠屾爣鍑�")
+ @ApiModelProperty(value = "鏍囧噯鏂规硶")
private String method;
@ValueTableShow(6)
@@ -55,7 +59,7 @@
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
- private Integer manHour;
+ private Double manHour;
@ValueTableShow(7)
@ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
@@ -85,18 +89,22 @@
@ApiModelProperty(value = "鍖洪棿")
private String section;
- @ValueTableShow(13)
+ /*@ValueTableShow(13)
@ApiModelProperty(value = "鍙栧�肩被鍨�")
- private String valueType;
+ private String valueType;*/
@ValueTableShow(13)
@ApiModelProperty(value = "鐗规畩鏍囪瘑")
private String bsm;
@ValueTableShow(5)
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @ApiModelProperty(value = "妫�楠屽璞�")
private String sample;
+ @ValueTableShow(14)
+ @ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
+ private Integer templateId;
+
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 1958854..93e3b8e 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -28,7 +28,9 @@
man_day,
bsm,
sample,
- inspection_value_type
+ inspection_value_type,
+ template_id,
+ son_laboratory
from structure_item_parameter
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
index 0a312bd..977478c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
@@ -1,27 +1,27 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.StandardTemplate;
import com.yuanchu.mom.service.StandardTemplateService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Map;
@RequestMapping("/StandardTemplate")
@RestController
@AllArgsConstructor
+@Api("鍘熷璁板綍妯℃澘")
public class StandardTemplateController {
private StandardTemplateService standardTemplateService;
- @ApiOperation(value = "鑾峰彇妫�楠屾ā鏉垮垪琛�")
+ @ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
@PostMapping("/selectStandardTemplatePageList")
public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -29,22 +29,29 @@
return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
}
- @ApiOperation(value = "娣诲姞妫�楠屾ā鏉�")
+ @ApiOperation(value = "娣诲姞鍘熷璁板綍妯℃澘")
@PostMapping("/addStandardTemplate")
public Result addStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
return Result.success(standardTemplateService.addStandardTemplate(standardTemplate));
}
- @ApiOperation(value = "淇敼妫�楠屾ā鏉�")
+ @ApiOperation(value = "淇敼鍘熷璁板綍妯℃澘")
@PostMapping("/upStandardTemplate")
public Result<?> upStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
return Result.success(standardTemplateService.upStandardTemplate(standardTemplate));
}
- @ApiOperation(value = "鍒犻櫎妫�楠屾ā鏉�")
+ @ApiOperation(value = "鍒犻櫎鍘熷璁板綍妯℃澘")
@PostMapping("/delStandardTemplate")
public Result<?> delStandardTemplate(Integer id) {
return Result.success(standardTemplateService.delStandardTemplate(id));
}
+ @ApiOperation(value = "鏌ヨ鍘熷璁板綍妯℃澘鏋氫妇")
+ @GetMapping("/getStandardTemplate")
+ @ValueAuth
+ public Result<?> getStandardTemplate() {
+ return Result.success(standardTemplateService.getStandardTemplate());
+ }
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
index e290565..1051f71 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -64,6 +64,9 @@
*/
private String model;
+ @ApiModelProperty("瀛愬疄楠屽")
+ private String sonLaboratory;
+
/**
* 璁￠噺鍗曚綅
*/
@@ -139,6 +142,9 @@
*/
private Integer state;
+ @ApiModelProperty("鍨嬪彿")
+ private Integer templateId;
+
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
index ba54bf8..90e7901 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
@@ -48,6 +48,9 @@
@ApiModelProperty("瀹為獙瀹�")
private String laboratory;
+ @ApiModelProperty("瀛愬疄楠屽")
+ private String sonLaboratory;
+
/**
* 璁￠噺鍗曚綅
*/
@@ -64,7 +67,7 @@
* 宸ユ椂(H)
*/
@ApiModelProperty("宸ユ椂")
- private Integer manHour;
+ private Double manHour;
/**
* 宸ユ椂鍒嗙粍
@@ -150,6 +153,9 @@
@ApiModelProperty("鍨嬪彿")
private String model;
+ @ApiModelProperty("鍨嬪彿")
+ private Integer templateId;
+
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTemplateService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTemplateService.java
index e8a13c8..c743f10 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTemplateService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTemplateService.java
@@ -4,6 +4,7 @@
import com.yuanchu.mom.pojo.StandardTemplate;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
import java.util.Map;
/**
@@ -21,4 +22,6 @@
int delStandardTemplate(Integer id);
+ List<StandardTemplate> getStandardTemplate();
+
}
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 7e88f08..8eb4964 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,6 +1,7 @@
package com.yuanchu.mom.service.impl;
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;
@@ -12,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -52,6 +54,11 @@
public int delStandardTemplate(Integer id) {
return standardTemplateMapper.deleteById(id);
}
+
+ @Override
+ public List<StandardTemplate> getStandardTemplate() {
+ return standardTemplateMapper.selectList(Wrappers.<StandardTemplate>lambdaQuery().select(StandardTemplate::getId,StandardTemplate::getName));
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index 9afd65f..fe4ec92 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -48,7 +48,7 @@
@Transactional(rollbackFor = Exception.class)
public int addStandardTree(StandardTree standardTree) {
if(standardTree.getSample()!=null){
- List<StandardProductList> list = standardTreeMapper.getStandardProductListBySample(standardTree.getSample());
+ List<StandardProductList> list = standardTreeMapper.getStandardProductListBySample(standardTree.getSampleType());
for (StandardProductList standardProductList : list) {
standardProductList.setFactory(standardTree.getFactory());
standardProductList.setLaboratory(standardTree.getLaboratory());
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 03a9f53..ab82d54 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -66,7 +66,9 @@
value_type,
method,
man_day,
- bsm
+ bsm,
+ template_id,
+ son_laboratory
from structure_item_parameter
where method = #{code}
</select>
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index d4e6bab..12edc0e 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -56,6 +56,7 @@
inspection_item_classify,
inspection_item_subclass,
laboratory,
+ son_laboratory,
unit,
price,
man_hour,
@@ -68,7 +69,8 @@
value_type,
method,
man_day,
- bsm
+ bsm,
+ template_id
from structure_item_parameter
where id = #{id}
</select>
@@ -77,6 +79,7 @@
inspection_item_classify,
inspection_item_subclass,
laboratory,
+ son_laboratory,
unit,
price,
man_hour,
@@ -90,7 +93,8 @@
method,
man_day,
sample,
- bsm
+ bsm,
+ template_id
from structure_item_parameter
where sample = #{sample}
</select>
--
Gitblit v1.9.3