Ocr部分bug 和工作组部分bug修复

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java

@@ -118,4 +118,12 @@ public class TsUserVO {
     @ApiModelProperty(value = "岗位")
     @TableField(exist = false)
     private List<TsPosition> positions;
+
+    @ApiModelProperty(value = "单位")
+    @TableField(exist = false)
+    private String unit;
+
+    @ApiModelProperty(value = "单位Id")
+    @TableField(exist = false)
+    private String unitId;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandIdea.dao;
 
 import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,4 +22,8 @@ import java.util.List;
 public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
 
     List<SarPublicIdeaAll> getPublicIdea(@Param("unique")String unique);
+
+    List<SarPublicIdeaAll> getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId);
+
+    Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java

@@ -48,10 +48,13 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl<SarPublicIdeaAllDao
             } catch (ParseException e) {
                 e.printStackTrace();
             }
-            QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
-            wrapper.eq("idea_id", detAllStandDto.getIdeaId());
-            Page<SarPublicIdeaAll> page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize());
-            IPage<SarPublicIdeaAll> userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper);
+            List<SarPublicIdeaAll> sarPublicIdeaAlls=sarPublicIdeaAllDao.getAllDataByIdea(detAllStandDto.getPage(),detAllStandDto.getSize(),detAllStandDto.getIdeaId());
+            Integer a=sarPublicIdeaAllDao.getAllDataByIdeaCount(detAllStandDto.getIdeaId());
+            Page userIPage=new Page();
+            userIPage.setTotal(a);
+            userIPage.setRecords(sarPublicIdeaAlls);
+            userIPage.setSize(detAllStandDto.getSize());
+            userIPage.setCurrent(detAllStandDto.getPage());
             System.out.println("总条数" + userIPage.getTotal());
             System.out.println("总页数" + userIPage.getPages());
             List<SarPublicIdeaAll> list = userIPage.getRecords();

adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java

@@ -58,5 +58,12 @@ public class WgDept extends BaseEntity {
     @TableField("join_id")
     private String joinId;
 
+    @ApiModelProperty(value = "手机号")
+    @TableField("phone")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    @TableField("email")
+    private String email;
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java

@@ -44,5 +44,14 @@ public class WgNetInfo extends BaseEntity {
     @TableField("join_id")
     private String joinId;
 
+    @ApiModelProperty(value = "手机号")
+    @TableField("phone")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    @TableField("email")
+    private String email;
+
+
 
 }