Merge remote-tracking branch 'origin/develop_master' into develop_3

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java

@@ -48,4 +48,8 @@ public class SarStandItemsDto {
 
     private String zccssrq;
 
+    private String technicalRequir;
+
+    private String changePoint;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java

@@ -9,10 +9,12 @@ import com.adc.da.slrs.sarMenu.entity.SarMenu;
 import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.adc.da.slrs.sarUrl.dao.TsUrlDao;
 import com.adc.da.slrs.sarUser.dao.TsUserDao;
+import com.adc.da.slrs.sarUser.entity.UpDTO;
 import com.adc.da.slrs.sarUser.entity.UserPositionVO;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -80,5 +82,12 @@ public class TsUserController extends BaseController<TsUser> {
     }
 
 
+    @ApiOperation("查询人接口悬浮窗")
+    @GetMapping("/selectUp")
+    public ResponseMessage<List<UpDTO>> selectUp(@Param("uname") String uname) throws Exception {
+        return Result.success(tsUserService.selectByName(uname));
+    }
+
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java

@@ -143,9 +143,11 @@ public class TsUser extends BaseEntity {
     private List<TsPosition> positions;
 
     @ApiModelProperty("当前页")
+    @TableField(exist = false)
     private Integer current;
 
     @ApiModelProperty("每页条数")
+    @TableField(exist = false)
     private Integer size;
 
     public TsUser() {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java

@@ -0,0 +1,13 @@
+package com.adc.da.slrs.sarUser.entity;
+
+import lombok.Data;
+
+@Data
+public class UpDTO {
+
+
+
+    private String value;
+
+    private String id;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

@@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.slrs.sarMenu.entity.SarMenu;
 import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.entity.UpDTO;
 import com.adc.da.slrs.sarUser.entity.UserPositionVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -74,4 +75,6 @@ public interface ITsUserService extends IService<TsUser> {
     void parseUser() throws Exception;
 
     List<SarMenu> getSecondMenusByUserId(String userId);
+
+    List<UpDTO> selectByName(String name);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.adc.da.slrs.sarRole.service.ITsRoleService;
 import com.adc.da.slrs.sarUser.entity.SyncUser;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.adc.da.slrs.sarUser.dao.TsUserDao;
+import com.adc.da.slrs.sarUser.entity.UpDTO;
 import com.adc.da.slrs.sarUser.entity.UserPositionVO;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.sync.service.SyncUserService;
@@ -31,6 +32,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -273,4 +275,20 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
         List<String> menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds);
         return sarMenuService.getSecondMenuByIds(menuIds);
     }
+
+    @Override
+    public List<UpDTO> selectByName(String name) {
+        QueryWrapper<TsUser> tsUserQueryWrapper=new QueryWrapper<>();
+        tsUserQueryWrapper.like("ACCOUNT",name);
+        tsUserQueryWrapper.or().like("UNAME",name);
+        List<TsUser> res= tsUserDao.selectList(tsUserQueryWrapper);
+        List<UpDTO> result=new ArrayList<>();
+        res.forEach(tsUser -> {
+           UpDTO upDTO=new UpDTO();
+           upDTO.setValue(tsUser.getUname()+"("+tsUser.getAccount()+")");
+           upDTO.setId(tsUser.getUserId());
+           result.add(upDTO);
+        });
+        return result;
+    }
 }

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -731,7 +731,7 @@
 
 
     <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
-        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq ,read_content as technicalRequir ,compared_with_previous as changePoint
         from SAR_STAND_ITEMS
         where FILE_TYPE=#{type}
         <if test="ids != null">