20250219_sun

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

@@ -1,27 +1,21 @@
 package com.ruoyi.gljt.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.system.validate.group.AddGroup;
 import com.ruoyi.gljt.domain.GljtSqLrHi;
 import com.ruoyi.gljt.service.IGljtSqLrHiService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.system.validate.group.AddGroup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 高龄津贴申请老人信息历史Controller
@@ -48,6 +42,14 @@ public class GljtSqLrHiController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/programList")
+    public TableDataInfo programList(GljtSqLrHi gljtSqLrHi)
+    {
+        startPage();
+        List<GljtSqLrHi> list = gljtSqLrHiService.programList(gljtSqLrHi);
+        return getDataTable(list);
+    }
+
     /**
      * 导出高龄津贴申请老人信息历史列表
      */

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqLrHi.java

@@ -359,4 +359,7 @@ public class GljtSqLrHi extends BaseEntity
     private String sqrLxdh2;
 
     private String jhrGx;
+
+    @TableField(exist = false)
+    private String programStatus;
 }

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

@@ -1,19 +1,20 @@
 package com.ruoyi.gljt.service;
 
-import java.util.List;
 import com.ruoyi.gljt.domain.GljtSqLrHi;
 
+import java.util.List;
+
 /**
  * 高龄津贴申请老人信息历史Service接口
- * 
+ *
  * @author sun
  * @date 2025-01-03
  */
