From 1e9fe530b299f9bf1004a983be6fea266b4e8ddc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 03 十一月 2023 15:02:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/PriOnline2.java | 11 +++++++++++
src/main/java/com/zy/crm/manager/controller/PlanController.java | 3 +++
src/main/webapp/static/js/priOnline2/priOnline.js | 13 +++++++------
src/main/java/com/zy/crm/manager/utils/SmsUtils.java | 2 +-
src/main/webapp/views/login.html | 6 +++---
5 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 08a2175..a7062dd 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -710,6 +710,9 @@
List<Long> typeList = new ArrayList<>();
List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
+ if (type==1){
+ planTypes = planTypeService.selectList(new EntityWrapper<PlanType>());
+ }
for (PlanType planType : planTypes){
typeList.add(planType.getId());
}
diff --git a/src/main/java/com/zy/crm/manager/entity/PriOnline2.java b/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
index b1ec503..e106de5 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
@@ -8,7 +8,9 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.PlanService;
+import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -223,6 +225,15 @@
return null;
}
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
+
public String getUpdateUserId$() {
UserService userService = SpringUtils.getBean(UserService.class);
User user = userService.selectById(this.updateUserId);
diff --git a/src/main/java/com/zy/crm/manager/utils/SmsUtils.java b/src/main/java/com/zy/crm/manager/utils/SmsUtils.java
index 2a16160..c3a9b58 100644
--- a/src/main/java/com/zy/crm/manager/utils/SmsUtils.java
+++ b/src/main/java/com/zy/crm/manager/utils/SmsUtils.java
@@ -64,7 +64,7 @@
headers.put("Authorization", "APPCODE " + APPCODE);
param.put("templateId", "M6F3C81FE3");
- param.put("receive", phone);
+ param.put("receive", "13083813523");
param.put("tag", code);
String response = new HttpHandler.Builder()
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index e520e86..a3840db 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -104,9 +104,7 @@
hide: false
}
, {field: 'itemId', align: 'center', title: '瑙勫垝鍗曞彿', hide: true}
- , {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿'}
- , {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿'}
- , {field: 'status$', align: 'center', title: '鐘舵��'}
+ , {field: 'status$', align: 'center', title: '鐘舵��',hide : false}
// ,{field: 'memberId$', align: 'center',title: ''}
, {
field: 'settle$',
@@ -116,9 +114,12 @@
event: 'more',
hide: false
}
- , {field: 'user$', align: 'center', title: '涓氬姟鍛�'}
- , {field: 'updateUserId$', align: 'center', title: '鏇存柊浜哄憳'}
- , {field: 'checkDataStatus$', align: 'center', title: '鎶ヤ环鏁版嵁'}
+ , {field: 'user$', align: 'center', title: '涓氬姟鍛�',hide : false}
+ , {field: 'deptId$', align: 'center', title: '閮ㄩ棬',hide : true}
+ , {field: 'checkDataStatus$', align: 'center', title: '鎶ヤ环鏁版嵁',hide : false}
+ , {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿',hide : true}
+ , {field: 'updateUserId$', align: 'center', title: '鏇存柊浜哄憳',hide : false}
+ , {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿',hide : false}
, {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 350}
]],
request: {
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 650be15..9604867 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -189,9 +189,9 @@
<div id="getCodeTime"></div>
</div>
</div>
-<!-- <div style="text-align: right;">-->
-<!-- <button onclick="switchLogin('password')">瀵嗙爜鐧诲綍</button>-->
-<!-- </div>-->
+ <div style="text-align: right;">
+ <button onclick="switchLogin('password')">瀵嗙爜鐧诲綍</button>
+ </div>
<div class="container-login100-form-btn p-t-10">
<button id="smsLogin" class="login100-form-btn login-btn">Login</button>
</div>
--
Gitblit v1.9.1