From ce7812e704eb289872f82f34f9cfc3ebc52345db Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 27 Sep 2021 13:54:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8A=8A=20standtextStatusShow=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BA=86standTextStatusShow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandardsInfo/entity/SarStandardsInfo.java | 10 +++++----- .../java/com/adc/da/utils/util/StandExportUtil.java | 2 +- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index a4cf3454..ec5291e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/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() { - return standtextStatusShow; + public String getStandTextStatusShow() { + return standTextStatusShow; } - public void setStandtextStatusShow(String standtextStatusShow) { - this.standtextStatusShow = standtextStatusShow; + public void setStandTextStatusShow(String standTextStatusShow) { + this.standTextStatusShow = standTextStatusShow; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java index 9f360b81..47f597c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java +++ b/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) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 84b3a553..fe1e4849 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/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 From 29918060864d843d1a42b3019f7236f4005c39f7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 27 Sep 2021 14:05:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=81=94=E8=A1=A8=E6=9F=A5=E8=AF=A2=20dics?= =?UTF-8?q?tandTextStatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index fe1e4849..c38db223 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -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 dicstandNature.valid_flag = 0 + AND dicstandTextStatus.dic_id IS NOT NULL + 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 dicstandNature.valid_flag = 0 + AND dicstandTextStatus.dic_id IS NOT NULL + 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 From f3b8466c5ff7abcb79f601f086b49238334f3eab Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 28 Sep 2021 08:57:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/DataSync/DataSyncController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java index 4ca8c427..b6d36d53 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java @@ -49,8 +49,10 @@ public class DataSyncController { //存放岗位信息 Map positionMap = new HashMap<>(); Map useDistinct = new HashMap<>(); - - IPage iPage = tsPositionService.getPosition(new TsPosition()); + TsPosition position = new TsPosition(); + position.setCurrent(1); + position.setPageSize(100000); + IPage iPage = tsPositionService.getPosition(position); List positions=iPage.getRecords(); if (!positions.isEmpty()) { positions.forEach(tsPosition -> { From 4e2278a987f282110bd9febee2a54d9b57491ea9 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 28 Sep 2021 08:58:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=A0=91=E5=BD=A2?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java | 2 +- .../mybatis/mapper/sarInstitution/TsInstitutionMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index dcc7ff49..0ea1a63b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -54,7 +54,7 @@ public interface TsInstitutionDao extends BaseMapper { * 查询根机构 * @return List */ - @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 selectRoot(); @Select("select * from ts_institution order by rand() limit 1") diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index ba3d2104..d5c48467 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/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 - 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