Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz3

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java

@@ -37,4 +37,9 @@ public class CaseEvidenceDirectory extends BaseEntity {
      * 级数
      */
     private Integer series;
+
+    /**
+     * 案件id
+     */
+    private Integer caseId;
 }

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceDirectoryMapper.xml

@@ -7,15 +7,36 @@
         <id property="id"       column="id"      />
         <result property="parentId"     column="parent_id"    />
         <result property="evidenceName"     column="evidence_name"    />
-        <result     property="annexId"       column="annex_id"      />
+        <result property="annexId"       column="annex_id"      />
         <result property="series"     column="series"    />
+        <result property="caseId"     column="case_appli_id"    />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateTime"     column="update_time"    />
+        <result property="createBy"     column="create_by"    />
+        <result property="updateBy"     column="update_by"    />
     </resultMap>
-    <insert id="save" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save" parameterType="CaseEvidenceDirectory" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO case_evidence_directory (id, parent_id, evidence_name , annex_id,series)
+
-        VALUES (#{id}, #{parentId}, #{evidenceName},#{annexId},#{series})
+        insert into case_evidence_directory(
+        <if test="parentId != null ">parent_id,</if>
+        <if test="evidenceName != null and evidenceName != ''">evidence_name,</if>
+        <if test="annexId != null ">annex_id,</if>
+        <if test="series != null ">series,</if>
+        <if test="caseId != null ">case_appli_id,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="parentId != null ">#{parentId},</if>
+        <if test="evidenceName != null and evidenceName != ''">#{evidenceName},</if>
+        <if test="annexId != null ">#{annexId},</if>
+        <if test="series != null ">#{series},</if>
+        <if test="caseId != null ">#{caseId},</if>
+        <if test="createBy != null  and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
     </insert>
     <select id="selectList" resultMap="CaseEvidenceDirectoryResult">
-        select id,parent_id,evidence_name,annex_id,series
+        select id,parent_id,evidence_name,annex_id,series,create_time,update_time,case_appli_id,create_by,update_by
         from case_evidence_directory
         <where>
             <if test="id != null ">
@@ -33,6 +54,9 @@
             <if test="series != null ">
                 AND series = #{series}
             </if>
+            <if test="caseId != null ">
+                AND case_appli_id = #{caseId}
+            </if>
         </where>
     </select>