From 5b6529bd37a7191b674a64c760dcb5f21ab534f1 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 20 三月 2026 16:42:59 +0800
Subject: [PATCH] 质押还款提醒逻辑调整

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
index e5dcdc8..efe8be5 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolPR.java
@@ -1,17 +1,25 @@
 package com.fzzy.igds;
 
 import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
 import com.bstek.dorado.data.provider.Page;
+import com.fzzy.common.constant.BizTypeEnum;
+import com.fzzy.igds.data.BaseResp;
 import com.fzzy.igds.data.IgdsBaseParam;
-import com.fzzy.igds.data.NoticeParam;
 import com.fzzy.igds.data.PatrolSuperData;
 import com.fzzy.igds.domain.Dept;
-import com.fzzy.igds.domain.InoutNoticeIn;
 import com.fzzy.igds.domain.Patrol;
+import com.fzzy.igds.domain.PatrolConf;
 import com.fzzy.igds.service.CoreDeptService;
 import com.fzzy.igds.service.PatrolService;
 import com.fzzy.igds.utils.DateUtil;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
 import java.util.*;
 
@@ -28,6 +36,7 @@
     @Resource
     private CoreDeptService coreDeptService;
 
+    /*-------------------宸℃鐩戠缁熻淇℃伅--------------------*/
     /**
      * patrolPR#getData 宸℃鐩戠缁熻
      *
@@ -46,7 +55,7 @@
         //搴撳尯杞崲
         Map<String, PatrolSuperData> map = new HashMap<>();
         for (Dept dept : deptList) {
-            map.put(dept.getId(), new PatrolSuperData(dept.getCompanyId(), dept.getId()));
+            map.put(dept.getId(), new PatrolSuperData(dept.getId().substring(0,(dept.getId().length()-3)), dept.getId()));
         }
 
         List<Patrol> weekList = patrolService.getWeekList();
@@ -54,7 +63,7 @@
         if(null != weekList && weekList.size() > 0){
             PatrolSuperData patrolSuperData;
             Date start = DateUtil.getCurZero(DateUtil.getNewByDay(new Date(), -1));  //鏄ㄥぉ闆剁偣闆跺垎
-            Date end = DateUtil.getCurZero(new Date());                         //浠婂ぉ闆剁偣闆跺垎
+            Date end = DateUtil.getCurZero(new Date());                           //浠婂ぉ闆剁偣闆跺垎
             for (Patrol patrol : weekList) {
                 patrolSuperData = map.get(patrol.getDeptId());
 
@@ -69,14 +78,22 @@
 
                 //鏄ㄥぉ缁熻
                 if(patrol.getCreateTime().after(start) && patrol.getCreateTime().before(end)){
-                    patrolSuperData.setWeekNum(patrolSuperData.getWeekNum() + 1);
+                    patrolSuperData.setYesterdayNum(patrolSuperData.getYesterdayNum() + 1);
                 }
             }
         }
 
-        return new ArrayList<>(map.values());
+        ArrayList<PatrolSuperData> list = new ArrayList<>(map.values());
+        Collections.sort(list, new Comparator<PatrolSuperData>() {
+            @Override
+            public int compare(PatrolSuperData o1, PatrolSuperData o2) {
+                return o1.getDeptId().compareTo(o2.getDeptId());
+            }
+        });
+        return list;
     }
 
+    /*-------------------鐢靛瓙宸℃洿璁板綍涓昏〃淇℃伅--------------------*/
     /**
      * patrolPR#pagePatrolData 鑾峰彇宸℃璁板綍淇℃伅
      *
@@ -98,4 +115,48 @@
         page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
     }
 
+
+
+    /*-------------------鐢靛瓙宸℃洿閰嶇疆淇℃伅--------------------*/
+
+    /**
+     * patrolPR#listPatrolConf
+     * 閾惰鍒楄〃
+     */
+    @DataProvider
+    public List<PatrolConf> listPatrolConf(IgdsBaseParam param) {
+        return patrolService.listPatrolConf(param);
+    }
+
+    /**
+     * 淇濆瓨/鏇存柊
+     * patrolPR#saveUpdateConf
+     * @param bank
+     * @return
+     */
+    @Transactional
+    @DataResolver
+    public BaseResp saveUpdateConf(PatrolConf bank){
+
+        if(StringUtils.isEmpty(bank.getId())){
+            return patrolService.addPatrolConf(bank);
+        }else {
+            return patrolService.updatePatrolConf(bank);
+        }
+    }
+
+
+    /**
+     * 鍒犻櫎
+     * patrolPR#deletePatrolConf
+     * @param bank
+     * @return
+     */
+    @Expose
+    @Log(title = "宸℃閰嶇疆", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SECURITY)
+    public BaseResp deletePatrolConf(PatrolConf bank){
+        if(StringUtils.isNotEmpty(bank.getId())) return patrolService.deletePatrolConf(bank);
+        return BaseResp.success();
+    }
+
 }

--
Gitblit v1.9.3