From cb2dde3bb2bcf42b98f59ad97c9be522c644aee6 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 19 Jan 2022 13:43:58 +0800
Subject: [PATCH 1/2] VALID_FLAG = '0'

---
 .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 557e4d0b..4a7f892f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -1723,6 +1723,8 @@
     <select id="selectIdFormDTBZH" resultType="java.lang.String">
             SELECT  ID FROM  sar_standards_info as sarInfo
             WHERE
+            VALID_FLAG = '0'
+            AND
             (
             REPLACE (
             	concat(

From 0a4fb00ea57df7ea9da29f4f7e9d8fd47c759daf Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 19 Jan 2022 15:14:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84,=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8E=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customWorkGroup/controller/WorkGroupController.java  | 2 +-
 .../adc/da/slrs/customWorkGroup/entity/WorkGroup.java    | 9 +++++++++
 .../service/impl/WorkGroupServiceImpl.java               | 2 ++
 .../mybatis/mapper/workGroup/WorkGroupMapper.xml         | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
index 40b54d6d..dfeab7da 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
@@ -61,7 +61,7 @@ public class WorkGroupController extends BaseController<WorkGroup> {
         return Result.success(delete);
     }
 
-    @ApiModelProperty("根据组长民或者组名查询工作组")
+    @ApiModelProperty("根据组长民或者组名查询工作组,参数为空时查询全部")
     @GetMapping
     public ResponseMessage<IPage<WorkGroup>> getWorkGroupLists(WorkGroupQueryPage queryPage){
         IPage<WorkGroup> workGroup = iWorkGroupService.getWorkGroup(queryPage);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java
index b01d4622..11eb1357 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/entity/WorkGroup.java
@@ -1,6 +1,8 @@
 package com.adc.da.slrs.customWorkGroup.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -22,15 +24,22 @@ public class WorkGroup extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId
+    private String id;
 
+    @TableField("work_group_name")
     private String workGroup;
 
+    @TableField(exist = false)
     private String workLeader;
 
+    @TableField("work_leader_id")
     private String workLeaderId;
 
+    @TableField(exist = false)
     private String workPeople;
 
+    @TableField("work_people_id")
     private String workPeopleId;
 
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
index d0c55149..ae37be0d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
@@ -4,6 +4,7 @@ import com.adc.da.slrs.customWorkGroup.entity.WorkGroup;
 import com.adc.da.slrs.customWorkGroup.dao.WorkGroupDao;
 import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage;
 import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService;
+import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,6 +30,7 @@ public class WorkGroupServiceImpl extends ServiceImpl<WorkGroupDao, WorkGroup> i
 
     @Override
     public boolean add(WorkGroup workGroup) {
+        workGroup.setId(UUIDUtils.randomUUID20());
         return this.save(workGroup);
     }
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml
index e21fb1e3..9376f2d6 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/workGroup/WorkGroupMapper.xml
@@ -5,6 +5,7 @@
     <select id="getWorkGroup" resultType="com.adc.da.slrs.customWorkGroup.entity.WorkGroup">
 
         SELECT
+            id,
         	work_group_name AS workGroup,
         	work_leader_id AS workLeaderId,
         	work_people_id AS workPeopleId