Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/core/domain/entity/SysDictType.java

@@ -31,7 +31,7 @@ public class SysDictType extends BaseEntity
     private String dictType;
 
     /** 数据类型 1系统2业务 */
-    @Excel(name = "状态", readConverterExp = "1系统2业务")
+    @Excel(name = "数据类型", readConverterExp = "1系统2业务")
     private Integer dataType;
 
     /** 状态（1正常 2停用） */
@@ -88,7 +88,7 @@ public class SysDictType extends BaseEntity
         return dataType;
     }
 
-    public void setDataType(Integer status)
+    public void setDataType(Integer dataType)
     {
         this.dataType = dataType;
     }

base-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, dataType,status, create_by, create_time, remark
+        select dict_id, dict_name, dict_type, data_type,status, create_by, create_time, remark
 		from sys_dict_type
     </sql>
 
@@ -30,6 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
+			<if test="dataType != null and dataType != 0">
+				AND data_type = #{dataType}
+			</if>
 			<if test="dictType != null and dictType != ''">
 				AND dict_type like concat('%', #{dictType}, '%')
 			</if>