Merge branch 'develop_3' into 'develop_master'

Develop 3

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

adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java

@@ -49,8 +49,10 @@ public class DataSyncController {
         //存放岗位信息
         Map<String, String> positionMap = new HashMap<>();
         Map<String, String> useDistinct = new HashMap<>();
-
+        TsPosition position = new TsPosition();
-        IPage<TsPosition> iPage = tsPositionService.getPosition(new TsPosition());
+        position.setCurrent(1);
+        position.setPageSize(100000);
+        IPage<TsPosition> iPage = tsPositionService.getPosition(position);
         List<TsPosition> positions=iPage.getRecords();
         if (!positions.isEmpty()) {
             positions.forEach(tsPosition -> {

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

@@ -54,7 +54,7 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      * 查询根机构
      * @return List<TsInstitution>
      */
-    @Select("select * from ts_institution where parent_id not in (select id from ts_institution)")
+    @Select("select * from ts_institution where parent_id not in (select id from ts_institution) order by name")
     List<TsInstitution> selectRoot();
 
     @Select("select * from ts_institution order by rand() limit 1")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java

@@ -155,7 +155,7 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private String standNatureShow; // 标准性质显示名称
     @TableField(exist = false)
-    private String standtextStatusShow; // 标准文本状态显示名称
+    private String standTextStatusShow; // 标准文本状态显示名称
     @TableField(exist = false)
     private String sychronId; // 同步数据ID
     @TableField(exist = false)
@@ -610,12 +610,12 @@ public class SarStandardsInfo extends BaseEntity {
         this.standSystemName = standSystemName;
     }
 
-    public String getStandtextStatusShow() {
+    public String getStandTextStatusShow() {
-        return standtextStatusShow;
+        return standTextStatusShow;
     }
 
-    public void setStandtextStatusShow(String standtextStatusShow) {
+    public void setStandTextStatusShow(String standTextStatusShow) {
-        this.standtextStatusShow = standtextStatusShow;
+        this.standTextStatusShow = standTextStatusShow;
     }
 }
 

adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java

@@ -142,7 +142,7 @@ public class StandExportUtil {
                 value = sarStandardsInfoEO.getStandEnName();
                 break;
             case "文本状态":
-                value = sarStandardsInfoEO.getStandtextStatusShow();
+                value = sarStandardsInfoEO.getStandTextStatusShow();
                 break;
             case "发布日期":
                 if (sarStandardsInfoEO.getIssueTime() != null) {

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

@@ -45,7 +45,7 @@
         left join ts_user u
         on i.id=u.institution_id
         <if test="userName == null">
-            where i.parent_id not in (select id from ts_institution)
+            where i.parent_id not in (select id from ts_institution)  order by i.name
         </if>
 
         <if test="userName != null">

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -61,7 +61,7 @@
      SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
      concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
      SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow,
-     dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,dicstandTextStatus.DIC_TYPE_NAME as standtextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
+     dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,dicstandTextStatus.DIC_TYPE_NAME as standTextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
   </sql>
 
     <sql id="Group_Column_List_Show">
@@ -382,8 +382,8 @@
         dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
         LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
         dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
-        AND dicstandNature.dic_id IS NOT NULL
+        AND dicstandTextStatus.dic_id IS NOT NULL
-        AND dicstandNature.valid_flag = 0
+        AND dicstandTextStatus.valid_flag = 0
         )
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
@@ -753,8 +753,8 @@
         dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
         LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
         dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
-        AND dicstandNature.dic_id IS NOT NULL
+        AND dicstandTextStatus.dic_id IS NOT NULL
-        AND dicstandNature.valid_flag = 0
+        AND dicstandTextStatus.valid_flag = 0
         )
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id