Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/xml/WorkContractFileMapper.xml

@@ -12,7 +12,8 @@
 	</select>
 
 	<delete id="removeById">
-		DELETE FROM work_contract_file
+		UPDATE work_contract_file
+		SET del_flag = 1
 		WHERE del_flag = 0 AND contract_info_id = #{id}
 	</delete>
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/xml/WorkContractInfoMapper.xml

@@ -44,7 +44,7 @@
 			work_contract_info a
 			LEFT JOIN sys_user c ON a.create_by_id = c.id
 			LEFT JOIN act_ru_task b ON a.proc_ins_id = b.PROC_INST_ID_
-			LEFT JOIN work_contract_file d ON a.id = d.contract_info_id
+			LEFT JOIN work_contract_file d ON a.id = d.contract_info_id and d.del_flag = 0
 			LEFT JOIN act_ru_task e ON d.proc_ins_id = e.PROC_INST_ID_
 			LEFT JOIN work_contract_borrow f ON a.id = f.contract_info_id
 			LEFT JOIN act_ru_task g ON f.proc_ins_id = g.PROC_INST_ID_
@@ -88,7 +88,7 @@
 			d.filed_type
 		FROM
 			work_contract_info a
-			LEFT JOIN work_contract_file d ON a.id = d.contract_info_id
+			LEFT JOIN work_contract_file d ON a.id = d.contract_info_id and d.del_flag = 0
 		WHERE
 			a.id = #{id}
 			AND a.del_flag = 0

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/contractRegistration/mapper/xml/ContractFilePaperMapper.xml

@@ -33,8 +33,4 @@
         WHERE del_flag = 0 AND contract_info_id = #{id}
     </update>
 
-    <update id="updateFileNumber">
-        UPDATE cw_work_contract_file_paper SET filed_no = #{filedNo}
-        WHERE del_flag = 0 AND contract_info_id = #{id}
-    </update>
 </mapper>