20250412_sun

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

@@ -129,4 +129,13 @@ public class GljtUserLr extends BaseEntity
 
     @TableField(exist = false)
     private String nd;
+
+    @TableField(exist = false)
+    private GljtSqSq activeSq;
+
+    @TableField(exist = false)
+    private GljtSqBg activeBg;
+
+    @TableField(exist = false)
+    private GljtJkzk activeJkzk;
 }

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

@@ -32,11 +32,13 @@ import com.ruoyi.system.utils.IDCardUtil;
 import com.ruoyi.system.utils.SubCodeUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -740,6 +742,9 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
                     .ne(GljtSqBg::getState, "99").orderByDesc(GljtSqBg::getCreateTimeStr));
             GljtJkzk jkzk = gljtJkzkMapper.selectOne(new LambdaQueryWrapper<GljtJkzk>()
                     .eq(GljtJkzk::getLrId, r.getLrId()).ne(GljtJkzk::getKz3, "0").orderByDesc(GljtJkzk::getCreateTimeStr));
+            r.setActiveSq(sq);
+            r.setActiveBg(bg);
+            r.setActiveJkzk(jkzk);
             if (ObjectUtils.isEmpty(lr)) {
                 r.setCanSq("1");
                 r.setSqCo("1");
@@ -781,6 +786,9 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
                             }
                             if (StringUtils.equals(jkzk.getKz3(), "2")) {
                                 sbJkzk.append("审核不通过");
+//                                sbJkzk.append(jkzk.getKz8());
+//                                sbJkzk.append(" 审核不通过");
+//                                sbJkzk.append(" ").append(formatTime(jkzk.getKz6()));
                                 r.setCanJkzk("1");
                                 r.setJkzkCo("2");
                             }
@@ -802,8 +810,26 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
                 }
                 if (StringUtils.equals(lr.getStatus(), "3")) {
                     r.setCanSq("1");
-                    sbSq.append("终止 ");
-                    sbBg.append("终止 ");
+                    if (ObjectUtils.isNotEmpty(sq) && StringUtils.equals(sq.getStatus(), "4")) {
+                        String shbm = "";
+                        if (StringUtils.equals(sq.getSqShjg(), "02")) shbm = "社区审核 ";
+                        if (StringUtils.equals(sq.getJdShjg(), "02")) shbm = "街道审核 ";
+                        if (StringUtils.equals(sq.getMzShjg(), "02")) shbm = "民政审核 ";
+                        sbSq.append(shbm);
+                    } else {
+                        sbSq.append("终止 ");
+                    }
+
+                    if (ObjectUtils.isNotEmpty(bg) && StringUtils.equals(bg.getStatus(), "14")) {
+                        String shbm = "";
+                        if (StringUtils.equals(bg.getBgsqShjg(), "02")) shbm = "社区审核 ";
+                        if (StringUtils.equals(bg.getBgjdShjg(), "02")) shbm = "街道审核 ";
+                        if (StringUtils.equals(bg.getBgmzShjg(), "02")) shbm = "民政审核 ";
+                        sbBg.append(shbm);
+                    } else {
+                        sbBg.append("终止 ");
+                    }
+
                     sbJkzk.append("终止 ");
                     r.setSqCo("2");
                     r.setBgCo("2");
@@ -815,6 +841,13 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
                     r.setSqId(sq.getId());
                     sbSq.append(dictDataList.stream().filter(d -> StringUtils.equals(sq.getStatus(), d.getDictValue()))
                             .findFirst().orElse(new SysDictData()).getDictLabel());
+                    if (ObjectUtils.isNotEmpty(sq) && StringUtils.equals(sq.getStatus(), "4")) {
+                        String shsj = "";
+                        if (StringUtils.equals(sq.getSqShjg(), "02")) shsj = " " + formatTime(sq.getSqShsj());
+                        if (StringUtils.equals(sq.getJdShjg(), "02")) shsj = " " + formatTime(sq.getJdShsj());
+                        if (StringUtils.equals(sq.getMzShjg(), "02")) shsj = " " + formatTime(sq.getMzShsj());
+                        sbSq.append(shsj);
+                    }
                     if (StringUtils.equals(sq.getStatus(), "50") || StringUtils.equals(sq.getStatus(), "4")) {
                         r.setCanSq("1");
                         r.setSqCo("1");
@@ -827,6 +860,13 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
                     r.setBgId(bg.getId());
                     sbBg.append(dictDataList.stream().filter(d -> StringUtils.equals(bg.getStatus(), d.getDictValue()))
                             .findFirst().orElse(new SysDictData()).getDictLabel());
+                    if (ObjectUtils.isNotEmpty(bg) && StringUtils.equals(bg.getStatus(), "14")) {
+                        String shsj = "";
+                        if (StringUtils.equals(bg.getBgsqShjg(), "02")) shsj = " " + formatTime(bg.getBgsqShsj());
+                        if (StringUtils.equals(bg.getBgjdShjg(), "02")) shsj = " " + formatTime(bg.getBgjdShsj());
+                        if (StringUtils.equals(bg.getBgmzShjg(), "02")) shsj = " " + formatTime(bg.getBgmzShsj());
+                        sbBg.append(shsj);
+                    }
                     if (StringUtils.equals(bg.getStatus(), "50") || StringUtils.equals(bg.getStatus(), "14")) {
                         r.setCanBg("1");
                         r.setBgCo("1");
@@ -843,6 +883,15 @@ public class GljtSqSqServiceImpl implements IGljtSqSqService
         return res;
     }
 
+    private String formatTime(String shsj) {
+        String res = "";
+        try {
+            Date date = DateUtils.dateTime("yyyyMMddHHmmss", shsj);
+            res = DateFormatUtils.format(date, "yyyy-MM-dd HH:mm");
+        } catch (Exception e) {}
+        return res;
+    }
+
     @Override
     public List<GljtUserLr> programLrJtList() {
         List<SysDictData> pcDictDataList = DictUtils.getDictCache("GL013");