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

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

@@ -402,6 +402,7 @@
         <if test="properPreser != null ">proper_preser,</if>
 
         <if test="createBy != null  and createBy != ''">create_by,</if>
+        <if test="importFlag != null ">import_flag,</if>
         create_time
         )values(
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
@@ -428,6 +429,7 @@
         <if test="properPreser != null ">#{properPreser},</if>
 
         <if test="createBy != null  and createBy != ''">#{createBy},</if>
+        <if test="importFlag != null ">#{importFlag},</if>
         sysdate()
         )
     </insert>
@@ -539,6 +541,7 @@
                 AND c.id = #{id}
             </if>
         </where>
+order by c.create_time desc limit 1
     </select>
     <select id="listCaseApplicationByIds" resultMap="CaseApplicationResult">
         select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,

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

@@ -31,6 +31,19 @@
         where case_appli_id =#{id}
     </select>
 
+    <select id="getCaseAttachByCaseIdAndType" resultType="com.ruoyi.wisdomarbitrate.domain.CaseAttach" resultMap="CaseAttachResult">
+        select annex_id,case_appli_id,annex_name,annex_path,annex_type,note,use_id,use_account
+        from case_attach
+        <where>
+            <if test="caseAppliId != null ">
+                AND case_appli_id = #{caseAppliId}
+            </if>
+            <if test="annexType != null ">
+                AND annex_type = #{annexType}
+            </if>
+        </where>
+    </select>
+
     <select id="queryCaseAttachList" resultMap="CaseAttachResult">
         select annex_id,case_appli_id,annex_name,annex_path,annex_type,note,use_id,use_account
         from case_attach