From 043c1adb3047489ec8c2d2d50ddc49d7856901ee Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 12 三月 2024 18:01:23 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 12 +
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 50 +++++++
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTemplateService.java | 24 +++
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java | 78 +++++++++++
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 80 +++++++----
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 12 +
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 1
inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml | 36 +++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTemplateMapper.java | 22 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java | 59 ++++++++
11 files changed, 343 insertions(+), 33 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 8e4b1b1..83ab2fa 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
@@ -29,12 +29,12 @@
@ApiModelProperty(value = "妫�楠岄」")
private String inspectionItem;
- @ValueTableShow(2)
- @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
- private String inspectionItemClassify;
+// @ValueTableShow(2)
+// @ApiModelProperty(value = "妫�楠屽瓙椤�")
+// private String inspectionItemClassify;
@ValueTableShow(3)
- @ApiModelProperty(value = "妫�楠岄」灏忕被")
+ @ApiModelProperty(value = "妫�楠岄」瀛愰」")
private String inspectionItemSubclass;
@ValueTableShow(4)
@@ -93,6 +93,10 @@
@ApiModelProperty(value = "鐗规畩鏍囪瘑")
private String bsm;
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ private String sample;
+
@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 d2894e5..1958854 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -27,6 +27,7 @@
method,
man_day,
bsm,
+ sample,
inspection_value_type
from structure_item_parameter
<if test="ew.customSqlSegment != null and 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
new file mode 100644
index 0000000..0a312bd
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
@@ -0,0 +1,50 @@
+package com.yuanchu.mom.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.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 java.util.Map;
+
+@RequestMapping("/StandardTemplate")
+@RestController
+@AllArgsConstructor
+public class StandardTemplateController {
+
+ private StandardTemplateService standardTemplateService;
+
+ @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);
+ StandardTemplate standardTemplate = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardTemplate.class);
+ return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
+ }
+
+ @ApiOperation(value = "娣诲姞妫�楠屾ā鏉�")
+ @PostMapping("/addStandardTemplate")
+ public Result addStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
+ return Result.success(standardTemplateService.addStandardTemplate(standardTemplate));
+ }
+
+ @ApiOperation(value = "淇敼妫�楠屾ā鏉�")
+ @PostMapping("/upStandardTemplate")
+ public Result<?> upStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
+ return Result.success(standardTemplateService.upStandardTemplate(standardTemplate));
+ }
+
+ @ApiOperation(value = "鍒犻櫎妫�楠屾ā鏉�")
+ @PostMapping("/delStandardTemplate")
+ public Result<?> delStandardTemplate(Integer id) {
+ return Result.success(standardTemplateService.delStandardTemplate(id));
+ }
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTemplateMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTemplateMapper.java
new file mode 100644
index 0000000..537f616
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTemplateMapper.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.pojo.StandardTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_template(鏍囧噯妯℃澘)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-11 13:47:52
+* @Entity com.yuanchu.mom.pojo.StandardTemplate
+*/
+public interface StandardTemplateMapper extends BaseMapper<StandardTemplate> {
+
+ IPage<StandardTemplate> selectStandardTemplatePageList(IPage<StandardTemplate> page, QueryWrapper<StandardTemplate> ew);
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
index 41b3e83..1063ef0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
@@ -19,6 +19,8 @@
StandardProductList selectStandardProductById(Integer id);
+ List<StandardProductList> getStandardProductListBySample(String sample);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java
new file mode 100644
index 0000000..d5772d0
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java
@@ -0,0 +1,78 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鏍囧噯妯℃澘
+ * @TableName standard_template
+ */
+@TableName(value ="standard_template")
+@Data
+public class StandardTemplate extends OrderBy implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 妯℃澘鍚嶇О
+ */
+ @ApiModelProperty("妯℃澘鍚嶇О")
+ @ValueTableShow(1)
+ private String name;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @ValueTableShow(2)
+ private String remark;
+
+ /**
+ * 妯℃澘缁撴瀯
+ */
+ private String thing;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+ /**
+ *
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ValueTableShow(4)
+ private LocalDateTime createTime;
+ /**
+ *
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+ /**
+ *
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ValueTableShow(6)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @ValueTableShow(3)
+ private String createUserName;
+
+ @ApiModelProperty("鏇存柊鐢ㄦ埛")
+ @ValueTableShow(5)
+ private String updateUserName;
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..e8a13c8
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTemplateService.java
@@ -0,0 +1,24 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.pojo.StandardTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_template(鏍囧噯妯℃澘)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-03-11 13:47:52
+*/
+public interface StandardTemplateService extends IService<StandardTemplate> {
+
+ Map<String, Object> selectStandardTemplatePageList(IPage<StandardTemplate> page, StandardTemplate standardTemplate);
+
+ int addStandardTemplate(StandardTemplate standardTemplate);
+
+ int upStandardTemplate(StandardTemplate standardTemplate);
+
+ int delStandardTemplate(Integer id);
+
+}
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
new file mode 100644
index 0000000..7e88f08
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTemplateServiceImpl.java
@@ -0,0 +1,59 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.common.PrintChina;
+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;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_template(鏍囧噯妯℃澘)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-11 13:47:52
+*/
+@Service
+@AllArgsConstructor
+public class StandardTemplateServiceImpl extends ServiceImpl<StandardTemplateMapper, StandardTemplate>
+ implements StandardTemplateService{
+
+ private GetLook getLook;
+
+ private StandardTemplateMapper standardTemplateMapper;
+
+ @Override
+ public Map<String, Object> selectStandardTemplatePageList(IPage<StandardTemplate> page, StandardTemplate standardTemplate) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(StandardTemplate.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectStandardTemplatePageList");
+ if(map1.get("look")==1) standardTemplate.setCreateUser(map1.get("userId"));
+ map.put("body", standardTemplateMapper.selectStandardTemplatePageList(page, QueryWrappers.queryWrappers(standardTemplate)));
+ return map;
+ }
+
+ @Override
+ public int addStandardTemplate(StandardTemplate standardTemplate) {
+ return standardTemplateMapper.insert(standardTemplate);
+ }
+
+ @Override
+ public int upStandardTemplate(StandardTemplate standardTemplate) {
+ return standardTemplateMapper.updateById(standardTemplate);
+ }
+
+ @Override
+ public int delStandardTemplate(Integer id) {
+ return standardTemplateMapper.deleteById(id);
+ }
+}
+
+
+
+
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 a7432b1..9afd65f 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
@@ -45,7 +45,19 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public int addStandardTree(StandardTree standardTree) {
+ if(standardTree.getSample()!=null){
+ List<StandardProductList> list = standardTreeMapper.getStandardProductListBySample(standardTree.getSample());
+ for (StandardProductList standardProductList : list) {
+ standardProductList.setFactory(standardTree.getFactory());
+ standardProductList.setLaboratory(standardTree.getLaboratory());
+ standardProductList.setSampleType(standardTree.getSampleType());
+ standardProductList.setSample(standardTree.getSample());
+ standardProductList.setModel(standardTree.getModel());
+ standardProductListMapper.insert(standardProductList);
+ }
+ }
return standardTreeMapper.insert(standardTree);
}
diff --git a/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml b/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml
new file mode 100644
index 0000000..786e5b1
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/StandardTemplateMapper.xml
@@ -0,0 +1,36 @@
+<?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.yuanchu.mom.mapper.StandardTemplateMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardTemplate">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="thing" column="thing" jdbcType="VARCHAR"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,name,remark,
+ thing,create_user,update_user,
+ create_time,update_time
+ </sql>
+ <select id="selectStandardTemplatePageList" resultType="com.yuanchu.mom.pojo.StandardTemplate">
+ select * from (
+ select st.id, st.name, remark, thing, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time
+ from standard_template st
+ left join user u2 on u2.id = st.create_user
+ left join user u3 on u3.id = st.update_user
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
+
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 5be0059..fc7e938 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -5,16 +5,16 @@
<mapper namespace="com.yuanchu.mom.mapper.StandardTreeMapper">
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardTree">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="factory" column="factory" jdbcType="VARCHAR"/>
- <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
- <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
- <result property="sample" column="sample" jdbcType="VARCHAR"/>
- <result property="model" column="model" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="factory" column="factory" jdbcType="VARCHAR"/>
+ <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+ <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
+ <result property="sample" column="sample" jdbcType="VARCHAR"/>
+ <result property="model" column="model" jdbcType="VARCHAR"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<resultMap id="FactoryDto" type="com.yuanchu.mom.dto.FactoryDto">
@@ -47,29 +47,51 @@
</resultMap>
<select id="selectStandardTreeList" resultMap="FactoryDto">
- select factory,laboratory,sample_type,sample,model from standard_tree
+ select factory, laboratory, sample_type, sample, model
+ from standard_tree
</select>
<select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select
- inspection_item,
- inspection_item_classify,
- inspection_item_subclass,
- laboratory,
- unit,
- price,
- man_hour,
- man_hour_group,
- inspection_item_type,
- inspection_value_type,
- device_group,
- checkout_number,
- section,
- value_type,
- method,
- man_day,
- bsm
+ select inspection_item,
+ inspection_item_classify,
+ inspection_item_subclass,
+ laboratory,
+ unit,
+ price,
+ man_hour,
+ man_hour_group,
+ inspection_item_type,
+ inspection_value_type,
+ device_group,
+ checkout_number,
+ section,
+ value_type,
+ method,
+ man_day,
+ bsm
from structure_item_parameter
where id = #{id}
</select>
+ <select id="getStandardProductListBySample" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select inspection_item,
+ inspection_item_classify,
+ inspection_item_subclass,
+ laboratory,
+ unit,
+ price,
+ man_hour,
+ man_hour_group,
+ inspection_item_type,
+ inspection_value_type,
+ device_group,
+ checkout_number,
+ section,
+ value_type,
+ method,
+ man_day,
+ sample,
+ bsm
+ from structure_item_parameter
+ where sample = #{sample}
+ </select>
</mapper>
--
Gitblit v1.9.3