提交

username@email.com

2023-05-05 69a8bb4807c77d05b5b43328acbf4ad26fb5fc68

提交

 zhengcaioa/DTO/CooperatecustomCustomerDTO.cs

@@ -88,6 +88,8 @@
        public DateTime? Ywjltime { get; set; }

        public int Guanliankehushu { get; set; }
        public string Kuaidistatus { get; set; }
        public DateTime? Kuaiditime { get; set; }

    }

@@ -107,5 +109,6 @@
        public string Shifouweixin { get; set; }

        public string HuiyuanId { get; set; }
        public string Kuaidistatus { get; set; }
    }
}

 zhengcaioa/DTO/IntentionCustomerDTO.cs

@@ -71,6 +71,8 @@
        public DateTime? Ywjltime { get; set; }

        public int Guanliankehushu { get; set; }
        public string Kuaidistatus { get; set; }
        public DateTime? Kuaiditime { get; set; }
    }

    public class IntentionCustomerDTOSearch : SearchEntity
@@ -102,5 +104,6 @@
        public string Customertype { get; set; }

        public string Visittimes { get; set; }
        public string Kuaidistatus { get; set; }
    }
}

 zhengcaioa/Model/CooperatecustomCustomer.cs

@@ -52,5 +52,7 @@
        public int? Taocanjianshu { get; set; }

        public DateTime? Ywjltime { get; set; }
        public string Kuaidistatus { get; set; }
        public DateTime? Kuaiditime { get; set; }
    }
}

 zhengcaioa/Model/IntentionCustomer.cs

@@ -52,5 +52,7 @@
        public string HuiyuanId { get; set; }

        public DateTime? Ywjltime { get; set; }
        public string Kuaidistatus { get; set; }
        public DateTime? Kuaiditime { get; set; }
    }
}

 zhengcaioa/Model/zhengcaioaContext.cs

@@ -2735,6 +2735,14 @@
                    .HasColumnType("datetime")
                    .HasColumnName("weixintime");

                entity.Property(e => e.Kuaidistatus)
                    .HasMaxLength(1)
                    .HasColumnName("kuaidistatus");

                entity.Property(e => e.Kuaiditime)
                    .HasColumnType("datetime")
                    .HasColumnName("kuaiditime");

                entity.Property(e => e.Ywjltime)
                    .HasColumnType("datetime")
                    .HasColumnName("ywjltime");
@@ -4297,6 +4305,14 @@
                    .HasColumnType("datetime")
                    .HasColumnName("weixintime");

                entity.Property(e => e.Kuaidistatus)
                  .HasMaxLength(1)
                  .HasColumnName("kuaidistatus");

                entity.Property(e => e.Kuaiditime)
                    .HasColumnType("datetime")
                    .HasColumnName("kuaiditime");

                entity.Property(e => e.Ywjltime)
                  .HasColumnType("datetime")
                  .HasColumnName("ywjltime");

 zhengcaioa/Services/CooperatecustomCustomerService.cs

@@ -375,6 +375,8 @@
                             ShenyushouxinName = a.Shenyushouxin.HasValue ? a.Shenyushouxin.Value.ToString("f2") : "",
                             Taocanjianshu = a.Taocanjianshu ?? 0,
                             Customertype = "合作客户",
                             Kuaidistatus = a.Kuaidistatus,
                             Kuaiditime = a.Kuaiditime,
                         }
                        );

@@ -392,6 +394,19 @@

            }

            if (!string.IsNullOrWhiteSpace(searchEntity.Kuaidistatus))
            {
                if (searchEntity.Kuaidistatus == "A")
                {
                    query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim());
                }
                else
                {
                    query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim() || a.Kuaidistatus == null);
                }

            }

            //if (searchEntity.totalrows == 0)
            searchEntity.totalrows = query.Count();
            data.Heji1 = Math.Round(query.Sum(x => x.Yufukuan) ?? 0, 2);

 zhengcaioa/Services/IntentionCustomerService.cs

