From 369ba17fa25dc33a8ea492fda300f49ce1a1452b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 14:15:41 +0800
Subject: [PATCH] #优化
---
src/main/webapp/views/companyTarget/personTarget.html | 10 +++++
src/main/webapp/static/js/cstmr/cstmr.js | 2
src/main/java/com/zy/crm/manager/controller/CompanyPostController.java | 6 ++
src/main/webapp/static/js/companyTarget/personTarget.js | 3 +
src/main/webapp/views/home/dashboard.html | 36 +++++++++++++----
src/main/java/com/zy/crm/manager/entity/CompanyTarget.java | 35 +++++++++++++++++
src/main/resources/mapper/CstmrMapper.xml | 4 ++
src/main/webapp/static/js/companyTarget/companyTarget.js | 2 +
src/main/webapp/views/companyTarget/companyTarget.html | 10 +++++
9 files changed, 97 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/CompanyPostController.java b/src/main/java/com/zy/crm/manager/controller/CompanyPostController.java
index e6cd8d8..28f4392 100644
--- a/src/main/java/com/zy/crm/manager/controller/CompanyPostController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CompanyPostController.java
@@ -44,6 +44,7 @@
convert(param, wrapper);
allLike(CompanyPost.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("update_time", false);
return R.ok(companyPostService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -63,8 +64,11 @@
@RequestMapping(value = "/companyPost/add/auth")
@ManagerAuth(memo = "娣诲姞鍏憡")
public R add(CompanyPost companyPost) {
- companyPost.setCreateTime(new Date());
+ Date now = new Date();
+ companyPost.setCreateTime(now);
companyPost.setUserId(getUserId());
+ companyPost.setUpdateTime(now);
+ companyPost.setUpdateUserId(getUserId());
companyPostService.insert(companyPost);
return R.ok();
}
diff --git a/src/main/java/com/zy/crm/manager/entity/CompanyTarget.java b/src/main/java/com/zy/crm/manager/entity/CompanyTarget.java
index 7b6ebb8..49c6a49 100644
--- a/src/main/java/com/zy/crm/manager/entity/CompanyTarget.java
+++ b/src/main/java/com/zy/crm/manager/entity/CompanyTarget.java
@@ -5,7 +5,10 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
import com.zy.crm.manager.utils.WordUtils;
+import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.UserService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -86,6 +89,16 @@
// null //
// );
+ public String getStaff$(){
+ if (Cools.isEmpty(this.staff)) return "鍏徃";
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.staff);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return "";
+ }
+
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
@@ -100,5 +113,27 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public String getComplete$(){
+ int completes =0;
+ int targets = 0;
+ if (!Cools.isEmpty(this.complete)){
+ completes = Integer.parseInt(this.complete);
+ }
+ if (!Cools.isEmpty(this.target)){
+ targets = Integer.parseInt(this.target);
+ }
+ if (completes==0 && targets==0){
+ return "鏈煡";
+ }
+ if (completes<targets){
+ return "鏈畬鎴�";
+ }else if (completes>targets){
+ return "瓒呴瀹屾垚";
+ }else {
+ return "瀹屾垚";
+ }
+
+ }
+
}
diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml
index c0d62fc..1087f55 100644
--- a/src/main/resources/mapper/CstmrMapper.xml
+++ b/src/main/resources/mapper/CstmrMapper.xml
@@ -164,6 +164,8 @@
(
user_id = #{userId}
or
+ director = #{userId}
+ or
mc.id in
(
select
@@ -328,6 +330,8 @@
(
user_id = #{userId}
or
+ director = #{userId}
+ or
mc.id in
(
select
diff --git a/src/main/webapp/static/js/companyTarget/companyTarget.js b/src/main/webapp/static/js/companyTarget/companyTarget.js
index 4cedee4..967feba 100644
--- a/src/main/webapp/static/js/companyTarget/companyTarget.js
+++ b/src/main/webapp/static/js/companyTarget/companyTarget.js
@@ -27,6 +27,8 @@
// ,{field: 'id', align: 'center',title: '#ID'}
, {field: 'year', align: 'center', title: '骞村害'}
, {field: 'target', align: 'center', title: '鐩爣',templet: '#targetTmp'}
+ , {field: 'complete', align: 'center', title: '瀹為檯',templet: '#completeTmp'}
+ , {field: 'complete$', align: 'center', title: '瀹屾垚鐘跺喌'}
, {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 400}
]],
diff --git a/src/main/webapp/static/js/companyTarget/personTarget.js b/src/main/webapp/static/js/companyTarget/personTarget.js
index 16526fb..80c1152 100644
--- a/src/main/webapp/static/js/companyTarget/personTarget.js
+++ b/src/main/webapp/static/js/companyTarget/personTarget.js
@@ -25,8 +25,11 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: '#ID'}
+ , {field: 'staff$', align: 'center', title: '浜哄憳'}
, {field: 'year', align: 'center', title: '骞村害'}
, {field: 'target', align: 'center', title: '鐩爣',templet: '#targetTmp'}
+ , {field: 'complete', align: 'center', title: '瀹為檯',templet: '#completeTmp'}
+ , {field: 'complete$', align: 'center', title: '瀹屾垚鐘跺喌'}
, {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 400}
]],
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 5532b2e..1ee16b3 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -142,7 +142,7 @@
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
,{field: 'name', align: 'left',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 350}
- ,{field: 'simple', align: 'left',title: '瀹㈡埛绠�绉�', hide: false}
+ ,{field: 'simple', align: 'left',title: '瀹㈡埛绠�绉�', hide: true}
,{field: 'uuid', align: 'left',title: '瀹㈡埛浠ｅ彿'}
,{field: 'addr', align: 'left',title: '璇︾粏鍦板潃', templet:function(d){return emptyShow(d.addr)}}
,{field: 'tel', align: 'left',title: '鐢佃瘽', templet:function(d){return emptyShow(d.tel)}}
diff --git a/src/main/webapp/views/companyTarget/companyTarget.html b/src/main/webapp/views/companyTarget/companyTarget.html
index bfc2813..cc06d7f 100644
--- a/src/main/webapp/views/companyTarget/companyTarget.html
+++ b/src/main/webapp/views/companyTarget/companyTarget.html
@@ -64,6 +64,16 @@
{{d.target}}涓囧厓
</script>
+<script type="text/html" id="completeTmp">
+ {{# if( d.complete === '0'){ }}
+ 0
+ {{# }else if(d.complete === null){ }}
+ 0
+ {{# }else { }}
+ {{d.complete}}涓囧厓
+ {{# } }}
+</script>
+
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/companyTarget/personTarget.html b/src/main/webapp/views/companyTarget/personTarget.html
index a1bda98..270747b 100644
--- a/src/main/webapp/views/companyTarget/personTarget.html
+++ b/src/main/webapp/views/companyTarget/personTarget.html
@@ -64,6 +64,16 @@
{{d.target}}涓囧厓
</script>
+<script type="text/html" id="completeTmp">
+ {{# if( d.complete === '0'){ }}
+ 0
+ {{# }else if(d.complete === null){ }}
+ 0
+ {{# }else { }}
+ {{d.complete}}涓囧厓
+ {{# } }}
+</script>
+
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index 3cd2869..29a7548 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -45,7 +45,7 @@
<div class="layui-col-xs12 layui-col-md8">
<div class="layui-card" style="">
- <div class="layui-card-header">娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
+ <div class="layui-card-header">鍥㈤槦娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
<div class="layui-card-body" style="padding-bottom: 20px;">
<div class="layui-row">
<div>鍥㈤槦鏁版嵁</div>
@@ -72,7 +72,12 @@
<div class="numberInfoValue"><span id="companyRate">92</span>%</div>
</div>
</div>
- <div class="layui-row" style="margin-top: 50px;">
+ </div>
+ </div>
+ <div class="layui-card" style="">
+ <div class="layui-card-header">涓汉娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
+ <div class="layui-card-body" style="padding-bottom: 20px;">
+ <div class="layui-row">
<div>涓汉鏁版嵁</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
<div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
@@ -101,7 +106,7 @@
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
<div class="numberInfoSubTitle">璺熻釜椤圭洰鏁伴噺</div>
<div class="numberInfoValue">
- <a href="#" id="openProgress"><span id="progressCount">124</span><em class="numberInfoSuffix">涓�</em></a>
+ <a href="#" id="openProgress" style="color: #1E9FFF"><span id="progressCount">124</span><em class="numberInfoSuffix">涓�</em></a>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
@@ -113,7 +118,7 @@
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
<div class="numberInfoSubTitle">鎴愪氦椤圭洰鏁伴噺</div>
<div class="numberInfoValue">
- <a href="#" id="openSuccess"><span id="successCount">121</span><em class="numberInfoSuffix">涓�</em></a>
+ <a href="#" id="openSuccess" style="color: #1E9FFF"><span id="successCount">121</span><em class="numberInfoSuffix">涓�</em></a>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
@@ -131,7 +136,7 @@
<div class="layui-card" style="height: 403px;overflow: hidden;">
<div class="layui-card-header" style="display: flex;justify-content: space-between;">
<div>鍏徃鍏憡</div>
- <div><a href="#" id="openCompanyPost">鏌ョ湅鏇村</a></div>
+ <div><a href="#" id="openCompanyPost" style="color: #1E9FFF">鏌ョ湅鏇村</a></div>
</div>
<div class="layui-card-body" id="companyPostId">
</div>
@@ -327,11 +332,24 @@
success: function (res) {
let data = res.data.records
for (var i = 0; i < data.length; i++) {
+ // let div = "<div style='margin-top: 10px;display: flex;justify-content: space-between;'>";
+ // div += '<div><span class="layui-badge-dot layui-bg-green" style="margin-right: 10px;"></span>'
+ // div += data[i].content + "</div>"
+ // div += "<div>" + data[i].updateTime$ + "</div>"
+ // div += "</div>"
let div = "<div style='margin-top: 10px;display: flex;justify-content: space-between;'>";
- div += '<div><span class="layui-badge-dot layui-bg-green" style="margin-right: 10px;"></span>'
- div += data[i].content + "</div>"
- div += "<div>" + data[i].createTime$ + "</div>"
- div += "</div>"
+
+ div += "<div style='width: 79%;'>";
+ div += "<span class='layui-badge-dot layui-bg-green' style='margin-right: 10px;'></span>";
+ div += data[i].content;
+ div += "</div>";
+
+ div += "<div style='width: 19%;'>";
+ div += data[i].updateTime$;
+ div += "</div>";
+
+ div += "</div>";
+
$("#companyPostId").append(div)
}
--
Gitblit v1.9.1