fix 字典

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysDictData.java

@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
@@ -73,8 +74,8 @@ public class SysDictData implements Serializable
     private String isDefault;
 
     /** 状态（0正常 1停用） */
-    @ApiModelProperty(value ="状态（0正常 1停用）")
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @ApiModelProperty(value ="状态（1正常 0停用）")
+    @Excel(name = "状态", readConverterExp = "1正常 0停用")
     private String status;
 
     /** 创建者 */
@@ -98,6 +99,10 @@ public class SysDictData implements Serializable
     /** 备注 */
     private String remark;
 
+    @ApiModelProperty(value ="字典类型ID")
+    @Excel(name = "字典类型ID", cellType = ColumnType.NUMERIC)
+    @NotNull(message = "字典类型ID不能为空")
+    private Long dictTypeId;
     /**
      * 请求参数
      */

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

@@ -48,8 +48,8 @@ public class SysDictType implements Serializable
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
     private String dictType;
 
-    /** 状态（0正常 1停用） */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    /** 状态（1正常 0停用） */
+    @Excel(name = "状态", readConverterExp = "状态（1正常 0停用）")
     private String status;
 
     /** 创建者 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysDictDataServiceImpl.java

@@ -31,6 +31,7 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
         return list(new LambdaQueryWrapper<SysDictData>().eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
                 .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
                 .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
+                .eq(dictData.getDictTypeId()!=null, SysDictData::getDictTypeId, dictData.getDictTypeId())
                 .orderByAsc(SysDictData::getDictSort));
     }
 

zhongzheng-system/src/main/resources/mapper/modules/system/SysDictDataMapper.xml

@@ -18,6 +18,7 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="dictTypeId" column="dict_type_id"/>
     </resultMap>
 
 </mapper>