移动系统liao
2024-04-26 7ab5760a2657ef9fdae3ab919a474075315c103c
修改地推重复规则
4个文件已修改
34 ■■■■■ 已修改文件
CoreCms.Net.Services/baifenbingfa/OfflineDistributorServices.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/offlinedistributor/index.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreCms.Net.Web.Admin/wwwroot/views/liao.js 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreCms.Net.Web.WebApi/Controllers/OfflineDistributorController.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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();
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 },
              {
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;
  };
  };
/**
 * 检查给定的字符串是否为日期时间格式
 * @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);
}
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,