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

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<TsPositionDao, TsPosition
      */
     @Override
     public List<TsPosition> getPosition(TsPosition tsPosition) {
+
         return tsPositionDao.selectPositionAndRole(tsPosition);
     }
 
@@ -90,6 +94,8 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
         if(tsPositions!=null&&tsPositions.size()>0){
             return Result.error("该岗位已存在");
         }
+        //设置操作时间为当前系统时间
+        tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
         tsPosition.setType("2");
         tsPositionDao.insert(tsPosition);
         return Result.success();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java

@@ -42,6 +42,20 @@ public class TsUrlController{
 		List<TsUrl> tsUrls=tsUrlService.list(tsUrlQueryWrapper);
 		return Result.success(tsUrls);
 	}
+
+	/**
+	 * @param orderList	修改排序后的列表
+	 * @return
+	 */
+	@ApiOperation("更新链接排序")
+	@PutMapping(value = "/updateOrder")
+	public  ResponseMessage<?> updateOrder(@RequestBody List<TsUrl> orderList){
+		//持久化修改排序后的列表
+		boolean line=tsUrlService.updateBatchById(orderList);
+		return Result.success(line);
+	}
+
+
 	/**
 	 *   添加
 	 *

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 = "适用区域,重要度,标准类别,标准编号,标准年份,中文名称,英文名称," +
+    public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," +
-            "标准状态,发布日期,文本说明"; // 导出基础表字段 //删除 实施日期 2021-05-28
+            "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
 
     public static String exportBaseFieldNamesForeign = "重要度,标准类别,标准编号,标准年份/系列,中文名称,英文名称," +
             "标准状态,发布日期,文本说明"; // 导出基础表字段

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<String,Object> 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;