合并分支 'dev_20230216' 到 'master'

Dev 20230216 查看合并请求 laws-foton-slrs/foton-slrs-system-rest!99
2023-06-06 16:58:49 +08:00
parent 38effa474b c163d54dc3
commit 1b98d48b0f
10 changed files with 86 additions and 7 deletions
@@ -5,5 +5,11 @@
    <select id="selectMaxStandnSn" resultType="java.lang.String">
     select Max(STAND_SN)  from sar_buss_stand_sn
    </select>
+    <select id="selectMaxStandSn" resultType="java.lang.String">
+        select Max(STAND_SN)  from sar_buss_stand_sn where STAND_SORT = #{standSort} and VALID_FLAG = '0'
+    </select>
+    <select id="selectStandSort" resultType="java.lang.String">
+        select STAND_SORT from sar_buss_stand_sn where STAND_SORT = #{standSort} and VALID_FLAG = '0' limit 1
+    </select>

 </mapper>
@@ -351,7 +351,7 @@
    </select>

    <select id="getStandInfoByReviseStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select MAX(DISTINCT CAST(stand_number AS decimal(9)))+1 AS newStandSn from sar_bussioness_stand
+        select MAX(DISTINCT CAST(stand_number AS decimal(9))) AS newStandSn from sar_bussioness_stand
        where REPLACE(STAND_SORT,' ','') = REPLACE(#{standSort},' ','') and valid_flag=0
    </select>

@@ -1257,6 +1257,9 @@
            resultType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand">
        select * from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1
    </select>
+    <select id="selectMaxStandSn" resultType="java.lang.String">
+        select max(STAND_NUMBER) from sar_bussioness_stand where STAND_SORT =#{standSort} and VALID_FLAG = 0
+    </select>

    <update id="updateByIdInfo" >
        update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}