Merge branch 'develop' of http://39.106.8.246:3003/BDTP/digital-delivery

adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/controller/AdmModelController.java

@@ -110,6 +110,7 @@ public class AdmModelController {
             vo.setStatus(admModelFile.getStatus());
             vo.setUserId(admModelFile.getUserId());
             vo.setUserName(admModelFile.getUserName());
+            vo.setCreationTime(admModelFile.getCreationTime());
         }
         // 4.处理一下排序
         List<BuildingVo> buildingVos = CollUtil.newArrayList(buildingVoMap.values()).stream()

adm-business/adm-server/src/main/java/com/persagy/adm/server/algorithm/domain/ModelFileVo.java

@@ -1,5 +1,6 @@
 package com.persagy.adm.server.algorithm.domain;
 
+import com.persagy.dmp.common.lang.PsDateTime;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -53,4 +54,7 @@ public class ModelFileVo {
     /**楼层序号*/
     private Integer floorSequenceId;
 
+    /**上传时间,格式为yyyyMMddHHmmss*/
+    private PsDateTime creationTime;
+
 }

adm-business/adm-server/src/main/java/com/persagy/adm/server/custom/entity/db/AdmDefineProblemInfo.java

@@ -66,6 +66,12 @@ public class AdmDefineProblemInfo implements Serializable {
     private String remark;
 
     /**
+     * 是否记录原值 0-不记录1-记录
+     */
+    @TableField("is_record_origin")
+    private Boolean isRecordOrigin;
+
+    /**
      * 创建人
      */
     private String creator;

adm-business/adm-server/src/main/resources/db/init/schema.sql

@@ -63,6 +63,7 @@ CREATE TABLE IF NOT EXISTS `adm_define_problem_info`  (
   `is_multiple` int(0) NULL DEFAULT NULL COMMENT '是否复数',
   `data_source` json NULL COMMENT '数据源取值范围/枚举值清单等,根据dataType有不同的内容',
   `remark` text NULL COMMENT '备注',
+  `is_record_origin` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否记录原值 0-不记录1-记录',
   `creator` varchar(32) NULL DEFAULT NULL COMMENT '创建人',
   `creation_time` char(14) NULL DEFAULT NULL COMMENT '创建时间',
   `modifier` varchar(32) NULL DEFAULT NULL COMMENT '最后修改人',