From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index 683e8a6..cc2b165 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -51,6 +51,10 @@
 
 
     @Resource
+    private  AreaCode2022Mapper areaCode2022Mapper;
+
+
+    @Resource
     SmsUtil smsUtil;
 
     @Resource(name = "stringRedisTemplate")
@@ -84,8 +88,13 @@
             }
         }
         if (isAdd) {
+            AreaCode2022 areaCode2022 = areaCode2022Mapper.selectOne(new QueryWrapper<AreaCode2022>().lambda().eq(AreaCode2022::getCode, guideRepairOrder.getAreaCode()));
+            Integer grade=2;
+            if (areaCode2022.getLevel()==2){
+                grade=1;
+            }
             //自动分配业务代码开始
-            List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(transactionEvent.getDepartmentId(), guideRepairOrder.getAreaCode());
+            List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(transactionEvent.getDepartmentId(), guideRepairOrder.getAreaCode(),grade);
             if (organizationChartEntities.size() > 0) {
                 for (OrganizationChartEntity organizationChart : organizationChartEntities) {
                     departmentIds.add(organizationChart.getId().toString());
@@ -403,13 +412,13 @@
             throw new RuntimeException(e);
         }
         for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
-            List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getDepartmentId, guideRepairOrder.getGuideUserPhone()).eq(SysUser::getIsDivisionHead, 1));
+            List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getDepartmentId, guideRepairOrder.getGuideDepartmentId()).eq(SysUser::getIsDivisionHead, 1));
             if (sysUsers != null && sysUsers.size() > 0) {
                 for (SysUser sysUser : sysUsers) {
 //            transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
-//            SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
+            SysUser sysUserGuideUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
                     if (sysUser != null) {
-                        smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
+                        smsUtil.sendSmsOvertimeNew(sysUser.getPhonenumber(), sysUserGuideUser.getUserName());
                         wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
                         guideRepairOrder.setIsPush(1);
                         guideRepairOrder.setIsTimeout("2");
@@ -417,6 +426,25 @@
                     }
                 }
             }
+
+        }
+        return ResultData.success();
+    }
+
+    @Override
+    public ResultData  pushNoticeTimeRepairOrder(){
+        AutomessageSysSettings automessageSysSettings = iSysSettingsMapper.selectOne(
+                new QueryWrapper<AutomessageSysSettings>().lambda()
+                        .eq(AutomessageSysSettings::getSettingName, "系统超时基础设置"));
+        Integer timeoutRemindNum = automessageSysSettings.getTimeoutRemindNum();
+        List<GuideRepairOrder> guideRepairOrders = baseMapper.selectNoticeTime(timeoutRemindNum);
+        for (GuideRepairOrder guideRepairOrder:guideRepairOrders){
+            SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
+            if (sysUser != null) {
+                smsUtil.sendSmsOvertimeRemind(sysUser.getPhonenumber(), sysUser.getUserName());
+                guideRepairOrder.setIsRemindPush(1);
+                baseMapper.updateById(guideRepairOrder);
+            }
         }
         return ResultData.success();
     }

--
Gitblit v1.7.1