Merge remote-tracking branch 'origin/dev-nx' into dev-nx

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseUserBook.java

@@ -34,6 +34,7 @@ public class LeaseUserBook {
     private Long companyId;
     private String parentName;
     private String typeName;
+    private String manageType;
 
     /** 图片路径 */
     @ApiModelProperty(value = "图片路径")

sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseUserBookMapper.xml

@@ -27,6 +27,7 @@
                mt2.type_name as parentName,
                mt.type_name as typeName,
                lub.book_num as bookNum,
+               mt.manage_type as manageType,
                lub.company_id as companyId
         from lease_user_book lub
         left join ma_type mt on lub.type_id = mt.type_id

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWhole.java

@@ -1,9 +1,13 @@
 package com.bonus.sgzb.material.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 整套抱杆表单集合实体类
@@ -26,4 +30,18 @@ public class MaWhole {
     /** 配套数量 */
     @ApiModelProperty(value = "配套数量")
     private Integer totalNum;
+
+    /** 配套名称 */
+    @ApiModelProperty(value = "配套名称")
+    private String wholeTypeName;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
+
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml

@@ -46,12 +46,18 @@
                 <if test="item.id != null">type_id,</if>
                 <if test="item.parentId != null">parent_id,</if>
                 <if test="item.totalNum != null">part_num,</if>
+                <if test="item.wholeTypeName != null">whole_type_name,</if>
+                <if test="item.createBy != null">create_by,</if>
+                <if test="item.createTime != null">create_time,</if>
                 status
             </trim>
             <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="item.id != null">#{item.id},</if>
                 <if test="item.parentId != null">#{item.parentId},</if>
                 <if test="item.totalNum != null">#{item.totalNum},</if>
+                <if test="item.wholeTypeName != null">#{item.wholeTypeName},</if>
+                <if test="item.createBy != null">#{item.createBy},</if>
+                <if test="item.createTime != null">#{item.createTime},</if>
                 1
             </trim>
         </foreach>
@@ -76,6 +82,9 @@
         JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
         JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
+        WHERE
+        mt.`status` = '0'
+        AND mt.del_flag = '0'
         <if test="keyWord != null  and keyWord != ''">
             and (
             mt2.type_name like  concat('%', #{keyWord}, '%') or