Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb
# Conflicts: # ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/SealSignRecordMapper.java # ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java # ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SealSignRecordMapper.xml
This commit is contained in:
@@ -248,6 +248,9 @@
|
||||
select max(substring(case_num, #{length}+1,12)+1) as maxCaseNum
|
||||
from case_application where case_num like CONCAT(#{caseNum},'%') ;
|
||||
</select>
|
||||
<select id="selectArbitratorList" resultType="java.lang.String">
|
||||
select a.arbitrator_id id from case_application a where a.id=#{id}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -12,4 +12,5 @@
|
||||
,#{orgnizeNamePsnAccount},#{orgnizeNamepsnName},#{positionPagepsn},#{positionXpsn},#{positionYpsn}
|
||||
,#{positionPageorg},#{positionXorg},#{positionYorg},#{caseAppliId},#{signFlowStatus})
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user