From 0a305b633bb743f01cbb636670c2fc02620168d0 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 01 四月 2025 15:06:24 +0800
Subject: [PATCH] 标准库功能修改备份开发
---
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 2
basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListChcekTypeEnums.java | 34 ++
basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml | 12
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 18 +
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListBackupRel.java | 222 +++++++++++++++++
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListBackupRelMapper.java | 18 +
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java | 20 +
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 3
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java | 228 +++++++++++++++++
basic-server/src/main/java/com/ruoyi/basic/enums/TestPorjectTypeEnums.java | 2
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordMapper.java | 30 ++
basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListOperationTypeEnums.java | 33 ++
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 7
basic-server/src/main/java/com/ruoyi/basic/dto/StandardProductListDto.java | 23 +
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 122 +++++++-
16 files changed, 748 insertions(+), 28 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 718dd01..373e0e9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -2,11 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListSupplierAskService;
@@ -255,4 +254,17 @@
public Result copyStandardProductSort(@RequestBody CopyStandardProductListDto copyStandardProductListDto) {
return Result.success(standardProductListService.copyStandardProductSort(copyStandardProductListDto));
}
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」澶勭悊")
+ @PostMapping("/productListOperate")
+ public Result productListOperate(@RequestBody StandardProductListDto standardProductListDto) {
+ standardProductListService.productListOperate(standardProductListDto);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ")
+ @GetMapping("/standardProductListRecordPage")
+ public Result standardProductListRecordPage(Page page, StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ return Result.success(standardProductListService.standardProductListRecordPage(page,standardProductListUpdateRecord));
+ }
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/StandardProductListDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/StandardProductListDto.java
new file mode 100644
index 0000000..43e1143
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/StandardProductListDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.basic.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ruoyi.basic.pojo.StandardProductList;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
+ * @TableName standard_product_list
+ */
+@Data
+public class StandardProductListDto extends StandardProductList {
+
+ private String operationStatus;
+
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListChcekTypeEnums.java b/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListChcekTypeEnums.java
new file mode 100644
index 0000000..a848a28
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListChcekTypeEnums.java
@@ -0,0 +1,34 @@
+package com.ruoyi.basic.enums;
+
+public enum StandardProductListChcekTypeEnums {
+
+ WAIT_CHECK("0","鏈鏍�"),
+ CHECK_ING("1","瀹℃牳涓�"),
+ PASS_CHECK("2","瀹℃牳閫氳繃"),
+ NO_PASS_CHECK("3","瀹℃牳鏈�氳繃");
+
+ private String code;
+
+ private String name;
+
+ StandardProductListChcekTypeEnums(String code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListOperationTypeEnums.java b/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListOperationTypeEnums.java
new file mode 100644
index 0000000..af44dee
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListOperationTypeEnums.java
@@ -0,0 +1,33 @@
+package com.ruoyi.basic.enums;
+
+public enum StandardProductListOperationTypeEnums {
+
+ SUBMIT_OP("0","鎻愪氦"),
+ PASS_CHECK_OP("1","瀹℃牳閫氳繃"),
+ NO_PASS_CHECK_OP("2","瀹℃牳鏈�氳繃");
+
+ private String code;
+
+ private String name;
+
+ StandardProductListOperationTypeEnums(String code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/enums/TestPorjectTypeEnums.java b/basic-server/src/main/java/com/ruoyi/basic/enums/TestPorjectTypeEnums.java
index 01b0848..5472940 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/enums/TestPorjectTypeEnums.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/enums/TestPorjectTypeEnums.java
@@ -2,7 +2,7 @@
public enum TestPorjectTypeEnums {
- RAW_MATERIALS("1","鍘熻緟鏂�"),
+ RAW_MATERIALS("1","鍘熻緟鏉�"),
FINISHED_PRODUCT("2","鎴愬搧"),
SEMI_FINISHED_PRODUCT("3","鍗婃垚鍝�"),
PURCHASED_PART("4","澶栬喘浠�"),
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListBackupRelMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListBackupRelMapper.java
new file mode 100644
index 0000000..85473b0
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListBackupRelMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.basic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.basic.pojo.StandardProductListBackupRel;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-05 10:33:29
+* @Entity com.ruoyi.basic.pojo.StandardProductList
+*/
+public interface StandardProductListBackupRelMapper extends BaseMapper<StandardProductListBackupRel> {
+
+}
+
+
+
+
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
index 05c0fdf..2802d56 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductListUpdateRecord;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordMapper.java
new file mode 100644
index 0000000..d51d5f1
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordMapper.java
@@ -0,0 +1,30 @@
+package com.ruoyi.basic.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.StandardProductListUpdateRecord;
+import org.apache.ibatis.annotations.Param;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-05 10:33:29
+* @Entity com.ruoyi.basic.pojo.StandardProductList
+*/
+public interface StandardProductListUpdateRecordMapper extends BaseMapper<StandardProductListUpdateRecord> {
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param ew
+ * @return
+ */
+ IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, @Param("ew") QueryWrapper<StandardProductListUpdateRecord> ew);
+}
+
+
+
+
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
index fd0d620..35072cf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
@@ -219,4 +219,7 @@
*/
@ApiModelProperty("瀵间綋绫诲瀷")
private String conductorType;
+
+ @ApiModelProperty("瀹℃牳鐘舵�� 0 鏈鏍� 1 瀹℃牳涓� 2 瀹℃牳閫氳繃 3 瀹℃牳鏈�氳繃")
+ private String checkStatus;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListBackupRel.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListBackupRel.java
new file mode 100644
index 0000000..afb3632
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListBackupRel.java
@@ -0,0 +1,222 @@
+package com.ruoyi.basic.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
+ * @TableName standard_product_list
+ */
+@TableName(value ="standard_product_list_backup_rel")
+@Data
+public class StandardProductListBackupRel implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(value = "id",type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 妫�楠岄」
+ */
+ @ApiModelProperty("妫�楠岄」")
+ private String inspectionItem;
+
+ @ApiModelProperty("妫�楠岄」EN")
+ private String inspectionItemEn;
+
+ /**
+ * 妫�楠岄」灏忕被
+ */
+ @ApiModelProperty("妫�楠岄」灏忕被")
+ private String inspectionItemSubclass;
+
+ @ApiModelProperty("妫�楠岄」灏忕被EN")
+ private String inspectionItemSubclassEn;
+
+ /**
+ * 瀹為獙瀹�
+ */
+ @ApiModelProperty("瀹為獙瀹�")
+ private String laboratory;
+
+ @ApiModelProperty("瀛愬疄楠屽")
+ private String sonLaboratory;
+
+ /**
+ * 璁￠噺鍗曚綅
+ */
+ @ApiModelProperty("璁￠噺鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环(鍏�)
+ */
+ @ApiModelProperty("鍗曚环")
+ private String price;
+
+ /**
+ * 宸ユ椂(H)
+ */
+ @ApiModelProperty("宸ユ椂")
+ private String manHour;
+
+ /**
+ * 宸ユ椂鍒嗙粍
+ */
+ @ApiModelProperty("宸ユ椂鍒嗙粍")
+ private String manHourGroup;
+
+ /**
+ * 妫�楠岄」绫诲瀷
+ */
+ @ApiModelProperty("妫�楠岄」绫诲瀷")
+ private String inspectionItemType;
+
+ /**
+ * 妫�楠屽�肩被鍨�
+ */
+ @ApiModelProperty("妫�楠屽�肩被鍨�")
+ private String inspectionValueType;
+
+ /**
+ * 妫�楠屾鏁�
+ */
+ @ApiModelProperty("妫�楠屾鏁�")
+ private Integer checkoutNumber;
+
+ /**
+ * 鍖洪棿
+ */
+ @ApiModelProperty("鍖洪棿")
+ private String section;
+
+ /**
+ * 鍖洪棿
+ */
+ @ApiModelProperty("鑺暟鍖洪棿")
+ private String cores;
+
+ /**
+ * 鏂规硶
+ */
+ @ApiModelProperty("鏂规硶鍒楄〃")
+ private String method;
+
+ @ApiModelProperty("鏂规硶")
+ private String methodS;
+
+ /**
+ * 棰勮鏃堕棿(澶�)
+ */
+ @ApiModelProperty("棰勮鏃堕棿")
+ private Integer manDay;
+
+ /**
+ * 鐗规畩鏍囪瘑
+ */
+ @ApiModelProperty("鐗规畩鏍囪瘑")
+ private String bsm;
+
+ /**
+ * 瑕佹眰鍊�
+ */
+ @ApiModelProperty("瑕佹眰鍊�")
+ private String ask;
+
+ @ApiModelProperty("瑕佹眰鎻忚堪")
+ private String tell;
+
+ /**
+ * 澶栭敭锛氭爣鍑嗘柟娉昳d
+ */
+ @ApiModelProperty("鏍囧噯鏂规硶id")
+ private Integer standardMethodListId;
+
+ @ApiModelProperty("宸ュ巶")
+ private String factory;
+
+ @ApiModelProperty("鏍峰搧鍒嗙被")
+ private String sampleType;
+
+ @ApiModelProperty("鏍峰搧")
+ private String sample;
+
+ @ApiModelProperty("鍨嬪彿")
+ private String model;
+
+ @ApiModelProperty("妯℃澘id")
+ private Integer templateId;
+
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+ /**
+ *
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+ /**
+ *
+ */
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+ /**
+ *
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
+ private Integer state;
+
+ private String dic;
+
+ private String tree;
+
+ @ApiModelProperty("妫�楠岄」id")
+ private Integer structureItemParameterId;
+
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+ private String inspectionItemClass;
+
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+ private String inspectionItemClassEn;
+
+ @ApiModelProperty(value = "鏉′欢")
+ private String radius;
+
+ @ApiModelProperty(value = "鏉′欢鍒楄〃")
+ private String radiusList;
+
+ @ApiModelProperty(value = "鏀惰垂鏍囧噯(鍏�/娆�)")
+ private String rates;
+
+ @ApiModelProperty(value = "绱㈠紩椤哄簭")
+ private Integer sort;
+
+ /**
+ * 瀵间綋鏉愯川
+ */
+ @ApiModelProperty("瀵间綋鏉愯川")
+ private String conductorMaterial;
+
+ /**
+ * 瀵间綋绫诲瀷
+ */
+ @ApiModelProperty("瀵间綋绫诲瀷")
+ private String conductorType;
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java
new file mode 100644
index 0000000..6b3bce8
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java
@@ -0,0 +1,228 @@
+package com.ruoyi.basic.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
+ * @TableName standard_product_list
+ */
+@TableName(value ="standard_product_list_backup_rel")
+@Data
+public class StandardProductListUpdateRecord implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(value = "id",type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 妫�楠岄」
+ */
+ @ApiModelProperty("妫�楠岄」")
+ private String inspectionItem;
+
+ @ApiModelProperty("妫�楠岄」EN")
+ private String inspectionItemEn;
+
+ /**
+ * 妫�楠岄」灏忕被
+ */
+ @ApiModelProperty("妫�楠岄」灏忕被")
+ private String inspectionItemSubclass;
+
+ @ApiModelProperty("妫�楠岄」灏忕被EN")
+ private String inspectionItemSubclassEn;
+
+ /**
+ * 瀹為獙瀹�
+ */
+ @ApiModelProperty("瀹為獙瀹�")
+ private String laboratory;
+
+ @ApiModelProperty("瀛愬疄楠屽")
+ private String sonLaboratory;
+
+ /**
+ * 璁￠噺鍗曚綅
+ */
+ @ApiModelProperty("璁￠噺鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环(鍏�)
+ */
+ @ApiModelProperty("鍗曚环")
+ private String price;
+
+ /**
+ * 宸ユ椂(H)
+ */
+ @ApiModelProperty("宸ユ椂")
+ private String manHour;
+
+ /**
+ * 宸ユ椂鍒嗙粍
+ */
+ @ApiModelProperty("宸ユ椂鍒嗙粍")
+ private String manHourGroup;
+
+ /**
+ * 妫�楠岄」绫诲瀷
+ */
+ @ApiModelProperty("妫�楠岄」绫诲瀷")
+ private String inspectionItemType;
+
+ /**
+ * 妫�楠屽�肩被鍨�
+ */
+ @ApiModelProperty("妫�楠屽�肩被鍨�")
+ private String inspectionValueType;
+
+ /**
+ * 妫�楠屾鏁�
+ */
+ @ApiModelProperty("妫�楠屾鏁�")
+ private Integer checkoutNumber;
+
+ /**
+ * 鍖洪棿
+ */
+ @ApiModelProperty("鍖洪棿")
+ private String section;
+
+ /**
+ * 鍖洪棿
+ */
+ @ApiModelProperty("鑺暟鍖洪棿")
+ private String cores;
+
+ /**
+ * 鏂规硶
+ */
+ @ApiModelProperty("鏂规硶鍒楄〃")
+ private String method;
+
+ @ApiModelProperty("鏂规硶")
+ private String methodS;
+
+ /**
+ * 棰勮鏃堕棿(澶�)
+ */
+ @ApiModelProperty("棰勮鏃堕棿")
+ private Integer manDay;
+
+ /**
+ * 鐗规畩鏍囪瘑
+ */
+ @ApiModelProperty("鐗规畩鏍囪瘑")
+ private String bsm;
+
+ /**
+ * 瑕佹眰鍊�
+ */
+ @ApiModelProperty("瑕佹眰鍊�")
+ private String ask;
+
+ @ApiModelProperty("瑕佹眰鎻忚堪")
+ private String tell;
+
+ /**
+ * 澶栭敭锛氭爣鍑嗘柟娉昳d
+ */
+ @ApiModelProperty("鏍囧噯鏂规硶id")
+ private Integer standardMethodListId;
+
+ @ApiModelProperty("宸ュ巶")
+ private String factory;
+
+ @ApiModelProperty("鏍峰搧鍒嗙被")
+ private String sampleType;
+
+ @ApiModelProperty("鏍峰搧")
+ private String sample;
+
+ @ApiModelProperty("鍨嬪彿")
+ private String model;
+
+ @ApiModelProperty("妯℃澘id")
+ private Integer templateId;
+
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+ /**
+ *
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+ /**
+ *
+ */
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+ /**
+ *
+ */
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
+ private Integer state;
+
+ private String dic;
+
+ private String tree;
+
+ @ApiModelProperty("妫�楠岄」id")
+ private Integer structureItemParameterId;
+
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+ private String inspectionItemClass;
+
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+ private String inspectionItemClassEn;
+
+ @ApiModelProperty(value = "鏉′欢")
+ private String radius;
+
+ @ApiModelProperty(value = "鏉′欢鍒楄〃")
+ private String radiusList;
+
+ @ApiModelProperty(value = "鏀惰垂鏍囧噯(鍏�/娆�)")
+ private String rates;
+
+ @ApiModelProperty(value = "绱㈠紩椤哄簭")
+ private Integer sort;
+
+ /**
+ * 瀵间綋鏉愯川
+ */
+ @ApiModelProperty("瀵间綋鏉愯川")
+ private String conductorMaterial;
+
+ /**
+ * 瀵间綋绫诲瀷
+ */
+ @ApiModelProperty("瀵间綋绫诲瀷")
+ private String conductorType;
+
+ @ApiModelProperty("鏍囧噯鏍戜笅妫�楠岄」鐩〃ID")
+ private Long standardProductListId;
+
+ @ApiModelProperty("鎿嶄綔璁板綍 0 淇敼 1 瀹℃牳閫氳繃 2 瀹℃牳鏈�氳繃")
+ private String operationType;
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
index f2eff64..652dc9f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
@@ -2,11 +2,15 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.dto.StandardProductListDto;
import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductListUpdateRecord;
+import com.ruoyi.basic.pojo.StructureItemParameter;
import java.util.List;
import java.util.Map;
@@ -22,7 +26,7 @@
List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample);
- Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree);
+ Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree );
IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items);
@@ -62,4 +66,18 @@
* @return
*/
boolean copyStandardProductSort(CopyStandardProductListDto copyStandardProductListDto);
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」澶勭悊
+ * @param standardProductListDto
+ */
+ void productListOperate(StandardProductListDto standardProductListDto);
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ * @param page
+ * @param record
+ * @return
+ */
+ IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index e0a265f..55ade8f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -7,16 +7,17 @@
import com.baomidou.mybatisplus.core.toolkit.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.enums.BasicTreeEnums;
+import com.ruoyi.basic.enums.StandardProductListChcekTypeEnums;
+import com.ruoyi.basic.enums.StandardProductListOperationTypeEnums;
import com.ruoyi.basic.mapper.*;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardMethodService;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ProductDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
import com.ruoyi.basic.service.StandardProductListService;
import lombok.AllArgsConstructor;
import org.apache.catalina.security.SecurityUtil;
@@ -59,9 +60,36 @@
@Autowired
private StructureItemParameterMapper structureItemParameterMapper;
+ @Autowired
+ private ModelMapper modelMapper;
+
+ @Autowired
+ private StandardProductListBackupRelMapper standardProductListBackupRelMapper;
+
+ @Autowired
+ private StandardProductListUpdateRecordMapper standardProductListUpdateRecordMapper;
+
@Override
public int upStandardProductList(StandardProductList list) {
+ // 鏍规嵁id 鏌ヨ鍒板師濮嬪��
+ StandardProductList standardProductList = standardProductListMapper.selectById(list.getId());
+ if(ObjectUtils.isEmpty(standardProductList)){
+ throw new RuntimeException("鏇存柊澶辫触,鏈煡鎵惧埌妫�鏌ラ」");
+ }
+ // 鍒ゆ柇褰撳墠鐘舵�� 濡傛灉鏄鏍镐腑
+ if(StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())){
+ throw new RuntimeException("瀹℃牳涓笉鏀寔淇敼");
+ }
+ // 鏌ヨ鏈�鏂扮殑涓�娆″叧鑱斿浠� 濡傛灉瀛樺湪璇存槑鏈鏍稿畬缁х画淇敼浜嗐�備笉鍋氭暟鎹鐞嗐��
+ StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(list.getId());
+ if(ObjectUtils.isEmpty(standardProductListBackupRel)){
+ StandardProductListBackupRel productListBackupRel = new StandardProductListBackupRel();
+ BeanUtils.copyProperties(standardProductList, productListBackupRel);
+ standardProductListBackupRelMapper.insert(productListBackupRel);
+ }
+ // 淇敼鐘舵��
+ list.setCheckStatus(StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
return standardProductListMapper.updateById(list);
}
@@ -290,6 +318,7 @@
String sampleType = "";
String sample = "";
String model = "";
+ StringBuilder checkItemQueryTree = new StringBuilder(); // 妫�鏌ラ」鏌ヨ 鍙嫾鎺� 妫�鏌ュ璞�-浜у搧
// 杩斿洖缁撴灉
Map<String, Object> map = new HashMap<>();
@@ -303,57 +332,60 @@
if(trees == null && trees.length < 4){
return map;
}
- StringBuilder queryTreeBuilder = new StringBuilder();
// 杞﹂棿灞傜骇澶氫竴灞傜骇
if(existWorkShopFlag){
switch (trees.length) {
case 7:
- queryTreeBuilder.append("[").append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\",\"").append(trees[6]).append("\"").append("]");
sampleType = trees[4];
sample = trees[5];
model = trees[6];
+ checkItemQueryTree.append("[").append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"").append("]");
break;
case 6:
- queryTreeBuilder.append("[").append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"").append("]");
sampleType = trees[4];
sample = trees[5];
+ checkItemQueryTree.append("[").append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"").append("]");
break;
case 5:
- queryTreeBuilder.append("[").append("\"").append(trees[4]).append("\"").append("]");
sampleType = trees[4];
+ checkItemQueryTree.append("[").append("\"").append(trees[4]).append("\"").append("]");
break;
}
}else {
switch (trees.length) {
case 6:
- queryTreeBuilder.append("[").append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"").append("]");
sampleType = trees[3];
sample = trees[4];
model = trees[5];
+ checkItemQueryTree.append("[").append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"").append("]");
break;
case 5:
- queryTreeBuilder.append("[").append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"").append("]");
sampleType = trees[3];
sample = trees[4];
+ checkItemQueryTree.append("[").append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"").append("]");
break;
case 4:
- queryTreeBuilder.append("[").append("\"").append(trees[3]).append("\"").append("]");
sampleType = trees[3];
+ checkItemQueryTree.append("[").append("\"").append(trees[3]).append("\"").append("]");
break;
}
}
- if(StringUtils.isEmpty(queryTreeBuilder.toString())){
+ if(StringUtils.isEmpty(checkItemQueryTree.toString())){
return map;
}
- // 鏍规嵁妫�楠屽璞�/浜у搧/鍨嬪彿鏌ヨ妫�楠岄」
- List<StructureItemParameter> structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(queryTreeBuilder.toString());
+ // 鏍规嵁妫�楠屽璞�/浜у搧鏌ヨ妫�楠岄」
+ List<StructureItemParameter> structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(checkItemQueryTree.toString());
+ // 濡傛灉鏄骇鍝佺殑妫�鏌ラ」涓虹┖鍚戜笂鎺�
+ if(CollectionUtils.isEmpty(structureItemParameterList)){
+ String query = "[\"" + sampleType + "\"]";
+ structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(query);
+ }
// 鏌ヨ鏍囧噯搴撳凡缁戝畾妫�鏌ラ」鐩�
List<StandardProductList> standardProductList = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
.eq(StandardProductList::getStandardMethodListId, id)
.like(StandardProductList::getTree, tree)
.orderByAsc(StandardProductList::getSort));
-
// 灏佽鍙傛暟
List<StandardProductList> batchInsertStandardProductListArray = new ArrayList<>();
@@ -374,19 +406,18 @@
addStandProductList.setStructureItemParameterId(structureItemParameter.getId());
}
- addStandProductList.setId(null);
+ addStandProductList.setId(addStandProductList.getId() != null ? addStandProductList.getId() : IdWorker.getId());
batchInsertStandardProductListArray.add(addStandProductList);
}
-
// 鎺掑簭澶勭悊 宸叉湁椤哄簭鎸夌収鍘熼『搴� 娌℃湁椤哄簭鐨勬寜鐓ф楠岄」鐨刬d鍗囧簭锛岄粯璁ゆ帓鍦ㄦ渶鍚�
batchInsertStandardProductListArray.sort(Comparator.comparing((StandardProductList item) -> item.getSort() != null ? item.getSort() : Integer.MAX_VALUE)
.thenComparing(StandardProductList::getStructureItemParameterId));
// 鍒犻櫎鍘熺粦瀹氭暟鎹�
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getStandardMethodListId, id)
- .eq(StandardProductList::getTree, tree));
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .eq(StandardProductList::getTree, tree));
for (int i = 0; i < batchInsertStandardProductListArray.size(); i++) {
StandardProductList productList = batchInsertStandardProductListArray.get(i);
@@ -611,6 +642,59 @@
this.updateBatchById(productLists);
return false;
}
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」澶勭悊
+ * @param standardProductListDto
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void productListOperate(StandardProductListDto standardProductListDto) {
+ StandardProductList standardProductList = new StandardProductList();
+ standardProductList.setId(standardProductListDto.getId());
+ StandardProductListUpdateRecord standardProductListUpdateRecord = new StandardProductListUpdateRecord();
+ // 瀹℃牳閫氳繃
+ if(StandardProductListOperationTypeEnums.PASS_CHECK_OP.getCode().equals(standardProductListDto.getOperationStatus())){
+ // 鍒犻櫎澶囦唤鏁版嵁
+ standardProductListBackupRelMapper.deleteById(standardProductListDto.getId());
+ standardProductList.setCheckStatus(StandardProductListChcekTypeEnums.PASS_CHECK.getCode());
+ // 瀹℃牳涓嶉�氳繃
+ }else if(StandardProductListOperationTypeEnums.NO_PASS_CHECK_OP.getCode().equals(standardProductListDto.getOperationStatus())) {
+ // 杩樺師鏁版嵁
+ StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(standardProductListDto.getId());
+ if(ObjectUtils.isEmpty(standardProductListBackupRel)){
+ throw new RuntimeException("澶囦唤鏁版嵁鏌ユ壘澶辫触");
+ }
+ BeanUtils.copyProperties(standardProductListBackupRel, standardProductList);
+ standardProductList.setCheckStatus(StandardProductListChcekTypeEnums.NO_PASS_CHECK.getCode());
+ // 鎻愪氦
+ }else if(StandardProductListOperationTypeEnums.SUBMIT_OP.getCode().equals(standardProductListDto.getOperationStatus())) {
+ standardProductListUpdateRecord.setOperationType(StandardProductListOperationTypeEnums.PASS_CHECK_OP.getCode());
+ standardProductList.setCheckStatus(StandardProductListChcekTypeEnums.CHECK_ING.getCode());
+ } else {
+ throw new RuntimeException("鎿嶄綔鏈夎");
+ }
+ // 鏂板鎿嶄綔璁板綍
+ standardProductListUpdateRecord.setStandardProductListId(standardProductListDto.getId());
+ standardProductListUpdateRecord.setOperationType(standardProductListDto.getOperationStatus());
+ standardProductListUpdateRecordMapper.insert(standardProductListUpdateRecord);
+ // 淇敼瀹℃牳鐘舵��
+ standardProductList.setCheckStatus(standardProductListDto.getOperationStatus());
+ standardProductListMapper.updateById(standardProductList);
+ }
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ * @param page
+ * @param record
+ * @return
+ */
+ @Override
+ public IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record) {
+ return standardProductListUpdateRecordMapper.standardProductListRecordPage(page,QueryWrappers.queryWrappers(record));
+ }
+
+
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index 6c18db1..9c8951e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -266,7 +266,7 @@
for (Model model : modelList) {
BasicTreeDto basicTreeDto = new BasicTreeDto();
basicTreeDto.setLevel(BasicTreeEnums.MODEL_TYPE.getCode());
- basicTreeDto.setValue(String.valueOf(model.getId()));
+ basicTreeDto.setValue(model.getModelName());
basicTreeDto.setLabel(model.getModelName());
basicTreeDto.setChildren(null);
if(model.getProductId() != null) {
@@ -293,7 +293,7 @@
Product::getObjectId,
Collectors.mapping(product -> {
BasicTreeDto basicTreeDto = new BasicTreeDto();
- basicTreeDto.setValue(String.valueOf(product.getId()));
+ basicTreeDto.setValue(product.getName());
basicTreeDto.setLabel(product.getName());
basicTreeDto.setLevel(BasicTreeEnums.PRODUCT_TYPE.getCode());
basicTreeDto.setChildren(productModelMap.get(product.getId()));
@@ -303,8 +303,9 @@
// 瀵规娴嬪璞″厛鎸夌収瀹為獙瀹ゅ湪鎸夌収妫�鏌ュ璞＄被鍒垎绫�
List<BasicTreeDto> testProjectBasicTreeList = structureTestObjectList.stream().map(structureTestObject -> {
BasicTreeDto basicTreeDto = new BasicTreeDto();
- basicTreeDto.setValue(String.valueOf(structureTestObject.getId()));
+ basicTreeDto.setValue(structureTestObject.getSpecimenName());
basicTreeDto.setLabel(structureTestObject.getSpecimenName());
+ basicTreeDto.setLevel(BasicTreeEnums.STRUCTURE_TEST_OBJECT_TYPE.getCode());
List<BasicTreeDto> children = new ArrayList<>();
if (!CollectionUtils.isEmpty(productMap.get(structureTestObject.getId()))) {
children.addAll(productMap.get(structureTestObject.getId()));
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index 0760977..cd27a11 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -29,7 +29,7 @@
</resultMap>
<!-- 鎵归噺娣诲姞妫�娴嬫爣鍑� -->
- <insert id="saveBatchProductLists" keyProperty="id" useGeneratedKeys="true">
+ <insert id="saveBatchProductLists">
INSERT INTO standard_product_list (id, inspection_item, inspection_item_en, inspection_item_subclass, inspection_item_subclass_en, factory, laboratory, sample_type, sample, model, son_laboratory, unit, price, man_hour, man_hour_group, inspection_item_type, inspection_value_type, checkout_number, section, cores, method, method_s, man_day, bsm, ask, tell, standard_method_list_id, template_id, state, dic, tree, structure_item_parameter_id, inspection_item_class, inspection_item_class_en, radius, radius_list, rates, sort, conductor_material, conductor_type)
VALUES
<foreach item="item" collection="productLists" open="(" separator="),(" close=")">
diff --git a/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml
new file mode 100644
index 0000000..c6f7d17
--- /dev/null
+++ b/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml
@@ -0,0 +1,12 @@
+<?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.basic.mapper.StandardProductListUpdateRecordMapper">
+ <select id="standardProductListRecordPage" resultType="com.ruoyi.basic.pojo.StandardProductListUpdateRecord">
+ select * from standard_product_list_update_record
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
--
Gitblit v1.9.3