Merge branch '20240604_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/mapper/ZwywLrJbxxMapper.java

@@ -46,6 +46,9 @@ public interface ZwywLrJbxxMapper extends BaseMapperPlus<InLnstLrxx> {
     @InterceptorIgnore(tenantLine = "true")
     public String getYc(String id);
 
+    @InterceptorIgnore(tenantLine = "true")
+    public Map<String, String> getJgYc(String id);
+
     @InterceptorIgnore(tenantLine = "true")
     public List<Map<String, Object>> selectTcByJgId(InLnstLrxx lrxx);
 

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

@@ -915,6 +915,16 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
         }
         List<InLnstLrxx> res = new ArrayList<>();
         List<String> jmZjhm = Stream.of(zwywLrJbxx.getLrJmzjhm().split(",")).collect(Collectors.toList());
+        String jgId = "";
+        try {
+            jgId = SecurityUtils.getJgId();
+        } catch (Exception e) {
+            throw new ServiceException("食堂信息有误，请重新登录试试");
+        }
+        Map<String, String> yc = zwywLrJbxxMapper.getJgYc(jgId);
+        if (ObjectUtils.isEmpty(yc) || !yc.containsKey("is_srje") || !yc.containsKey("isyh") || !yc.containsKey("yhcs")) {
+            throw new ServiceException("食堂信息有误，请重新登录");
+        }
         for (String j: jmZjhm) {
             String mchnt = SecurityUtils.getLoginUser().getSysUser().getMchnt();
             if (StringUtils.isEmpty(mchnt)) {
@@ -929,15 +939,10 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
                 query.setLrHjdz(lr.getLrHjdz().substring(0, 6));
                 query.setLrCsrq(lr.getLrCsrq());
                 query.setAge(String.valueOf(DateUtils.getCurrentAge(DateUtils.dateTime(YYYYMMDD, lr.getLrCsrq()))));
-                String jgId = "";
-                try {
-                    jgId = SecurityUtils.getJgId();
-                } catch (Exception e) {
-                    throw new ServiceException("食堂信息有误，请重新登录试试");
-                }
                 query.setCreateUnit(jgId);
-                String isyc = zwywLrJbxxMapper.getYc(jgId);
-                String yhcs = zwywLrJbxxMapper.getYhcs(jgId);
+                String isyc = yc.get("isyh");
+                String yhcs = yc.get("yhcs");
+                String free = yc.get("is_srje");
                 if (StringUtils.isEmpty(yhcs)) {
                     yhcs = "0";
                 }
@@ -951,7 +956,6 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
                 } catch (Exception ignored) {}
                 List<Map<String, Object>> tcList = zwywLrJbxxMapper.selectTcByJgId(query);
                 List<Map<String, Object>> inputTc = new ArrayList<>();
-                String free = zwywLrJbxxMapper.getFreeByJgId(query);
                 for (Map<String, Object> tc: tcList) {
                     if (ObjectUtils.isNotEmpty(tc) && tc.containsKey("yhlx")) {
                         if (StringUtils.equals("2200001", btlx) || StringUtils.equals("220000", btlx)) {

ruoyi-modules/mz-lnst/src/main/resources/mapper/lnst/ZwywLrJbxxMapper.xml

@@ -122,6 +122,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, jg_id, mc, dj, btlx, btje, yhlx, yhje from lnst_tc2 where jg_id = #{createUnit} and state = '0'
     </select>
 
+    <select id="getJgYc" parameterType="String" resultType="java.util.HashMap">
+        select is_srje, isyh, if(yhcs = '0', (select yhcs from lnst_mchnt where lnst_mchnt.ssqh = (select substring(lnst_jcxx.ssxzqh, 1, 6)) limit 1), yhcs) as yhcs from lnst_jcxx where id = #{id}
+    </select>
+
     <select id="getFreeByJgId" parameterType="InLnstLrxx" resultType="String">
         select is_srje from lnst_jcxx where id = #{createUnit}
     </select>