From 7ab5760a2657ef9fdae3ab919a474075315c103c Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期五, 26 四月 2024 13:40:28 +0800
Subject: [PATCH] 修改地推重复规则
---
CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs | 10 ++++++++++
CoreCms.Net.Web.Admin/wwwroot/views/liao.js | 16 ++++++++++++++--
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html | 7 +++++++
CoreCms.Net.Web.WebApi/Controllers/OfflineDistributorController.cs | 1 +
4 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs b/CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs
index daa9c59..1523bf6 100644
--- a/CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs
+++ b/CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs
@@ -23,6 +23,7 @@
using CoreCms.Net.Model.Entities.baifenbingfa.Promote.OffLineDistributor;
using CoreCms.Net.Model.ViewModels.Basics;
using CoreCms.Net.Model.ViewModels.UI;
+using NPOI.POIFS.Macros;
using SqlSugar;
@@ -66,6 +67,15 @@
/// <returns></returns>
public async Task<AdminUiCallBack> UserInsertAsync(OfflineDistributor entity)
{
+ var b= await _unitOfWork.GetDbClient().Queryable<OfflineDistributor>().Where(x=>x.CollectionTime==entity.CollectionTime&&x.DealerName==entity.DealerName&&x.Adder==entity.Adder).CountAsync();
+ if(b>0)
+ return new AdminUiCallBack()
+ {
+ code = 1,
+ msg = "璇峰嬁閲嶅鎻愪氦鏁版嵁"
+
+ };
+
entity.createTime = DateTime.Now;
entity.createBy = $"{_contextUser.Name}";
var bol = await _unitOfWork.GetDbClient().InsertNav(entity).Include(x => x.meetings).ExecuteCommandAsync();
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
index 2421e14..beb40d1 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html
@@ -245,6 +245,13 @@
title: "淇℃伅鏀堕泦鏃堕棿",
width: 130,
sort: false,
+ templet: function (d) {
+ if(isDateTimeString(d.collectionTime)){
+ return util.toDateString(d.collectionTime, "yyyy-MM-dd");
+ }else{
+ return "";
+ }
+ }
},
{ field: "category", title: "绫诲埆", sort: false, width: 105 },
{
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
index 94fb7bd..9aca275 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
@@ -3,7 +3,7 @@
* @Author: 灏忛渚�
* @Date: 2024-03-01 09:11:24
* @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-10 13:37:35
+ * @LastEditTime: 2024-04-26 13:25:48
* Copyright: 2024 MinTinge CO.,LTD. All Rights Reserved.
* @Descripttion: 鍐欏叆浣犵殑鎻忚堪
*/
@@ -233,4 +233,16 @@
: ("00" + o[k]).substr(("" + o[k]).length)
);
return fmt;
- };
\ No newline at end of file
+ };
+
+/**
+ * 妫�鏌ョ粰瀹氱殑瀛楃涓叉槸鍚︿负鏃ユ湡鏃堕棿鏍煎紡
+ * @param {string} str - 闇�瑕佹鏌ョ殑瀛楃涓�
+ * @return {boolean} 杩斿洖涓�涓竷灏斿�硷紝鎸囩ず瀛楃涓叉槸鍚︾鍚堟棩鏈熸椂闂存牸寮�
+ */
+function isDateTimeString(str) {
+ // 瀹氫箟鏃ユ湡鏃堕棿鐨勬鍒欒〃杈惧紡妯″紡
+ const dateTimePattern = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔ā寮忔祴璇曞瓧绗︿覆
+ return dateTimePattern.test(str);
+}
\ No newline at end of file
diff --git a/CoreCms.Net.Web.WebApi/Controllers/OfflineDistributorController.cs b/CoreCms.Net.Web.WebApi/Controllers/OfflineDistributorController.cs
index 6d8ac48..c606a8e 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/OfflineDistributorController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/OfflineDistributorController.cs
@@ -50,6 +50,7 @@
public async Task<WebApiCallBack> addOfflineDistributor([FromBody] addOfflineDistributorIn param)
{
+
var item = new OfflineDistributor
{
Adder = param.Adder,
--
Gitblit v1.9.1