From b3f9244345726b2c2b62b0f2e09fe36b4e52dae1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 22 Jul 2021 10:58:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E6=B3=95=E8=A7=84=E5=AF=BC=E5=87=BAexcl=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/utils/util/FieldConvertUtil.java | 4 ++-- .../main/java/com/adc/da/utils/util/StandExportUtil.java | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index ddfe9cfa..1888d4e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -27,8 +27,8 @@ public class FieldConvertUtil { public static String mustFieldsLaws = "id,laws_id,valid_flag,creation_user,creation_time,modify_time"; // 自定义属性表中必须字段 - public static String exportBaseFieldNames = "适用区域,重要度,标准类别,标准编号,标准年份,中文名称,英文名称," + - "标准状态,发布日期,文本说明"; // 导出基础表字段 //删除 实施日期 2021-05-28 + public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," + + "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 public static String exportBaseFieldNamesForeign = "重要度,标准类别,标准编号,标准年份/系列,中文名称,英文名称," + "标准状态,发布日期,文本说明"; // 导出基础表字段 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 6ceaf11b..7cd978cf 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 @@ -100,6 +100,15 @@ public class StandExportUtil { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH"); Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); switch (name) { + case "标准性质": + value = sarStandardsInfoEO.getStandNature(); + break; + case "是否纳入认证清单": + value = sarStandardsInfoEO.getIsRelateAccess(); + break; + case "标准体系": + value = sarStandardsInfoEO.getStandSystem(); + break; case "适用区域": value = sarStandardsInfoEO.getCountryShow(); break; From 2ca543d981f777cf3728b8dc5fc015887b20e311 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 22 Jul 2021 14:52:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E6=97=B6,=E8=AE=BE=E7=BD=AE=E6=93=8D=E4=BD=9C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=B8=BA=E5=BD=93=E5=89=8D=E7=B3=BB=E7=BB=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarPosition/service/impl/TsPositionServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java index 9ac99608..9e9be8c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java @@ -15,6 +15,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.management.relation.Role; +import javax.xml.crypto.Data; +import java.sql.Timestamp; +import java.util.Date; import java.util.List; import java.util.Map; @@ -38,6 +41,7 @@ public class TsPositionServiceImpl extends ServiceImpl getPosition(TsPosition tsPosition) { + return tsPositionDao.selectPositionAndRole(tsPosition); } @@ -90,6 +94,8 @@ public class TsPositionServiceImpl extends ServiceImpl0){ return Result.error("该岗位已存在"); } + //设置操作时间为当前系统时间 + tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); tsPosition.setType("2"); tsPositionDao.insert(tsPosition); return Result.success(); From 66f9763b96016e4013161a7bdb581eb01f849404 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 23 Jul 2021 15:00:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=AC=AC=E4=B8=89=E6=96=B9=E9=93=BE=E6=8E=A5=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarUrl/controller/TsUrlController.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java index 6289f618..6ec52826 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java @@ -42,6 +42,20 @@ public class TsUrlController{ List tsUrls=tsUrlService.list(tsUrlQueryWrapper); return Result.success(tsUrls); } + + /** + * @param orderList 修改排序后的列表 + * @return + */ + @ApiOperation("更新链接排序") + @PutMapping(value = "/updateOrder") + public ResponseMessage updateOrder(@RequestBody List orderList){ + //持久化修改排序后的列表 + boolean line=tsUrlService.updateBatchById(orderList); + return Result.success(line); + } + + /** * 添加 * @@ -56,7 +70,7 @@ public class TsUrlController{ tsUrlService.save(tsUrl); return Result.success(); } - + /** * 编辑 * @@ -70,7 +84,7 @@ public class TsUrlController{ tsUrlService.updateById(tsUrl); return Result.success(); } - + /** * 通过id删除 * @@ -83,7 +97,7 @@ public class TsUrlController{ tsUrlService.removeById(id); return Result.success(); } - + /** * 批量删除 * @@ -96,7 +110,7 @@ public class TsUrlController{ this.tsUrlService.removeByIds(Arrays.asList(ids.split(","))); return Result.success(); } - + /** * 通过id查询 *