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

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

@@ -816,7 +816,8 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
         }
         List<InLnstLrxx> res = new ArrayList<>();
         List<String> jmZjhm = Stream.of(zwywLrJbxx.getLrJmzjhm().split(",")).collect(Collectors.toList());
-        jmZjhm.forEach(j -> {
+
+        for (String j: jmZjhm) {
             InLnstLrxx lr = zwywLrJbxxMapper.selectOne(new LambdaQueryWrapper<InLnstLrxx>().eq(InLnstLrxx::getLrJmzjhm, j));
             if (ObjectUtils.isNotEmpty(lr)) {
                 EncryptionUtils.decryptForPlaintext(lr);
@@ -825,17 +826,46 @@ 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 {
-                    query.setCreateUnit(SecurityUtils.getJgId());
+                    jgId = SecurityUtils.getJgId();
                 } catch (Exception e) {
-                    query.setCreateUnit("0");
+                    jgId = "0";
+                }
+                query.setCreateUnit(jgId);
+                String obtbz = zwywLrJbxxMapper.selectObtbz(query);
+                String btlx = "";
+                String btje = "";
+                try {
+                    btlx = obtbz.substring(0, obtbz.indexOf("$"));
+                    btje = obtbz.substring(obtbz.indexOf("$") + 1, obtbz.length());
+                } catch (Exception ignored) {}
+                List<Map<String, Object>> tcList = zwywLrJbxxMapper.selectTcByJgId(query);
+                String free = zwywLrJbxxMapper.getFreeByJgId(query);
+                for (Map<String, Object> t: tcList) {
+                    t.put("btlx", btlx);
+                    t.put("btje", btje);
                 }
-                lr.setObtbz(zwywLrJbxxMapper.selectObtbz(query));
-                lr.setTcList(zwywLrJbxxMapper.selectTcByJgId(query));
-                lr.setFree(zwywLrJbxxMapper.getFreeByJgId(query));
+                if (StringUtils.equals(free, "1")) {
+                    Map<String, Object> freeMap = new LinkedHashMap<>();
+                    freeMap.put("btlx", btlx);
+                    freeMap.put("yhje", "0");
+                    freeMap.put("btje", btje);
+                    freeMap.put("yhlx", "手动输入");
+                    freeMap.put("mc", "手工输入用餐金额");
+                    freeMap.put("dj", "0");
+                    freeMap.put("jg_id", jgId);
+                    freeMap.put("id", "0");
+                    tcList.add(freeMap);
+                }
+                lr.setObtbz(obtbz);
+                lr.setTcList(tcList);
+                lr.setFree(free);
+                // 手工输入用餐金额
+                // 0
                 res.add(lr);
             }
-        });
+        }
         return res;
     }