From e4774c6ff705d93fcf3694e244a18dad7f0bec77 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 09:31:18 +0800
Subject: [PATCH] 标准库功能修改备份开发
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 2
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 8
basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListChcekTypeEnums.java | 2
basic-server/src/main/resources/mapper/StandardProductListUpdateRecordRelMapper.xml | 112 +++++++
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java | 76 ++++
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 17
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListBackupRel.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java | 13
/dev/null | 33 --
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java | 192 -----------
basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java | 45 ++
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java | 38 ++
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java | 34 ++
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecordRel.java | 228 ++++++++++++++
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 111 ++++--
17 files changed, 639 insertions(+), 280 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java
new file mode 100644
index 0000000..ae1963e
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardProductListUpdateRecordController.java
@@ -0,0 +1,45 @@
+package com.ruoyi.basic.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.basic.pojo.StandardProductListUpdateRecord;
+import com.ruoyi.basic.pojo.StandardProductListUpdateRecordRel;
+import com.ruoyi.basic.service.*;
+import com.ruoyi.common.core.domain.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/updateRecord")
+@Api(tags = "鏍囧噯搴�")
+public class StandardProductListUpdateRecordController {
+
+ @Autowired
+ private StandardProductListUpdateRecordService standardProductListUpdateRecordService;
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅淇敼璁板綍鍒嗛〉鏌ヨ")
+ @GetMapping("/standardProductListRecordPage")
+ public Result standardProductListRecordPage(Page page, StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ return Result.success(standardProductListUpdateRecordService.standardProductListRecordPage(page,standardProductListUpdateRecord));
+ }
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ")
+ @GetMapping("/standardProductListRecordRelPage")
+ public Result standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
+ return Result.success(standardProductListUpdateRecordService.standardProductListRecordRelPage(page,standardProductListUpdateRecordRel));
+ }
+
+}
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 373e0e9..1df9b55 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
@@ -255,16 +255,17 @@
return Result.success(standardProductListService.copyStandardProductSort(copyStandardProductListDto));
}
- @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」澶勭悊")
- @PostMapping("/productListOperate")
- public Result productListOperate(@RequestBody StandardProductListDto standardProductListDto) {
- standardProductListService.productListOperate(standardProductListDto);
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」鎻愪氦")
+ @PostMapping("/productListSubmit")
+ public Result productListSubmit(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ standardProductListService.productListSubmit(standardProductListUpdateRecord);
return Result.success();
}
- @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ")
- @GetMapping("/standardProductListRecordPage")
- public Result standardProductListRecordPage(Page page, StandardProductListUpdateRecord standardProductListUpdateRecord) {
- return Result.success(standardProductListService.standardProductListRecordPage(page,standardProductListUpdateRecord));
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」瀹℃牳")
+ @PostMapping("/productListCheck")
+ public Result productListCheck(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ standardProductListService.productListCheck(standardProductListUpdateRecord);
+ return Result.success();
}
}
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
index a848a28..64d153b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListChcekTypeEnums.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListChcekTypeEnums.java
@@ -2,7 +2,7 @@
public enum StandardProductListChcekTypeEnums {
- WAIT_CHECK("0","鏈鏍�"),
+ WAIT_CHECK("0","鏈彁浜�"),
CHECK_ING("1","瀹℃牳涓�"),
PASS_CHECK("2","瀹℃牳閫氳繃"),
NO_PASS_CHECK("3","瀹℃牳鏈�氳繃");
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
deleted file mode 100644
index af44dee..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/enums/StandardProductListOperationTypeEnums.java
+++ /dev/null
@@ -1,33 +0,0 @@
-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/mapper/StandardProductListMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
index 2802d56..9023104 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
@@ -70,6 +70,8 @@
* @param productLists
*/
void saveBatchProductLists(@Param("productLists") List<StandardProductList> productLists);
+
+ void updateProductListCheckStatus(@Param("ids") List<Long> ids,String checkStatus);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java
new file mode 100644
index 0000000..580b76e
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListUpdateRecordRelMapper.java
@@ -0,0 +1,34 @@
+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 com.ruoyi.basic.pojo.StandardProductListUpdateRecordRel;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-05 10:33:29
+* @Entity com.ruoyi.basic.pojo.StandardProductList
+*/
+public interface StandardProductListUpdateRecordRelMapper extends BaseMapper<StandardProductListUpdateRecordRel> {
+
+ void batchInsertRecordRel(@Param("list") List<StandardProductListUpdateRecordRel> list);
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ * @param page
+ * @param ew
+ * @return
+ */
+ IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, @Param("ew") QueryWrapper<StandardProductListUpdateRecordRel> 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 35072cf..9cd10b8 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
@@ -220,6 +220,6 @@
@ApiModelProperty("瀵间綋绫诲瀷")
private String conductorType;
- @ApiModelProperty("瀹℃牳鐘舵�� 0 鏈鏍� 1 瀹℃牳涓� 2 瀹℃牳閫氳繃 3 瀹℃牳鏈�氳繃")
+ @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
index afb3632..de872e9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListBackupRel.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListBackupRel.java
@@ -11,8 +11,8 @@
import java.time.LocalDateTime;
/**
- * 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
- * @TableName standard_product_list
+ * 鏍囧噯鏍戜笅鐨勬楠岄」鐩浠借〃
+ * @TableName standard_product_list_backup_rel
*/
@TableName(value ="standard_product_list_backup_rel")
@Data
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
index 6b3bce8..c9e228d 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java
@@ -11,12 +11,13 @@
import java.time.LocalDateTime;
/**
- * 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
- * @TableName standard_product_list
+ * 鏍囧噯鏍戜笅鐨勬楠岄」鐩慨鏀硅褰�
+ * @TableName standard_product_list_update_record
*/
-@TableName(value ="standard_product_list_backup_rel")
+@TableName(value ="standard_product_list_update_record")
@Data
public class StandardProductListUpdateRecord implements Serializable {
+
/**
* 涓婚敭id
*/
@@ -24,141 +25,11 @@
@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("")
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
+
/**
*
*/
@@ -166,10 +37,11 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
/**
*
*/
- @ApiModelProperty("")
+ @ApiModelProperty("淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
/**
@@ -180,49 +52,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
- private Integer state;
+ @ApiModelProperty("瀹℃牳鐘舵�� 1 瀹℃牳涓� 2 瀹℃牳閫氳繃 3 瀹℃牳鏈�氳繃")
+ private String checkStatus;
- 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;
+ @ApiModelProperty("澶囨敞")
+ private String remark;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecordRel.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecordRel.java
new file mode 100644
index 0000000..6cad0cf
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecordRel.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_update_record_rel")
+@Data
+public class StandardProductListUpdateRecordRel 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("standard_product_list涓婚敭ID")
+ private Long standardProductListId;
+
+ @ApiModelProperty("standard_product_list_update_record琛ㄤ富閿甶d")
+ private Long standardProductListUpdateRecordId;
+}
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 652dc9f..7e42ecf 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
@@ -68,16 +68,13 @@
boolean copyStandardProductSort(CopyStandardProductListDto copyStandardProductListDto);
/**
- * 鏍囧噯鏍戜笅妫�楠岄」澶勭悊
- * @param standardProductListDto
+ * 鏍囧噯鏍戜笅妫�楠岄」鎻愪氦
*/
- void productListOperate(StandardProductListDto standardProductListDto);
+ void productListSubmit(StandardProductListUpdateRecord standardProductListUpdateRecord);
/**
- * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
- * @param page
- * @param record
- * @return
+ * 鏍囧噯鏍戜笅妫�楠岄」瀹℃牳
+ * @param standardProductListUpdateRecord
*/
- IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record);
+ void productListCheck(StandardProductListUpdateRecord standardProductListUpdateRecord);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java
new file mode 100644
index 0000000..c2ad6b3
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListUpdateRecordService.java
@@ -0,0 +1,38 @@
+package com.ruoyi.basic.service;
+
+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.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.StandardProductListUpdateRecord;
+import com.ruoyi.basic.pojo.StandardProductListUpdateRecordRel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2024-03-05 10:33:29
+ */
+public interface StandardProductListUpdateRecordService extends IService<StandardProductListUpdateRecord> {
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ * @param page
+ * @param record
+ * @return
+ */
+ IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record);
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ * @param page
+ * @param standardProductListUpdateRecordRel
+ * @return
+ */
+ IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel);
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
index 004efe5..691a547 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
@@ -77,7 +77,7 @@
standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[3] + "\""));
break;
case 1:
- str += "\"" + trees[3] + "\",\"" + trees[5] + "\"";
+ str += "\"" + trees[3] + "\",\"" + trees[4] + "\"";
standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[3] + "\""));
break;
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 55ade8f..5a53933 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
@@ -1,26 +1,22 @@
package com.ruoyi.basic.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.service.StandardProductListService;
import lombok.AllArgsConstructor;
-import org.apache.catalina.security.SecurityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -68,6 +64,9 @@
@Autowired
private StandardProductListUpdateRecordMapper standardProductListUpdateRecordMapper;
+
+ @Autowired
+ private StandardProductListUpdateRecordRelMapper standardProductListUpdateRecordRelMapper;
@Override
@@ -644,57 +643,77 @@
}
/**
- * 鏍囧噯鏍戜笅妫�楠岄」澶勭悊
- * @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());
+ public void productListSubmit(StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ // 鏌ヨ鎵�鏈夊緟瀹℃牳鐨勬暟鎹�
+ QueryWrapper<StandardProductList> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
+ List<StandardProductList> unCheckStandardProductListArray = standardProductListMapper.selectList(queryWrapper);
+
+ List<Long> standardProductListIds = new ArrayList<>();
+ // 鎻掑叆淇敼璁板綍
standardProductListUpdateRecordMapper.insert(standardProductListUpdateRecord);
- // 淇敼瀹℃牳鐘舵��
- standardProductList.setCheckStatus(standardProductListDto.getOperationStatus());
- standardProductListMapper.updateById(standardProductList);
+ // 鎻掑叆淇敼璁板綍鍏宠仈琛�
+ List<StandardProductListUpdateRecordRel> standardProductListUpdateRecordRelList = new ArrayList<>();
+ for (StandardProductList standardProductList : unCheckStandardProductListArray) {
+ StandardProductListUpdateRecordRel standardProductListUpdateRecordRel = new StandardProductListUpdateRecordRel();
+ BeanUtils.copyProperties(standardProductList, standardProductListUpdateRecordRel);
+ standardProductListUpdateRecordRel.setId(null);
+ standardProductListUpdateRecordRel.setStandardProductListId(standardProductList.getId());
+ standardProductListUpdateRecordRel.setStandardProductListUpdateRecordId(standardProductListUpdateRecord.getId());
+ standardProductListUpdateRecordRelList.add(standardProductListUpdateRecordRel);
+ standardProductListUpdateRecordRelMapper.insert(standardProductListUpdateRecordRel);
+ standardProductListIds.add(standardProductList.getId());
+ }
+
+ // 淇敼鏍囧噯鏍戜笅妫�鏌ラ」鐘舵�佷负瀹℃牳涓�
+ standardProductListMapper.updateProductListCheckStatus(standardProductListIds,StandardProductListChcekTypeEnums.CHECK_ING.getCode());
}
/**
- * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
- * @param page
- * @param record
- * @return
+ * 鏍囧噯鏍戜笅妫�楠岄」瀹℃牳
+ * @param standardProductListUpdateRecord
*/
@Override
- public IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record) {
- return standardProductListUpdateRecordMapper.standardProductListRecordPage(page,QueryWrappers.queryWrappers(record));
+ @Transactional(rollbackFor = Exception.class)
+ public void productListCheck(StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ // 鏌ヨ鎵�鏈夊鏍镐腑鐨勬暟鎹�
+ QueryWrapper<StandardProductList> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.CHECK_ING.getCode());
+ List<StandardProductList> standardProductListArray = standardProductListMapper.selectList(queryWrapper);
+ if(CollectionUtils.isEmpty(standardProductListArray)){
+ return;
+ }
+ List<Long> standardProductListIds = new ArrayList<>();
+ for (StandardProductList standardProductList : standardProductListArray) {
+ standardProductListIds.add(standardProductList.getId());
+ }
+ // 瀹℃牳閫氳繃
+ if(StandardProductListChcekTypeEnums.PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())){
+ // 鍒犻櫎澶囦唤鏁版嵁
+ standardProductListBackupRelMapper.deleteBatchIds(standardProductListIds);
+ // 淇敼鐘舵��
+ standardProductListMapper.updateProductListCheckStatus(standardProductListIds,StandardProductListChcekTypeEnums.PASS_CHECK.getCode());
+ }
+ // 瀹℃牳鏈�氳繃
+ if(StandardProductListChcekTypeEnums.NO_PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())){
+ // 鏌ヨ鎵�鏈夌殑澶囦唤鏁版嵁
+ List<StandardProductListBackupRel> standardProductListBackupRelList = standardProductListBackupRelMapper.selectBatchIds(standardProductListIds);
+ // 鍥炴粴鏁版嵁
+ for (StandardProductListBackupRel standardProductListBackupRel : standardProductListBackupRelList) {
+ StandardProductList standardProductList = new StandardProductList();
+ BeanUtils.copyProperties(standardProductListBackupRel, standardProductList);
+ standardProductList.setCheckStatus("");
+ standardProductListMapper.updateById(standardProductList);
+ }
+ // 鍒犻櫎澶囦唤鏁版嵁
+ standardProductListBackupRelMapper.deleteBatchIds(standardProductListIds);
+ }
+ standardProductListUpdateRecordMapper.updateById(standardProductListUpdateRecord);
}
-
-
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
new file mode 100644
index 0000000..3c70fa6
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListUpdateRecordServiceImpl.java
@@ -0,0 +1,76 @@
+package com.ruoyi.basic.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.CopyStandardProductListDto;
+import com.ruoyi.basic.dto.InsSampleReceiveDto;
+import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.enums.StandardProductListChcekTypeEnums;
+import com.ruoyi.basic.mapper.*;
+import com.ruoyi.basic.pojo.*;
+import com.ruoyi.basic.service.StandardMethodListService;
+import com.ruoyi.basic.service.StandardProductListService;
+import com.ruoyi.basic.service.StandardProductListUpdateRecordService;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.common.utils.SecurityUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2024-03-05 10:33:29
+ */
+@Service
+@AllArgsConstructor
+public class StandardProductListUpdateRecordServiceImpl extends ServiceImpl<StandardProductListUpdateRecordMapper, StandardProductListUpdateRecord>
+ implements StandardProductListUpdateRecordService {
+
+ @Autowired
+ private StandardProductListUpdateRecordMapper standardProductListUpdateRecordMapper;
+
+ @Autowired
+ private StandardProductListUpdateRecordRelMapper standardProductListUpdateRecordRelMapper;
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ * @param page
+ * @param record
+ * @return
+ */
+ @Override
+ public IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record) {
+ return standardProductListUpdateRecordMapper.standardProductListRecordPage(page,QueryWrappers.queryWrappers(record));
+ }
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ * @param page
+ * @param standardProductListUpdateRecordRel
+ * @return
+ */
+ @Override
+ public IPage<StandardProductListUpdateRecordRel> standardProductListRecordRelPage(Page page, StandardProductListUpdateRecordRel standardProductListUpdateRecordRel) {
+ return standardProductListUpdateRecordRelMapper.standardProductListRecordRelPage(page,QueryWrappers.queryWrappers(standardProductListUpdateRecordRel));
+ }
+
+}
+
+
+
+
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index cd27a11..6584dfb 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -154,4 +154,12 @@
from structure_test_object_part
where part_no = #{partNo}
</select>
+
+ <update id="updateProductListCheckStatus">
+ UPDATE standard_product_list SET check_status = #{checkStatus}
+ WHERE ID IN
+ <foreach collection="ids" open="(" close=")" item="item">
+ #{item}
+ </foreach>
+ </update>
</mapper>
diff --git a/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordRelMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordRelMapper.xml
new file mode 100644
index 0000000..035633e
--- /dev/null
+++ b/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordRelMapper.xml
@@ -0,0 +1,112 @@
+<?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.StandardProductListUpdateRecordRelMapper">
+ <insert id="batchInsertRecordRel">
+ INSERT INTO standard_product_list_update_record_rel (
+ 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,
+ create_user,
+ update_user,
+ create_time,
+ update_time,
+ template_id,
+ state,
+ dic,
+ tree,
+ structure_item_parameter_id,
+ inspection_item_class,
+ inspection_item_class_en,
+ radius,
+ radius_list,
+ rates,
+ sort,
+ conductor_material,
+ standard_product_list_id,
+ standard_product_list_update_record_id,
+ conductor_type
+ ) values
+ <foreach collection="list" separator="," item="item">
+ (
+ #{item.inspectionItem},
+ #{item.inspectionItemEn},
+ #{item.inspectionItemSubclass},
+ #{item.inspectionItemSubclassEn},
+ #{item.factory},
+ #{item.laboratory},
+ #{item.sampleType},
+ #{item.sample},
+ #{item.model},
+ #{item.sonLaboratory},
+ #{item.unit},
+ #{item.price},
+ #{item.manHour},
+ #{item.manHourGroup},
+ #{item.inspectionItemType},
+ #{item.inspectionValueType},
+ #{item.checkoutNumber},
+ #{item.section},
+ #{item.cores},
+ #{item.method},
+ #{item.methodS},
+ #{item.manDay},
+ #{item.bsm},
+ #{item.ask},
+ #{item.tell},
+ #{item.standardMethodListId},
+ #{item.createUser},
+ #{item.updateUser},
+ #{item.createTime},
+ #{item.updateTime},
+ #{item.templateId},
+ #{item.state},
+ #{item.dic},
+ #{item.tree},
+ #{item.structureItemParameterId},
+ #{item.inspectionItemClass},
+ #{item.inspectionItemClassEn},
+ #{item.radius},
+ #{item.radiusList},
+ #{item.rates},
+ #{item.sort},
+ #{item.conductorMaterial},
+ #{item.standardProductListId},
+ #{item.standardProductListUpdateRecordId},
+ #{item.conductorType}
+ )
+ </foreach>
+
+ </insert>
+
+ <select id="standardProductListRecordRelPage" resultType="com.ruoyi.basic.pojo.StandardProductListUpdateRecordRel">
+ select * from standard_product_list_update_record_rel
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
--
Gitblit v1.9.3