Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the,

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

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -94,6 +94,10 @@ public class EsRevisePlan extends BasePage {
     //企标类别
     private String standType;
 
+    // 标准编号
+    private String standNum;
+
+
     @ApiModelProperty(value = "企标类别")
     private String esMatingRelations;
     private String esStandRelations;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -80,6 +80,12 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
         return Result.success();
     }
 
+    @ApiOperation("根据部门ID获取部门下所有用户")
+    @GetMapping("/getInstitutionIdToDept")
+    public List<TsInstitution> getInstitutionIdToDept(String institutionIds,String userName){
+        return tsInstitutionService.getInstitutionIdToDept(institutionIds,userName);
+    }
+
     @ApiOperation("获得下一级的部门和人员")
     @GetMapping("/getNext")
     public List<TsInstitution> getNext(String institutionId,String userName){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java

@@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      */
     List<TsInstitution> selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName);
 
+    List<TsInstitution> selectNextUsers(@Param("institutionIds") List<String> institutionIds,@Param("userName") String userName);
+
     List<TsInstitution> selectNextUserByIds(@Param("ids") List<String> ids);
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java

@@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
      */
     public List<TsInstitution> getNext(String institutionId,String userName);
 
+    public List<TsInstitution> getInstitutionIdToDept(String institutionIds,String userName);
+
     public List<TsInstitution> getNextById(String ids);
 
     /**

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -200,6 +200,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
         batchInsert(tsInstitutions);
     }
 
+    @Override
+    public List<TsInstitution> getInstitutionIdToDept(String institutionIds,String userName){
+        List<String> strings=new ArrayList<>(Arrays.asList(institutionIds.split(",")));
+        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUsers(strings,userName);
+        return tsUsers;
+    }
+
     /**
      * 通过部门id获得这个部门下的下一级部门
      * @return

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -210,6 +210,7 @@
         es_revise_plan.buss_sort,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
+        sar_bussioness_stand.stand_number as standNum,
         (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
         (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName,
         (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName,

adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml

@@ -35,6 +35,26 @@
 		WHERE parent_id=#{institutionId}
     </select>
 
+    <select id="selectNextUsers" resultMap="TsUser">
+        select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,
+        ts_user.INSTITUTION_ID,t2.name as INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE,
+        ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE,
+        ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname,
+        ts_institution.name as unit,ts_institution.id as unitId
+        from ts_user
+        left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID)
+        left join ts_institution t2 on t2.id=ts_user.INSTITUTION_ID
+        WHERE 1=1
+        <if test="institutionIds != null and institutionIds.size()> 0 ">
+            and ts_user.INSTITUTION_ID in
+            <foreach collection="institutionIds" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+
+        </if>
+        order by ts_institution.id
+    </select>
+
 <!--    只查询这个部门下的子一级人员-->
     <select id="selectNextUser" resultMap="TsUser">
         select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,