-public interface IGljtSqLrHiService 
+public interface IGljtSqLrHiService
 {
     /**
      * 查询高龄津贴申请老人信息历史
-     * 
+     *
      * @param id 高龄津贴申请老人信息历史主键
      * @return 高龄津贴申请老人信息历史
      */
@@ -21,15 +22,17 @@ public interface IGljtSqLrHiService
 
     /**
      * 查询高龄津贴申请老人信息历史列表
-     * 
+     *
      * @param gljtSqLrHi 高龄津贴申请老人信息历史
      * @return 高龄津贴申请老人信息历史集合
      */
     public List<GljtSqLrHi> selectGljtSqLrHiList(GljtSqLrHi gljtSqLrHi);
 
+    public List<GljtSqLrHi> programList(GljtSqLrHi gljtSqLrHi);
+
     /**
      * 新增高龄津贴申请老人信息历史
-     * 
+     *
      * @param gljtSqLrHi 高龄津贴申请老人信息历史
      * @return 结果
      */
@@ -37,7 +40,7 @@ public interface IGljtSqLrHiService
 
     /**
      * 修改高龄津贴申请老人信息历史
-     * 
+     *
      * @param gljtSqLrHi 高龄津贴申请老人信息历史
      * @return 结果
      */
@@ -45,7 +48,7 @@ public interface IGljtSqLrHiService
 
     /**
      * 批量删除高龄津贴申请老人信息历史
-     * 
+     *
      * @param ids 需要删除的高龄津贴申请老人信息历史主键集合
      * @return 结果
      */

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

@@ -289,9 +289,9 @@ public class GljtJfxxServiceImpl implements IGljtJfxxService {
         List<GljtSqLr> list4 = gljtSqLrMapper.selectList(lqw4);
         list1.forEach(l -> {
             EncryptionUtils.decryptForPlaintext(l);
-            l.setPc("1");
             try {
                 String id = insertLrHi(l, "1");
+                l.setPc("1");
                 insertPcHi(l, "1", id);
             } catch (Exception e) {
                 System.out.println(e.getMessage());
@@ -299,9 +299,9 @@ public class GljtJfxxServiceImpl implements IGljtJfxxService {
         });
         list2.forEach(l -> {
             EncryptionUtils.decryptForPlaintext(l);
-            l.setPc("2");
             try {
                 String id = insertLrHi(l, "1");
+                l.setPc("2");
                 insertPcHi(l, "2", id);
             } catch (Exception e) {
                 System.out.println(e.getMessage());
@@ -309,9 +309,9 @@ public class GljtJfxxServiceImpl implements IGljtJfxxService {
         });
         list3.forEach(l -> {
             EncryptionUtils.decryptForPlaintext(l);
-            l.setPc("4");
             try {
                 String id = insertLrHi(l, "1");
+                l.setPc("4");
                 insertPcHi(l, "4", id);
             } catch (Exception e) {
                 System.out.println(e.getMessage());
@@ -319,9 +319,9 @@ public class GljtJfxxServiceImpl implements IGljtJfxxService {
         });
         list4.forEach(l -> {
             EncryptionUtils.decryptForPlaintext(l);
-            l.setPc("5");
             try {
                 String id = insertLrHi(l, "1");
+                l.setPc("5");
                 insertPcHi(l, "5", id);
             } catch (Exception e) {
                 System.out.println(e.getMessage());

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

@@ -3,12 +3,16 @@ package com.ruoyi.gljt.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.ruoyi.common.security.utils.EncryptionUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.common.security.utils.SysDeptJlUtils;
 import com.ruoyi.gljt.domain.GljtSqLrHi;
+import com.ruoyi.gljt.domain.GljtXmpz;
 import com.ruoyi.gljt.mapper.GljtSqLrHiMapper;
+import com.ruoyi.gljt.mapper.GljtXmpzMapper;
 import com.ruoyi.gljt.service.IGljtSqLrHiService;
+import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.mapper.SysDeptJlMapper;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.apache.commons.collections4.CollectionUtils;
@@ -37,6 +41,9 @@ public class GljtSqLrHiServiceImpl implements IGljtSqLrHiService
     @Autowired
     private SysDeptJlMapper sysDeptJlMapper;
 
+    @Autowired
+    private GljtXmpzMapper gljtXmpzMapper;
+
     /**
      * 查询高龄津贴申请老人信息历史
      *
@@ -103,6 +110,42 @@ public class GljtSqLrHiServiceImpl implements IGljtSqLrHiService
         return res;
     }
 
+    @Override
+    public List<GljtSqLrHi> programList(GljtSqLrHi gljtSqLrHi) {
+        EncryptionUtils.encryptionForPlaintext(gljtSqLrHi);
+        LambdaQueryWrapper<GljtSqLrHi> lqw = new LambdaQueryWrapper<>(gljtSqLrHi)
+                .orderByDesc(GljtSqLrHi::getCreateTimeStr);
+        List<GljtSqLrHi> res = gljtSqLrHiMapper.selectList(lqw);
+        List<SysDictData> pcDictDataList = DictUtils.getDictCache("GL013");
+        res.forEach(r -> {
+            EncryptionUtils.decryptForPlaintext(r);
+            r.setXzqhName(SysDeptJlUtils.getDeptCache(r.getXzqh()));
+            if (StringUtils.isNotEmpty(r.getXjdxzqh())) {
+                r.setXjdxzqhName(sysDeptJlMapper.getXzqhNames(r.getXjdxzqh()));
+            }
+            try {
+                r.setAge(DateUtils.getCurrentAgeByMonth(r.getCsrq()) + "岁");
+            } catch (Exception ignored) {}
+            StringBuilder status = new StringBuilder();
+            GljtXmpz xmpz = gljtXmpzMapper.selectOne(new LambdaQueryWrapper<GljtXmpz>()
+                    .likeRight(GljtXmpz::getXzqh, r.getXzqh().substring(0, 6)));
+            if (CollectionUtils.isNotEmpty(pcDictDataList) && ObjectUtils.isNotEmpty(xmpz)) {
+                String pcName = pcDictDataList.stream().filter(p -> StringUtils.equals(p.getDictValue(), r.getPc()))
+                        .findFirst().orElse(new SysDictData()).getDictLabel();
+                String pcJe = null;
+                if (StringUtils.equals(r.getPc(), "0")) pcJe = xmpz.getBtzjE();
+                if (StringUtils.equals(r.getPc(), "1")) pcJe = xmpz.getBtzjN();
+                if (StringUtils.equals(r.getPc(), "2")) pcJe = xmpz.getBtzjH();
+                if (StringUtils.equals(r.getPc(), "3")) pcJe = xmpz.getBtzjEd();
+                if (StringUtils.equals(r.getPc(), "4")) pcJe = xmpz.getBtzjNd();
+                if (StringUtils.equals(r.getPc(), "5")) pcJe = xmpz.getBtzjHd();
+                status.append(pcName).append(" ").append(pcJe).append("/月");
+                r.setProgramStatus(status.toString());
+            }
+        });
+        return res;
+    }
+
     /**
      * 新增高龄津贴申请老人信息历史
      *