From f7a95fddddb0efd60abdab7550ae636c379a2a20 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 08 三月 2024 12:44:49 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 10
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 6
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java | 22 +
inspect-server/src/main/java/com/yuanchu/mom/dto/OrderThingDto.java | 49 +++
inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java | 13
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderUserServiceImpl.java | 22 +
inspect-server/src/main/java/com/yuanchu/mom/dto/ProductThingDto.java | 20 +
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 76 +++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductResultServiceImpl.java | 22 +
inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml | 20 +
inspect-server/src/main/java/com/yuanchu/mom/service/InsProductResultService.java | 13
user-server/src/main/java/com/yuanchu/mom/dto/Custom.java | 5
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 10
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java | 18 +
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderUserService.java | 13
inspect-server/src/main/java/com/yuanchu/mom/dto/productResultDto.java | 16 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java | 51 +++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 92 ++---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 16
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 2
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 50 +++
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResultMapper.java | 18 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java | 69 ++++
user-server/src/main/resources/mapper/CustomMapper.xml | 2
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 165 +++++++++++
inspect-server/src/main/resources/mapper/InsProductResultMapper.xml | 24 +
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 10
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java | 18 +
29 files changed, 763 insertions(+), 91 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index ac14df2..e5740f4 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -60,17 +60,13 @@
</select>
<select id="authorizedPerson" resultType="com.yuanchu.mom.pojo.Device">
select id,
- authorized_person,
- status
+ authorized_person
from device
</select>
<select id="search" resultType="com.yuanchu.mom.pojo.Device">
select *
from device
<where>
- <if test="status!=null">
- and status = #{status}
- </if>
<if test="deviceName!=null and deviceName!=''">
and device_name like concat('%',#{deviceName},'%')
</if>
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index c50d3a4..0d0d11b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -5,6 +5,7 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
+import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardMethodListService;
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
@@ -23,6 +24,8 @@
private StandardMethodListService standardMethodListService;
private StandardProductListService standardProductListService;
+
+ private InsOrderService insOrderService;
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�")
@GetMapping("/selectStandardTreeList")
@@ -81,4 +84,11 @@
return Result.success(standardTreeService.delStandardTree(tree));
}
+ @ApiOperation(value = "澶栭儴鑾峰彇妫�娴嬫暟鎹�")
+ @GetMapping("/getOrderThing")
+ @ValueAuth
+ public Result getOrderThing(){
+ return Result.success(insOrderService.getOrderThing());
+ }
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/OrderThingDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/OrderThingDto.java
new file mode 100644
index 0000000..eb8d6c7
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/OrderThingDto.java
@@ -0,0 +1,49 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.InsProduct;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class OrderThingDto {
+
+ @ApiModelProperty("涓婚敭id")
+ private Integer id;
+
+ @ApiModelProperty("濮旀墭缂栧彿")
+ private String entrustCode;
+
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ @ApiModelProperty("濮旀墭浜哄悕绉�")
+ private String custom;
+
+ @ApiModelProperty("濮旀墭鍗曚綅")
+ private String company;
+
+ @ApiModelProperty("鏍峰搧鍚嶇О")
+ private String sample;
+
+ @ApiModelProperty("鏍峰搧鍨嬪彿")
+ private String model;
+
+ @ApiModelProperty("鏍峰搧鏁伴噺")
+ private Double sampleNum;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("妫�楠屽崟缁撹")
+ private String insResult;
+
+ @ApiModelProperty("涓嬪崟鏃堕棿")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("妫�楠岄」鐩�")
+ private List<ProductThingDto> products;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ProductThingDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ProductThingDto.java
new file mode 100644
index 0000000..9a0c5dc
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ProductThingDto.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProductThingDto {
+
+ private Integer productId;
+
+ private String inspectionItem;
+
+ private String lastValue;
+
+ private Integer insResult;
+
+ private List<productResultDto> productResults;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/productResultDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/productResultDto.java
new file mode 100644
index 0000000..a2e337e
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/productResultDto.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+@Data
+public class productResultDto {
+
+ private Integer id;
+
+ private String insValue;
+
+ private Integer insResult;
+
+ private String remark;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
index b5ac47c..d7c78b8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -1,16 +1,22 @@
package com.yuanchu.mom.mapper;
+import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import java.util.Map;
+
/**
-* @author gaoaoy
+* @author Administrator
* @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-03-07 16:07:54
+* @createDate 2024-03-08 09:44:13
* @Entity com.yuanchu.mom.pojo.InsOrder
*/
public interface InsOrderMapper extends BaseMapper<InsOrder> {
+ List<OrderThingDto> getOrderThing();
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java
new file mode 100644
index 0000000..17230e4
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.InsOrderUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_order_user(妫�楠屽崟璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-08 09:44:47
+* @Entity com.yuanchu.mom.pojo.InsOrderUser
+*/
+public interface InsOrderUserMapper extends BaseMapper<InsOrderUser> {
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
new file mode 100644
index 0000000..1f4dba0
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.InsProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_product(妫�楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-08 09:45:03
+* @Entity com.yuanchu.mom.pojo.InsProduct
+*/
+public interface InsProductMapper extends BaseMapper<InsProduct> {
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResultMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResultMapper.java
new file mode 100644
index 0000000..db5f538
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductResultMapper.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.InsProductResult;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_product_result銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-08 09:45:20
+* @Entity com.yuanchu.mom.pojo.InsProductResult
+*/
+public interface InsProductResultMapper extends BaseMapper<InsProductResult> {
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index 74ccaf5..3bdd0e9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -1,13 +1,14 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 妫�楠屼笅鍗�
@@ -35,17 +36,17 @@
/**
* 涓嬪崟瀹㈡埛
*/
- private String orderingCustomers;
+ private String custom;
/**
* 涓嬪崟鍗曚綅
*/
- private String orderingUnit;
+ private String company;
/**
* 绱ф�ョ▼搴�
*/
- private String urgency;
+ private Integer type;
/**
* 绾﹀畾鏃堕棿
@@ -55,12 +56,12 @@
/**
* 瀹為獙瀹ゅ悕绉�
*/
- private String laboratoryName;
+ private String laboratory;
/**
- * 鏍峰搧鍒嗙被
+ * 鏍峰搧绫诲瀷
*/
- private String sampleClassification;
+ private String smapleType;
/**
* 瑙勬牸鍨嬪彿
@@ -75,77 +76,58 @@
/**
* 鏍峰搧鏁伴噺
*/
- private Integer numberSamples;
+ private Double sampleNum;
/**
* 鏄惁鐣欐牱
*/
- private String leaveSample;
+ private Integer isLeave;
/**
* 鐣欐牱鏁伴噺
*/
- private Integer retainedSamples;
-
- /**
- * 鏍峰搧绫诲瀷
- */
- private String smapleType;
-
- /**
- * 濮旀墭鍏徃
- */
- private String entrustCompany;
-
- /**
- * 濮旀墭浜�
- */
- private String entrustName;
-
- /**
- * 鍒跺崟鏃堕棿
-
- */
- private Date documentTime;
-
- /**
- * 濮旀墭鏃堕棿
-
- */
- private Date entrustmentTime;
+ private Integer leaveNum;
/**
* 妫�娴嬭繘搴�
*/
- private String inspectionProgress;
+ private String insProgress;
/**
* 妫�娴嬬粨鏋�
*/
- private String inspectionResult;
+ private String insResult;
/**
- *
+ * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
*/
+ private Integer state;
+
+ private String remark;
+
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT)
private Integer createUser;
-
/**
- *
+ *
*/
- private Date createTime;
-
+ @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;
-
/**
- *
+ *
*/
- private Date updateTime;
-
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java
new file mode 100644
index 0000000..4fdcf42
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java
@@ -0,0 +1,51 @@
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 妫�楠屽崟璐熻矗浜鸿褰�
+ * @TableName ins_order_user
+ */
+@TableName(value ="ins_order_user")
+@Data
+public class InsOrderUser implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 澶栭敭锛氭楠屽崟id
+ */
+ private Integer insOrderId;
+
+ /**
+ * 澶栭敭锛氱敤鎴穒d 璐熻矗浜�
+ */
+ private Integer userId;
+
+ /**
+ * 1锛氱‘璁� 0锛氭湭纭
+ */
+ private Integer state;
+
+ @ApiModelProperty("")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+ /**
+ *
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..e290565
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -0,0 +1,165 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 妫�楠岄」鐩�
+ * @TableName ins_product
+ */
+@TableName(value ="ins_product")
+@Data
+public class InsProduct implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 妫�楠岄」
+ */
+ private String inspectionItem;
+
+ /**
+ * 妫�楠岄」鍒嗙被
+ */
+ private String inspectionItemClassify;
+
+ /**
+ * 妫�楠岄」灏忕被
+ */
+ private String inspectionItemSubclass;
+
+ /**
+ * 宸ュ巶
+ */
+ private String factory;
+
+ /**
+ * 瀹為獙瀹�
+ */
+ private String laboratory;
+
+ /**
+ * 鏍峰搧鍒嗙被
+ */
+ private String sampleType;
+
+ /**
+ * 鏍峰搧
+ */
+ private String sample;
+
+ /**
+ * 鍨嬪彿
+ */
+ private String model;
+
+ /**
+ * 璁￠噺鍗曚綅
+ */
+ private String unit;
+
+ /**
+ * 鍗曚环(鍏�)
+ */
+ private BigDecimal price;
+
+ /**
+ * 宸ユ椂(H)
+ */
+ private Integer manHour;
+
+ /**
+ * 宸ユ椂鍒嗙粍
+ */
+ private String manHourGroup;
+
+ /**
+ * 妫�楠岄」绫诲瀷
+ */
+ private String inspectionItemType;
+
+ /**
+ * 妫�楠屽�肩被鍨�
+ */
+ private String inspectionValueType;
+
+ /**
+ * 璁惧缁�
+ */
+ private String deviceGroup;
+
+ /**
+ * 妫�楠屾鏁�
+ */
+ private Integer checkoutNumber;
+
+ /**
+ * 鍖洪棿
+ */
+ private String section;
+
+ /**
+ * 鍙栧�肩被鍨�
+ */
+ private String valueType;
+
+ /**
+ * 鏂规硶
+ */
+ private String method;
+
+ /**
+ * 棰勮鏃堕棿(澶�)
+ */
+ private Integer manDay;
+
+ /**
+ * 鐗规畩鏍囪瘑
+ */
+ private String bsm;
+
+ /**
+ * 瑕佹眰鍊�
+ */
+ private String ask;
+
+ /**
+ * 1锛氭湁鏁� 0锛氭棤鏁�
+ */
+ private Integer state;
+
+ @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;
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java
new file mode 100644
index 0000000..b04040a
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProductResult.java
@@ -0,0 +1,69 @@
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @TableName ins_product_result
+ */
+@TableName(value ="ins_product_result")
+@Data
+public class InsProductResult implements Serializable {
+ /**
+ *
+ */
+ @TableId
+ private Integer id;
+
+ /**
+ * 澶栭敭锛氭楠岄」鐩甶d
+ */
+ private Integer insProductId;
+
+ /**
+ * 妫�楠屽��
+ */
+ private String insValue;
+
+ /**
+ * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+ */
+ private Integer insResult;
+
+ /**
+ * 鏈�缁堝��
+ */
+ private String lastValue;
+
+ @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;
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
index 690ad8e..0d79f69 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -1,13 +1,19 @@
package com.yuanchu.mom.service;
+import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import java.util.Map;
+
/**
-* @author gaoaoy
+* @author Administrator
* @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-03-07 16:07:54
+* @createDate 2024-03-08 09:44:13
*/
public interface InsOrderService extends IService<InsOrder> {
+ List<OrderThingDto> getOrderThing();
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderUserService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderUserService.java
new file mode 100644
index 0000000..575fb9d
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderUserService.java
@@ -0,0 +1,13 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.InsOrderUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_order_user(妫�楠屽崟璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-03-08 09:44:47
+*/
+public interface InsOrderUserService extends IService<InsOrderUser> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductResultService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductResultService.java
new file mode 100644
index 0000000..b8c024c
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductResultService.java
@@ -0,0 +1,13 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.InsProductResult;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_product_result銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-03-08 09:45:20
+*/
+public interface InsProductResultService extends IService<InsProductResult> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
new file mode 100644
index 0000000..b4b75e3
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
@@ -0,0 +1,13 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.InsProduct;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_product(妫�楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-03-08 09:45:03
+*/
+public interface InsProductService extends IService<InsProduct> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 265b61c..ad3ae57 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -1,20 +1,32 @@
package com.yuanchu.mom.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.mapper.InsOrderMapper;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
/**
-* @author gaoaoy
+* @author Administrator
* @description 閽堝琛ㄣ�恑ns_order(妫�楠屼笅鍗�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-07 16:07:54
+* @createDate 2024-03-08 09:44:13
*/
@Service
+@AllArgsConstructor
public class InsOrderServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder>
implements InsOrderService{
+ private InsOrderMapper insOrderMapper;
+
+ @Override
+ public List<OrderThingDto> getOrderThing() {
+ return insOrderMapper.getOrderThing();
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderUserServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderUserServiceImpl.java
new file mode 100644
index 0000000..8015aa3
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderUserServiceImpl.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.pojo.InsOrderUser;
+import com.yuanchu.mom.service.InsOrderUserService;
+import com.yuanchu.mom.mapper.InsOrderUserMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_order_user(妫�楠屽崟璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-08 09:44:47
+*/
+@Service
+public class InsOrderUserServiceImpl extends ServiceImpl<InsOrderUserMapper, InsOrderUser>
+ implements InsOrderUserService{
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductResultServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductResultServiceImpl.java
new file mode 100644
index 0000000..4b59825
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductResultServiceImpl.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.pojo.InsProductResult;
+import com.yuanchu.mom.service.InsProductResultService;
+import com.yuanchu.mom.mapper.InsProductResultMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_product_result銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-08 09:45:20
+*/
+@Service
+public class InsProductResultServiceImpl extends ServiceImpl<InsProductResultMapper, InsProductResult>
+ implements InsProductResultService{
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
new file mode 100644
index 0000000..e383fa7
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.pojo.InsProduct;
+import com.yuanchu.mom.service.InsProductService;
+import com.yuanchu.mom.mapper.InsProductMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_product(妫�楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-08 09:45:03
+*/
+@Service
+public class InsProductServiceImpl extends ServiceImpl<InsProductMapper, InsProduct>
+ implements InsProductService{
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 6162cca..9b12881 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -8,24 +8,20 @@
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
<result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
- <result property="orderingCustomers" column="ordering_customers" jdbcType="VARCHAR"/>
- <result property="orderingUnit" column="ordering_unit" jdbcType="VARCHAR"/>
- <result property="urgency" column="urgency" jdbcType="VARCHAR"/>
+ <result property="custom" column="custom" jdbcType="VARCHAR"/>
+ <result property="company" column="company" jdbcType="VARCHAR"/>
+ <result property="type" column="type" jdbcType="INTEGER"/>
<result property="appointedTime" column="appointed_time" jdbcType="TIMESTAMP"/>
- <result property="laboratoryName" column="laboratory_name" jdbcType="VARCHAR"/>
- <result property="sampleClassification" column="sample_classification" jdbcType="VARCHAR"/>
+ <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+ <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
<result property="model" column="model" jdbcType="VARCHAR"/>
<result property="sample" column="sample" jdbcType="VARCHAR"/>
- <result property="numberSamples" column="number_samples" jdbcType="INTEGER"/>
- <result property="leaveSample" column="leave_sample" jdbcType="VARCHAR"/>
- <result property="retainedSamples" column="retained_samples" jdbcType="INTEGER"/>
- <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
- <result property="entrustCompany" column="entrust_company" jdbcType="VARCHAR"/>
- <result property="entrustName" column="entrust_name" jdbcType="VARCHAR"/>
- <result property="documentTime" column="document_time" jdbcType="TIMESTAMP"/>
- <result property="entrustmentTime" column="entrustment_time" jdbcType="TIMESTAMP"/>
- <result property="inspectionProgress" column="inspection_progress" jdbcType="VARCHAR"/>
- <result property="inspectionResult" column="inspection_result" jdbcType="VARCHAR"/>
+ <result property="sampleNum" column="sample_num" jdbcType="INTEGER"/>
+ <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
+ <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
+ <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
+ <result property="insResult" column="ins_result" jdbcType="VARCHAR"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
@@ -34,13 +30,47 @@
<sql id="Base_Column_List">
id,entrust_code,sample_code,
- ordering_customers,ordering_unit,urgency,
- appointed_time,laboratory_name,sample_classification,
- model,sample,number_samples,
- leave_sample,retained_samples,smaple_type,
- entrust_company,entrust_name,document_time,
- entrustment_time,inspection_progress,inspection_result,
- create_user,create_time,update_user,
- update_time
+ custom,company,type,
+ appointed_time,laboratory,smaple_type,
+ model,sample,sample_num,
+ is_leave,leave_num,ins_progress,
+ ins_result,state,create_user,
+ create_time,update_user,update_time
</sql>
+
+ <resultMap id="OrderThingDto" type="com.yuanchu.mom.dto.OrderThingDto">
+ <result property="id" column="id"/>
+ <result property="company" column="company"/>
+ <result property="entrustCode" column="entrust_code"/>
+ <result property="sampleCode" column="sample_code"/>
+ <result property="custom" column="custom"/>
+ <result property="sample" column="sample"/>
+ <result property="model" column="model"/>
+ <result property="sampleNum" column="sample_num"/>
+ <result property="remark" column="remark"/>
+ <result property="insResult" column="ins_result"/>
+ <result property="createTime" column="create_time"/>
+ <collection property="products" resultMap="ProductThingDto"/>
+ </resultMap>
+
+ <resultMap id="ProductThingDto" type="com.yuanchu.mom.dto.ProductThingDto">
+ <result property="productId" column="id"/>
+ <result property="inspectionItem" column="inspection_item"/>
+ <result property="lastValue" column="last_value"/>
+ <result property="insResult" column="ins_result"/>
+ <collection property="productResults" resultMap="productResultDto"/>
+ </resultMap>
+
+ <resultMap id="productResultDto" type="com.yuanchu.mom.dto.productResultDto">
+ <result property="id" column="id"/>
+ <result property="insValue" column="ins_value"/>
+ <result property="insResult" column="ins_result"/>
+ <result property="remark" column="remark"/>
+ </resultMap>
+
+ <select id="getOrderThing" resultMap="OrderThingDto">
+ select * from ins_order io
+ left join ins_product ip on ip.ins_order_id = io.id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
new file mode 100644
index 0000000..4b19a1c
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
@@ -0,0 +1,20 @@
+<?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.InsOrderUserMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderUser">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
+ <result property="userId" column="user_id" jdbcType="INTEGER"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,ins_order_id,user_id,
+ state,create_user,create_time
+ </sql>
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
new file mode 100644
index 0000000..94744ff
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -0,0 +1,50 @@
+<?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.InsProductMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
+ <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
+ <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
+ <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="unit" column="unit" jdbcType="VARCHAR"/>
+ <result property="price" column="price" jdbcType="DECIMAL"/>
+ <result property="manHour" column="man_hour" jdbcType="INTEGER"/>
+ <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
+ <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
+ <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
+ <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
+ <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
+ <result property="section" column="section" jdbcType="VARCHAR"/>
+ <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
+ <result property="method" column="method" jdbcType="VARCHAR"/>
+ <result property="manDay" column="man_day" jdbcType="INTEGER"/>
+ <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
+ <result property="ask" column="ask" jdbcType="VARCHAR"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <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,inspection_item,inspection_item_classify,
+ inspection_item_subclass,factory,laboratory,
+ sample_type,sample,model,
+ unit,price,man_hour,
+ man_hour_group,inspection_item_type,inspection_value_type,
+ device_group,checkout_number,section,
+ value_type,method,man_day,
+ bsm,ask,state,
+ create_user,update_user,create_time,
+ update_time
+ </sql>
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsProductResultMapper.xml b/inspect-server/src/main/resources/mapper/InsProductResultMapper.xml
new file mode 100644
index 0000000..21f30bb
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsProductResultMapper.xml
@@ -0,0 +1,24 @@
+<?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.InsProductResultMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProductResult">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="insProductId" column="ins_product_id" jdbcType="INTEGER"/>
+ <result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
+ <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
+ <result property="lastValue" column="last_value" 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,ins_product_id,ins_value,
+ ins_result,last_value,create_user,
+ update_user,create_time,update_time
+ </sql>
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index f3e6d1d..03a9f53 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -31,7 +31,7 @@
where id = #{id}
</select>
<select id="selectStandardMethodLists" resultType="com.yuanchu.mom.pojo.StandardMethodList">
- select sml.id, code, sml.name,sml.remark, sml.create_time, u.name create_user_name
+ select sml.id, sml.code, sml.name,sml.remark, sml.create_time, u.name create_user_name
from standard_method_list sml
left join user u on u.id = sml.create_user
where factory = #{data1}
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
index b916334..aef0096 100644
--- a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
@@ -55,6 +55,10 @@
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
+ @ValueTableShow(8)
+ @ApiModelProperty(value = "宸ュ巶鍩�")
+ private String code;
+
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@@ -75,6 +79,7 @@
@ValueTableShow(10)
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(exist = false)
private String updateUserName;
private Integer isCustom;
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index e4817dc..5b50345 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -93,4 +93,6 @@
private Integer isCustom;
+ private String code;
+
}
diff --git a/user-server/src/main/resources/mapper/CustomMapper.xml b/user-server/src/main/resources/mapper/CustomMapper.xml
index 5d1ff67..98bde59 100644
--- a/user-server/src/main/resources/mapper/CustomMapper.xml
+++ b/user-server/src/main/resources/mapper/CustomMapper.xml
@@ -7,7 +7,7 @@
</update>
<select id="selectCustomPageList" resultType="com.yuanchu.mom.dto.Custom">
select * from (
- select u1.id, u1.account, u1.name, u1.state, u1.update_time, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u2.name update_user_name
+ select u1.id, u1.account, u1.name, u1.state, u1.update_time, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u2.name update_user_name, u1.code
from user u1
left join user u2 on u2.id = u1.update_user
where u1.is_custom = 1
--
Gitblit v1.9.3