From 38128b9d40636d1387a5614a35d9be6927a5e3e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 09 八月 2023 14:20:18 +0800
Subject: [PATCH] 修改销售id

---
 standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java            |   27 +++
 standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java    |   71 ++++++++++
 standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java |   51 +++++++
 inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java                             |    6 
 standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml                        |   30 ++++
 system-run/src/main/resources/application-dev.yml                                             |    2 
 standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java          |   44 ++++++
 standard-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java                         |    4 
 standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java                    |   83 +++++++++++
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java                      |    6 
 inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java                            |    3 
 sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java                                      |    8 
 standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java             |   59 ++++++++
 sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java                              |    8 
 sale-server/src/main/resources/mapper/SaleMapper.xml                                          |    3 
 15 files changed, 388 insertions(+), 17 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
index b484dd7..360f0d4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -53,9 +54,8 @@
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date dealTime;
 
-    /**
-     * ${column.comment}
-     **/
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
+    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     /**
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
index 1902601..3aeb2d5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
@@ -6,6 +6,7 @@
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -75,9 +76,8 @@
      */
     private String userName;
 
-    /**
-     * 
-     */
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
+    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     /**
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java
index d552828..331ef8c 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Repertory.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -84,6 +85,8 @@
     /**
      * ${column.comment}
      **/
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
+    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     /**
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java b/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
index 02f9b50..0890f89 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
@@ -1,10 +1,8 @@
 package com.yuanchu.mom.pojo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -76,6 +74,8 @@
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date checkTime;
 
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
+    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     @TableField(fill = FieldFill.INSERT)
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java b/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
index b098dd0..7ce3eb0 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
@@ -1,11 +1,9 @@
 package com.yuanchu.mom.pojo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDate;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -50,6 +48,8 @@
     @ApiModelProperty(value = "鍗曚环")
     private String price;
 
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
+    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     @TableField(fill = FieldFill.INSERT)
diff --git a/sale-server/src/main/resources/mapper/SaleMapper.xml b/sale-server/src/main/resources/mapper/SaleMapper.xml
index f95c784..92e882b 100644
--- a/sale-server/src/main/resources/mapper/SaleMapper.xml
+++ b/sale-server/src/main/resources/mapper/SaleMapper.xml
@@ -2,7 +2,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.SaleMapper">
     <select id="selectSaleList" resultType="java.util.Map">
-        select order_number,
+        select id,
+        order_number,
         code,
         name,
         proname,
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
new file mode 100644
index 0000000..a95d264
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
@@ -0,0 +1,71 @@
+package com.yuanchu.mom.controller;
+
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.yuanchu.mom.service.TechnologyTemplateService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 宸ヨ壓妯$増琛�(TechnologyTemplate)琛ㄦ帶鍒跺眰
+ *
+ * @author zss
+ * @since 2023-08-09 11:20:20
+ */
+@Api(tags = "鍩虹鏁版嵁-->宸ュ簭")
+@RestController
+@RequestMapping("/technologyTemplate")
+public class TechnologyTemplateController {
+
+    @Autowired
+    private TechnologyTemplateService technologyTemplateService;
+
+    @ApiOperation(value = "鏂板宸ュ簭妯$増")
+    @PostMapping("/addTech")
+    public Result addTech(@RequestBody TechnologyTemplateDto technologyTemplateDto){
+        technologyTemplateService.addTech(technologyTemplateDto);
+        return Result.success("鏂板鎴愬姛!");
+    }
+
+    @ApiOperation(value = "鏌ヨ鎵�鏈夌被鍨�")
+    @GetMapping("/seleType")
+    public Result seleType(){
+        return Result.success(technologyTemplateService.seleType());
+    }
+
+    @ApiOperation(value = "鏌ヨ宸ュ簭妯$増鍒楄〃")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "element", value = "鍏冧欢", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "father", value = "宸ュ簭(鐖剁被)", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class,required = true)
+    })
+    @GetMapping("/selTech")
+    public Result selTech(Integer pageSize,Integer countSize,String element,String father,Integer type){
+        IPage<Map<String, Object>> salePage = technologyTemplateService.selTech(new Page<Object>(pageSize, countSize), element, father, type);
+        Map<String, Object> map = new HashMap<>();
+        map.put("total", salePage.getTotal());
+        map.put("row", salePage.getRecords());
+        return Result.success(map);
+    }
+
+
+
+
+
+}
+
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java
new file mode 100644
index 0000000..2051dc1
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java
@@ -0,0 +1,27 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.TechnologyTemplate;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 宸ヨ壓妯$増琛�(TechnologyTemplate)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author zss
+ * @since 2023-08-09 11:20:20
+ */
+public interface TechnologyTemplateMapper extends BaseMapper<TechnologyTemplate> {
+
+
+    //鏌ヨ鎵�鏈夌被鍨�
+    List<Integer> seleType();
+
+    //鏌ヨ宸ュ簭妯$増鍒楄〃
+    IPage<Map<String, Object>> selTech(Page<Object> page, String element, String father, Integer type);
+}
+
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
index e974eee..5c142db 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/RawInsProduct.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -61,7 +62,8 @@
      **/
     private Integer testState;
 
