From c7aab1af5656fd4409d5b5b1c0556fc64fb6617e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 21 四月 2025 11:54:06 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 9d58b27..6391e29 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -303,8 +303,7 @@
             WxPlatNotice wxPlatNotice = new WxPlatNotice();
             wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                     wxNoticeConfigMapper,visits,
-                    Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload,
-                    systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+                    Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload, 
                     Arrays.asList(visits.getOpenid().split(","))
             );
         }
@@ -342,7 +341,6 @@
                 wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                         wxNoticeConfigMapper,visits,
                         Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload,
-                        systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                         Arrays.asList(systemUser.getOpenid().split(","))
                 );
             }
@@ -569,7 +567,7 @@
                 .eq(ApproveParam::getLevel,Constants.ONE)
                 .eq(ApproveParam::getMemberType,Constants.ZERO)
                 .last("limit 1"));
-         return  Objects.isNull(approveParam)?null:approveParam.getId();
+        return  Objects.isNull(approveParam)?null:approveParam.getId();
     }
 
 
@@ -1681,13 +1679,33 @@
                     new UpdateWrapper<Notices>().lambda()
                             .set(Notices::getEditDate,new Date())
                             .set(Notices::getInfo,"鎵嬪姩鍙栨秷")
-//                        .set(Notices::getStatus,Constants.ONE)
-                            .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
+                            .setSql(" param4 = user_id ")
+                            .set(Notices::getStatus,Constants.ONE)
+                            .set(Notices::getParam2,Constants.ONE)//鏍囪宸插鐞�
                             .eq(Notices::getStatus,Constants.ZERO)
                             .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
                             .eq(Notices::getObjId,visits.getId())
-                            .eq(Notices::getObjType,Constants.equalsInteger(visits.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
+                            .eq(Notices::getObjType,!Constants.equalsInteger(visits.getType(),Constants.TWO)?
+                                    Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting)
             );
+
+            Approve approve = new Approve();
+            approve.setCreateDate(new Date());
+            approve.setIsdeleted(Constants.ZERO);
+            approve.setRemark("鎵嬪姩鍙栨秷");
+            approve.setChekorId(visits.getEditor());
+            approve.setTitle("鍙栨秷棰勭害");
+            approve.setStatus(Constants.THREE);
+            approve.setStatusInfo("鎵嬪姩鍙栨秷");
+            approve.setObjId(visits.getId());
+            approve.setLevel(9999);
+            approve.setApproveType(2);
+            approve.setDriverParam(Constants.ZERO);
+            approve.setAddrParam(Constants.ZERO);
+            approve.setObjType(visits.getType());
+            approve.setType(Constants.ZERO);
+            approve.setCheckDate(new Date());
+            approveMapper.insert(approve);
         }
 
         visitsMapper.update(null,updateWrapper);
@@ -1965,6 +1983,7 @@
         List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
                 .eq(Visits::getStatus,Constants.VisitStatus.signin)
                 .eq(Visits::getSendTimeOutNotice,Constants.ZERO)
+                .eq(Visits::getIsdeleted,Constants.ZERO)
                 .apply("   now() >=  DATE_ADD(ENDTIME,INTERVAL -"+times+" MINUTE)   ")
         );
         Integer visitTimeCount = 0;
@@ -2041,6 +2060,22 @@
                 !Constants.equalsInteger(s.getType(),Constants.TWO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
         );
 
+        Approve approve = new Approve();
+        approve.setCreateDate(new Date());
+        approve.setIsdeleted(Constants.ZERO);
+        approve.setRemark("绯荤粺鑷姩鍙栨秷");
+        approve.setTitle("鍙栨秷棰勭害");
+        approve.setStatus(Constants.THREE);
+        approve.setStatusInfo("瓒呮椂鑷姩鍙栨秷");
+        approve.setObjId(s.getId());
+        approve.setLevel(9999);
+        approve.setApproveType(2);
+        approve.setDriverParam(Constants.ZERO);
+        approve.setAddrParam(Constants.ZERO);
+        approve.setObjType(s.getType());
+        approve.setType(Constants.ZERO);
+        approve.setCheckDate(new Date());
+        approveMapper.insert(approve);
 
 //        //鏇存柊瀹℃壒涓殑璁板綍涓哄彇娑�
 //        approveMapper.update(null,
@@ -2087,8 +2122,10 @@
             noticesJoinMapper.update(null,
                     new UpdateWrapper<Notices>().lambda()
                             .set(Notices::getEditDate,new Date())
-                            .set(Notices::getInfo,info)
-                            .set(Notices::getParam2,Constants.FOUR)//宸插彇娑�
+                            .set(Notices::getInfo,"鑷姩鍙栨秷")
+                            .setSql(" param4 = user_id ")
+                            .set(Notices::getStatus,Constants.ONE)
+                            .set(Notices::getParam2,Constants.ONE)//宸插彇娑�
                             .eq(Notices::getStatus,Constants.ZERO)
                             .eq(Notices::getParam2,Constants.ZERO)//寰呭鐞�
                             .eq(Notices::getObjId,objId)

--
Gitblit v1.9.3