20240627_sun&&优化用餐信息页面

ruoyi-modules/mz-business-lrgl/src/main/resources/mapper/business/LnstYcxxMapper.xml

@@ -17,8 +17,8 @@
         <result property="ycje" column="ycje"/>
         <result property="btlx" column="btlx"/>
         <result property="btje" column="btje"/>
-        <result property="yhlx" column="btlx"/>
-        <result property="yhje" column="btje"/>
+        <result property="yhlx" column="yhlx"/>
+        <result property="yhje" column="yhje"/>
         <result property="zpurl" column="zpurl"/>
         <result property="jssj" column="jssj"/>
         <result property="sbip" column="sbip"/>
@@ -38,23 +38,23 @@
 
     <select id="listAndLrInfo" parameterType="LnstYcxx" resultMap="LnstYcxxResult">
         SELECT
-        getxzqhmcbycode ( CONCAT( a.ssqh )) AS ssqhMc,
-        a.*,b.bzms
+        getxzqhmcbycode ( CONCAT( ssqh )) AS ssqhMc,
+        ycsj, stmc, xm, sfzh, ycje, yhje, issc,
+        (select bzms from lnst_btbz where lnst_ycxx.yhlx = lnst_btbz.bzbm limit 1) as bzms
         FROM
-        lnst_ycxx a
-        left join lnst_btbz b on a.yhlx = b.bzbm
+        lnst_ycxx
         <where>
-            a.zt != '99'
-            <if test="stmc != null  and stmc != ''">and a.stmc like concat('%', #{stmc}, '%')</if>
-            <if test="stbm != null  and stbm != ''">and a.stbm = #{stbm}</if>
-            <if test="issc != null  and issc != ''">and a.issc = #{issc}</if>
-            <if test="yclb != null  and yclb != ''">and a.yclb = #{yclb}</if>
-            <if test="ssqh != null  and ssqh != ''">and a.ssqh like concat('%', #{ssqh}, '%')</if>
-            <if test="xm != null  and xm != ''">and a.xm like concat('%', #{xm}, '%')</if>
-            <if test="params.beginSqsj != null and params.beginSqsj != ''"> and a.ycsj &gt;= concat(#{params.beginSqsj},'000000')</if>
-            <if test="params.endSqsj != null and params.endSqsj != ''"> and a.ycsj &lt;= concat(#{params.endSqsj},'235959')</if>
+            zt = '0'
+            <if test="stmc != null  and stmc != ''">and stmc like concat('%', #{stmc}, '%')</if>
+            <if test="stbm != null  and stbm != ''">and stbm = #{stbm}</if>
+            <if test="issc != null  and issc != ''">and issc = #{issc}</if>
+            <if test="yclb != null  and yclb != ''">and yclb = #{yclb}</if>
+            <if test="ssqh != null  and ssqh != ''">and ssqh like concat('%', #{ssqh}, '%')</if>
+            <if test="xm != null  and xm != ''">and xm like concat('%', #{xm}, '%')</if>
+            <if test="params.beginSqsj != null and params.beginSqsj != ''"> and ycsj &gt;= concat(#{params.beginSqsj},'000000')</if>
+            <if test="params.endSqsj != null and params.endSqsj != ''"> and ycsj &lt;= concat(#{params.endSqsj},'235959')</if>
         </where>
-        order by a.ycsj desc
+        order by ycsj desc
     </select>
 
 </mapper>

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/YlServer.java

@@ -33,7 +33,7 @@ import static com.ruoyi.common.core.utils.DateUtils.YYYY_MM_DD_HH_MM_SS;
 public class YlServer {
 
     public static void main(String[] args) {
-        System.out.println(SecurityUtils.sm4encrypt_ECB("1234567887654321", "222323195011040021"));
+        System.out.println(SecurityUtils.sm4decrypt_ECB("500fc07c847e8e51", "15ADpYG8LeQrq9J1YcDK0Q=="));
 //        LnstMchnt mchnt = new LnstMchnt();
 //        mchnt.setMchnt("10002534");
 //        mchnt.setSrc("ZEO6");