-
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
+    @TableLogic(value = "1", delval = "0")
     private Integer state;
 
     @TableField(fill = FieldFill.INSERT)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
new file mode 100644
index 0000000..d333c76
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/TechnologyTemplate.java
@@ -0,0 +1,83 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 宸ヨ壓妯$増琛�(TechnologyTemplate)琛ㄥ疄浣撶被
+ *
+ * @author zss
+ * @since 2023-08-09 11:20:20
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@TableName("technology_template")
+public class TechnologyTemplate implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 宸ュ簭id
+     **/
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 宸ュ簭鍚嶇О
+     **/
+    private String name;
+
+    /**
+     * 宸ュ簭鐖剁骇
+     **/
+    private String father;
+
+    /**
+     * 0锛氭鑳惰繛鎺ュ櫒锛�1锛氶噾灞炶繛鎺ュ櫒锛�2锛氭箍鎻掓嫈鐢佃繛鎺ュ櫒锛�3锛氬垎鏀粍浠�
+     **/
+    private Integer type;
+
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
+    @TableLogic(value = "1", delval = "0")
+    private Integer state;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 鍏冧欢
+     **/
+    private String element;
+
+    /**
+     * 鎺у埗瑕佺偣
+     **/
+    private String control;
+
+    /**
+     * 鍩烘湰瑕佹眰
+     **/
+    private String base;
+
+    /**
+     * 澶囨敞
+     **/
+    private String note;
+}
+
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java
new file mode 100644
index 0000000..710618d
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/TechnologyTemplateDto.java
@@ -0,0 +1,59 @@
+package com.yuanchu.mom.pojo.dto;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.*;
+import java.io.Serializable;
+
+
+
+@Data
+@JsonSerialize
+//鏂板鎴栬�呬慨鏀瑰伐搴忔ā鐗�
+public class TechnologyTemplateDto {
+
+    /**
+     * 宸ュ簭鍚嶇О
+     **/
+    @JsonSerialize
+    private String name;
+
+    /**
+     * 宸ュ簭鐖剁骇
+     **/
+    @JsonSerialize
+    private String father;
+
+    /**
+     * 0锛氭鑳惰繛鎺ュ櫒锛�1锛氶噾灞炶繛鎺ュ櫒锛�2锛氭箍鎻掓嫈鐢佃繛鎺ュ櫒锛�3锛氬垎鏀粍浠�
+     **/
+    @JsonSerialize
+    private Integer type;
+
+    /**
+     * 鍏冧欢
+     **/
+    @JsonSerialize
+    private String element;
+
+    /**
+     * 鎺у埗瑕佺偣
+     **/
+    @JsonSerialize
+    private String control;
+
+    /**
+     * 鍩烘湰瑕佹眰
+     **/
+    @JsonSerialize
+    private String base;
+
+    /**
+     * 澶囨敞
+     **/
+    @JsonSerialize
+    private String note;
+
+
+}
+
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java b/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java
new file mode 100644
index 0000000..54b99a4
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java
@@ -0,0 +1,44 @@
+package com.yuanchu.mom.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.yuanchu.mom.pojo.TechnologyTemplate;
+import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 宸ヨ壓妯$増琛�(TechnologyTemplate)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author zss
+ * @since 2023-08-09 11:20:20
+ */
+public interface TechnologyTemplateService extends IService<TechnologyTemplate> {
+
+
+    /**
+     * 鏂板宸ュ簭妯$増
+     * @param technologyTemplateDto
+     */
+    void addTech(TechnologyTemplateDto technologyTemplateDto);
+
+    /**
+     * 鏌ヨ鎵�鏈夌被鍨�
+     * @return
+     */
+    List<Integer> seleType();
+
+    /**
+     * 鏌ヨ宸ュ簭妯$増鍒楄〃
+     * @param page
+     * @param element
+     * @param father
+     * @param type
+     * @return
+     */
+    IPage<Map<String, Object>> selTech(Page<Object> page, String element, String father, Integer type);
+}
+
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
new file mode 100644
index 0000000..de66a99
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
@@ -0,0 +1,51 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.mapper.TechnologyTemplateMapper;
+import com.yuanchu.mom.pojo.TechnologyTemplate;
+import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
+import com.yuanchu.mom.service.TechnologyTemplateService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 宸ヨ壓妯$増琛�(TechnologyTemplate)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author zss
+ * @since 2023-08-09 11:20:20
+ */
+@Service
+public class TechnologyTemplateServiceImpl extends ServiceImpl<TechnologyTemplateMapper, TechnologyTemplate> implements TechnologyTemplateService {
+
+
+    @Resource
+    TechnologyTemplateMapper technologyTemplateMapper;
+
+    //鏂板宸ュ簭妯$増
+    @Override
+    public void addTech(TechnologyTemplateDto technologyTemplateDto) {
+        TechnologyTemplate technologyTemplate = new TechnologyTemplate();
+        BeanUtils.copyProperties(technologyTemplateDto,technologyTemplate);
+        technologyTemplateMapper.insert(technologyTemplate);
+    }
+
+    //鏌ヨ鎵�鏈夌被鍨�
+    @Override
+    public List<Integer> seleType() {
+        return technologyTemplateMapper.seleType();
+    }
+
+    //鏌ヨ宸ュ簭妯$増鍒楄〃
+    @Override
+    public IPage<Map<String, Object>> selTech(Page<Object> page, String element, String father, Integer type) {
+        return technologyTemplateMapper.selTech(page,element,father,type);
+    }
+}
+
diff --git a/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
new file mode 100644
index 0000000..8acb3b4
--- /dev/null
+++ b/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -0,0 +1,30 @@
+<?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.TechnologyTemplateMapper">
+    <select id="seleType" resultType="java.lang.Integer">
+        select distinct type
+        from mom_ocean.technology_template
+        where state = 1
+    </select>
+    <select id="selTech" resultType="java.util.Map">
+        select name,
+        element,
+        base,
+        control,
+        note
+        from mom_ocean.technology_template t
+        <where>
+            state=1
+            <if test="type!=null">
+                and type=#{type}
+            </if>
+            <if test="element!=null">
+                and element=#{element}
+            </if>
+            <if test="father!=null">
+                and father=#{father}
+            </if>
+        </where>
+        group by father
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 7a41453..c36cec2 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -57,7 +57,7 @@
     # redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
     database: 0
     # redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
-    host: localhost
+    host: 192.168.110.209
     # redis绔彛锛堥粯璁や负6379锛�
     port: 6379
     # redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級

--
Gitblit v1.9.3