Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!378

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);

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;
 
 

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);
     }
 

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(

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