20250219_sun

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/controller/GljtSqSqController.java

@@ -114,6 +114,12 @@ public class GljtSqSqController extends BaseController
         return AjaxResult.success(gljtSqSqService.programLrList());
     }
 
+    @GetMapping("/programLrJtList")
+    public AjaxResult programLrJtList()
+    {
+        return AjaxResult.success(gljtSqSqService.programLrJtList());
+    }
+
     @PostMapping("/programAddLr")
     public AjaxResult programAddLr(@Validated({AddGroup.class}) @RequestBody GljtUserLr gljtUserLr)
     {

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/IGljtSqSqService.java

@@ -49,6 +49,8 @@ public interface IGljtSqSqService
 
     public List<GljtUserLr> programLrList();
 
+    public List<GljtUserLr> programLrJtList();
+
     public int programAddLr(GljtUserLr gljtUserLr);
 
     public int programRemoveLr(GljtUserLr gljtUserLr);

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqLrHiServiceImpl.java

@@ -72,7 +72,6 @@ public class GljtSqLrHiServiceImpl implements IGljtSqLrHiService
         EncryptionUtils.encryptionForPlaintext(gljtSqLrHi);
         String filter = StringUtils.isEmpty(gljtSqLrHi.getXzqh()) ? SecurityUtils.getAreaCode() : gljtSqLrHi.getXzqh();
         gljtSqLrHi.setXzqh(null);
-        if (StringUtils.equals("99", SecurityUtils.getLoginUser().getSysUser().getUserType())) gljtSqLrHi.setUserId(String.valueOf(SecurityUtils.getUserId()));
         List<String> bdyy = new ArrayList<>();
         if (StringUtils.isNotEmpty(gljtSqLrHi.getBdyy()) && gljtSqLrHi.getBdyy().contains(",")) {
             bdyy = Stream.of(gljtSqLrHi.getBdyy().split(",")).collect(Collectors.toList());

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtSqSqServiceImpl.java

@@ -84,6 +84,9 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
     @Autowired
     private GljtJfxxMapper gljtJfxxMapper;
 
+    @Autowired
+    private GljtXmpzMapper gljtXmpzMapper;
+
     /**
      * 查询高龄津贴申请信息
      *
@@ -646,6 +649,52 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
         return res;
     }
 
+    @Override
+    public List<GljtUserLr> programLrJtList() {
+        List<SysDictData> pcDictDataList = DictUtils.getDictCache("GL013");
+        List<GljtUserLr> res = gljtUserLrMapper.selectList(new LambdaQueryWrapper<GljtUserLr>()
+                .like(GljtUserLr::getUserId, String.valueOf(SecurityUtils.getUserId())).eq(GljtUserLr::getStatus, "1")
+                .orderByDesc(GljtUserLr::getCreateTimeStr));
+        for (GljtUserLr r: res) {
+            EncryptionUtils.decryptForPlaintext(r);
+            StringBuilder sbSq = new StringBuilder();
+            StringBuilder sbBg = new StringBuilder();
+            StringBuilder sbJkzk = new StringBuilder();
+            r.setCanSq("0");
+            r.setCanBg("0");
+            r.setCanJkzk("0");
+            r.setSqCo("0");
+            r.setBgCo("0");
+            r.setJkzkCo("0");
+            sbSq.append("按月发放 ");
+            sbBg.append("按月发放 ");
+            sbJkzk.append("按月发放 ");
+            GljtSqLr lr = gljtSqLrMapper.selectById(r.getLrId());
+            if (ObjectUtils.isNotEmpty(lr)) {
+                GljtXmpz xmpz = gljtXmpzMapper.selectOne(new LambdaQueryWrapper<GljtXmpz>()
+                        .likeRight(GljtXmpz::getXzqh, lr.getXzqh().substring(0, 6)));
+                if (CollectionUtils.isNotEmpty(pcDictDataList) && ObjectUtils.isNotEmpty(xmpz)) {
+                    String pcName = pcDictDataList.stream().filter(p -> StringUtils.equals(p.getDictValue(), lr.getPc()))
+                            .findFirst().orElse(new SysDictData()).getDictLabel();
+                    String pcJe = null;
+                    if (StringUtils.equals(lr.getPc(), "0")) pcJe = xmpz.getBtzjE();
+                    if (StringUtils.equals(lr.getPc(), "1")) pcJe = xmpz.getBtzjN();
+                    if (StringUtils.equals(lr.getPc(), "2")) pcJe = xmpz.getBtzjH();
+                    if (StringUtils.equals(lr.getPc(), "3")) pcJe = xmpz.getBtzjEd();
+                    if (StringUtils.equals(lr.getPc(), "4")) pcJe = xmpz.getBtzjNd();
+                    if (StringUtils.equals(lr.getPc(), "5")) pcJe = xmpz.getBtzjHd();
+                    sbSq.append(pcName).append(" ").append(pcJe).append("/月");
+                    sbBg.append(pcName).append(" ").append(pcJe).append("/月");
+                    sbJkzk.append(pcName).append(" ").append(pcJe).append("/月");
+                }
+            }
+            r.setLastSqStatus(sbSq.toString());
+            r.setLastBgStatus(sbBg.toString());
+            r.setJkzkStatus(sbJkzk.toString());
+        }
+        return res;
+    }
+
     @Override
     public int programAddLr(GljtUserLr gljtUserLr) {
         if (ObjectUtils.isNotEmpty(gljtUserLrMapper.selectOne(new LambdaQueryWrapper<GljtUserLr>()