Merge branch '0418_小程序开发' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 0418_小程序开发

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

@@ -70,6 +70,8 @@ public class SysDictData extends BaseEntity {
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
+    private Long parentDictCode;
+
     public Long getDictCode() {
         return dictCode;
     }
@@ -78,6 +80,14 @@ public class SysDictData extends BaseEntity {
         this.dictCode = dictCode;
     }
 
+    public Long getParentDictCode() {
+        return parentDictCode;
+    }
+
+    public void setParentDictCode(Long parentDictCode) {
+        this.parentDictCode = parentDictCode;
+    }
+
     public Long getDictSort() {
         return dictSort;
     }

postdischarge-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -21,7 +21,7 @@
     </resultMap>
 
     <sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark
+        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark,parent_dict_code
 		from sys_dict_data
     </sql>
 
@@ -37,6 +37,9 @@
             <if test="status != null and status != ''">
                 AND status = #{status}
             </if>
+            <if test="parentDictCode != null">
+                AND parent_dict_code = #{parentDictCode}
+            </if>
         </where>
         order by dict_sort asc
     </select>
@@ -87,6 +90,7 @@
             <if test="status != null">status = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="parentDictCode != null">parent_dict_code = #{parentDictCode},</if>
             update_time = sysdate()
         </set>
         where dict_code = #{dictCode}
@@ -108,6 +112,7 @@
         <if test="status != null">status,</if>
         <if test="remark != null and remark != ''">remark,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
+        <if test="parentDictCode != null">parent_dict_code,</if>
         create_time
         )values(
         <if test="dictSort != null">#{dictSort},</if>
@@ -120,6 +125,7 @@
         <if test="status != null">#{status},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
+        <if test="parentDictCode != null">#{parentDictCode},</if>
         sysdate()
         )
     </insert>