@@ -352,6 +352,8 @@
                                 Zuijinzhuizongtime = a.Zuijinzhuizongtime,
                                 ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
                             Visittimes = lll.Visittimes,
                             Kuaidistatus = a.Kuaidistatus,
                             Kuaiditime = a.Kuaiditime,
                         }
                    );

@@ -360,6 +362,19 @@
                query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim());
            }

            if (!string.IsNullOrWhiteSpace(searchEntity.Kuaidistatus))
            {
                if (searchEntity.Kuaidistatus == "A")
                {
                    query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim());
                }
                else
                {
                    query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim() || a.Kuaidistatus == null);
                }
                
            }

            if (!string.IsNullOrWhiteSpace(searchEntity.Ywjl))
            {
                if(searchEntity.Ywjl != "11111")

 zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs

@@ -526,7 +526,7 @@
                "建档时间","客户来源","行业分类","客户类型","客户名称","客户单位","联系人微信"
                ,"客户地址","网址","联系人座机","联系人手机","联系人QQ","联系人邮箱",

                "联系人2姓名","联系人2手机","联系人2QQ"
                "联系人2姓名","联系人2手机","联系人2QQ","访问次数"

            };
            foreach(var columnTitle in columnTitles)
@@ -575,7 +575,8 @@
                cell.Value = item.YwTel;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.YwQq;

                cell = worksheet.Cells[x, y++];
                cell.Value = item.Visittimes;


            }

 zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml

@@ -80,6 +80,7 @@
            { label: '客户单位', name: 'Name', labtype: 'txt', hidden: false },
            { label: '建档时间', name: 'Createtime', labtype: 'datearea', hidden: false },
            { label: '是否加微信', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
            { label: '是否发快递', name: 'Kuaidistatus', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },

        ];
        var _pageAdd = function () {

 zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml

@@ -90,7 +90,7 @@
            { label: '是否加微信', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
            { label: '是否录入电话', name: 'ShifouDianhua', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
            { label: '访问次数大于', name: 'Visittimes', labtype: 'txt', hidden: false },
            
            { label: '是否发快递', name: 'Kuaidistatus', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
        ];
        var _pageAdd = function () {
            OpenWindow("新增意向客户", "98%", "100%", "/IntentionCustomer/Edit/");
@@ -256,16 +256,23 @@
            var City = $("#PBSCity").val();
            var AreaId = $("#PBSAreaId").val();
            var Name = $("#PBSName").val();

            var Createtime = $("#PBSCreatetime").val();
            var Createtimestart = $("#PBSCreatetimestart").val();
            var Createtimeend = $("#PBSCreatetimeend").val();
            var Createtime = "";
            if (Createtimestart != null && Createtimestart != "") {
                Createtime = Createtimestart + "|" + Createtimeend;
            }
            var Creater = $("#PBSCreater").val();
            var Shifouweixin = $("#PBSShifouweixin").val();
            var ShifouDianhua = $("#PBSShifouDianhua").val();
            var Visittimes = $("#PBSVisittimes").val();
            var Kuaidistatus = $("#PBSKuaidistatus").val();




            var url = "/IntentionCustomer/GetDaochu?Khly=" + Khly + "&Hyfl=" + Hyfl + "&Khlx=" + Khlx + "&Ywjl=" + Ywjl + "&Sheng=" + Sheng + "&City=" + City + "&AreaId=" + AreaId + "&Name=" + Name + "&Createtime=" + Createtime
                + "&Creater=" + Creater + "&Shifouweixin=" + Shifouweixin;
                + "&Creater=" + Creater + "&Shifouweixin=" + Shifouweixin + "&ShifouDianhua=" + ShifouDianhua + "&Visittimes=" + Visittimes + "&Kuaidistatus=" + Kuaidistatus;
            var me = window.open(url, "导出");  //打开新窗口