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

# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

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/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -234,20 +234,12 @@ public class SarStandardComplianceAssessResultController {
     public ResponseMessage<Object> selectNationalStandard(InterpretationEO eo) throws Exception {
         if (eo.getPosition() == 1) {
             IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-            QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
-            //如果查询条件里标准编号不为空，查询
-            if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber());
-            //如果查询条件里标准名称不为空，查询
-            if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName());
-            //如果查询条件里具体章条不为空，查询
-            if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem());
-
-            if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
-            if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
-
-            IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
-            while (page.getRecords().remove(null)) ;
-            return Result.success(page);
+            List<SarInterpretationNationalStandard> standards=iSarInterpretationNationalStandardService.getAllDatas(eo);
+            Integer datasCount=iSarInterpretationNationalStandardService.getAllDatasCount(eo);
+            iPage.setTotal(datasCount);
+            iPage.setRecords(standards);
+            while (iPage.getRecords().remove(null)) ;
+            return Result.success(iPage);
         } else {
             IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
             QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java

@@ -1,9 +1,12 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.dao;
 
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -16,4 +19,8 @@ public interface SarInterpretationNationalStandardDao extends BaseMapper<SarInte
 
     boolean updateData(@Param("find") SarInterpretationNationalStandard findStandDto);
 
+    List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard);
+
+    Integer getAllDatasCout(InterpretationEO sarInterpretationNationalStandard);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.service;
 
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,4 +19,8 @@ public interface ISarInterpretationNationalStandardService extends IService<SarI
     String saveBath(List<SarInterpretationNationalStandard> sarInterpretationNationalStandards);
 
     boolean updateData(SarInterpretationNationalStandard findStandDto);
+
+    List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard);
+
+    Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl;
 
 import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao;
 import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess;
@@ -55,4 +56,14 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl<Sa
     public boolean updateData(SarInterpretationNationalStandard findStandDto) {
         return sarInterpretationNationalStandardDao.updateData(findStandDto);
     }
+
+    @Override
+    public List<SarInterpretationNationalStandard> getAllDatas(InterpretationEO sarInterpretationNationalStandard) {
+        return sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard);
+    }
+
+    @Override
+    public Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard) {
+        return sarInterpretationNationalStandardDao.getAllDatasCout(sarInterpretationNationalStandard);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java

@@ -383,6 +383,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService
         sarFileSplitItemsEO.setModifyTime(new Date());
         sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
         sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
+        sarFileSplitItemsEO.setEditFlag(String.valueOf(UUID.randomUUID()));
         result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO);
 
         // SAR_FILE_ITEMS_VAL   添加数据，

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