From c06eb4d284a80dbee4a2d040046c37bf73dcfcd5 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 29 八月 2022 09:50:58 +0800
Subject: [PATCH] 风险代理确认订单后计算业绩
---
zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 8 ++++----
zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml | 27 ++++++++++++++++-----------
zhengcaioa/Services/CooperOrderService.cs | 11 ++++++-----
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 3 ++-
4 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 6226e19..73edec3 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -78,8 +78,9 @@
updateproject.Shoulitime = entity.Shoulitime;
updateproject.Songhuoer = entity.Songhuoer;
updateproject.Songhuotime = entity.Songhuotime;
- updateproject.Wangonger = entity.Wangonger;
- updateproject.Wangongtime = entity.Wangongtime;
+ //updateproject.WangongStatus = entity.WangongStatus;
+ //updateproject.Wangonger = entity.Wangonger;
+ //updateproject.Wangongtime = entity.Wangongtime;
updateproject.RecStatus = entity.RecStatus;
updateproject.Modifier = entity.Modifier;
@@ -441,7 +442,7 @@
updateproject.WangongStatus = dto.WangongStatus;
updateproject.Wangonger = dto.Wangonger;
updateproject.Wangongtime = dto.Wangongtime;
-
+ updateproject.ShouliStatus = dto.ShouliStatus;
_context.SaveChanges();
@@ -758,7 +759,7 @@
public List<CooperOrderDTO> GetList(string userid, DateTime datemin, DateTime datemax)
{
- var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax).ToList();
+ var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && ((x.OrderType != "08" && x.Createtime >= datemin && x.Createtime < datemax) || (x.OrderType == "08" && x.WangongStatus == "A" && x.Wangongtime >= datemin && x.Wangongtime < datemax)) ).ToList();
@@ -790,7 +791,7 @@
- var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax)
+ var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && ( (x.OrderType != "08" && x.Createtime >= datemin && x.Createtime < datemax) || (x.OrderType == "08" && x.WangongStatus=="A" && x.Wangongtime >= datemin && x.Wangongtime < datemax)))
join b in listCode.Where(x => x.CodeTable == "CooperOrder" && x.CodeField == "shouli_status")
on a.ShouliStatus equals b.CodeSn
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 8afe2ac..c27b2ce 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1324,9 +1324,10 @@
//dto.Id = id;
dto.Wangonger = curentuser.Id;
dto.Wangongtime = DateTime.Now;
+ dto.WangongStatus = "A";
dto.ShouliStatus = "4";
- ResultEntity resultEntity = _cooperOrderService.save(dto);
+ ResultEntity resultEntity = _cooperOrderService.Wangong(dto);
return new JsonResult(resultEntity);
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 44a2577..61b5848 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -990,7 +990,7 @@
}
catch (Exception ex)
{
-
+ zhucehuiyuanDTO.benyueshuliang = "0";
}
//var zhucehuiyuansyue = _admPieceCheckService.GetList(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();
@@ -1270,7 +1270,7 @@
var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;
//鏈棩鏁伴噺
- var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ var dingdanDTOsri = dingdanDTOsyue.Where(x =>( x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)) || (x.Wangongtime >= chauxnshijian.Date && x.Wangongtime < chauxnshijian.Date.AddDays(1)) ).ToList();
foreach (var cooperOrderDTO in dingdanDTOsri)
{
TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
@@ -2751,7 +2751,7 @@
}
catch (Exception ex)
{
-
+ zhucehuiyuanDTO.benyueshuliang = "0";
}
@@ -3026,7 +3026,7 @@
var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;
//鏈棩鏁伴噺
- var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+ var dingdanDTOsri = dingdanDTOsyue.Where(x => (x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)) || (x.Wangongtime >= chauxnshijian.Date && x.Wangongtime < chauxnshijian.Date.AddDays(1))).ToList();
foreach (var cooperOrderDTO in dingdanDTOsri)
{
TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
index 03924b8..ee001a8 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
@@ -35,7 +35,7 @@
shoulibool = false;
} else if (pageEntitiesJson[i].PageName == "鎾ゅ崟") {
chedanbool = false;
- } else if (pageEntitiesJson[i].PageName == "瀹屽伐") {
+ } else if (pageEntitiesJson[i].PageName == "纭璁㈠崟") {
wangongbool = false;
} else if (pageEntitiesJson[i].PageName == "閫佽揣") {
songhuobool = false;
@@ -55,10 +55,15 @@
{
label: '璁㈠崟鍙�', name: 'OrderNo', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
+ var color = "";
+ if (rowObject.OrderType == '08') {
+ color = "red";
+ }
+
if (rowObject.ShouliStatus == "A") {
- return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\" >" + cellvalue + "</a>";
+ return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\" ><span style='color:" + color + ";'>" + cellvalue + "</span></a>";
} else {
- return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\" >" + cellvalue + "</a>";
+ return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\" ><span style='color:" + color + ";'>" + cellvalue + "</span></a>";
}
}
@@ -111,15 +116,15 @@
}
},
{
- label: '瀹屽伐', name: 'WangongStatusName', labtype: 'txt', hidden: true, width: 60,
+ label: '纭璁㈠崟', name: 'WangongStatusName', labtype: 'txt', hidden: false, width: 60,
formatter: function (cellvalue, options, rowObject) {
- if (rowObject.ShouliStatus == '4' || rowObject.ShouliStatus == '5' ) {
+ if (rowObject.WangongStatus == 'A' ) {
return "鈭�";
} else {
- if (rowObject.ShouliStatus == '1' || rowObject.ChedanStatus == 'A') {
+ if (rowObject.ShouliStatus == '1' || rowObject.ChedanStatus == 'A' || rowObject.OrderType != '08' ) {
return "";
} else {
- return "<a onclick=\"wangong('" + rowObject.Id + "')\" >瀹屽伐</a>";
+ return "<a onclick=\"wangong('" + rowObject.Id + "')\" >纭璁㈠崟</a>";
}
}
@@ -385,7 +390,7 @@
var index = layer.open({
type: 1,銆�銆�//鍩烘湰灞傜被鍨�
icon: 0, //鍥炬爣
- content: '纭瀹屽伐锛�', //鍐呭
+ content: '纭璁㈠崟锛�', //鍐呭
shade: 0.3, //閬僵,濡傛灉鎯冲畾涔夊埆鐨勯鑹�,鍙互shade:[0.5,'#fff']
shadeClose: 1, //鏄惁鐐瑰嚮閬僵鍏抽棴
skin: 'demoClass', //鏍峰紡绫诲悕
@@ -404,16 +409,16 @@
success: function (data) {
if (data.Result) {
- toastr.success("瀹屽伐鎴愬姛");
+ toastr.success("纭璁㈠崟");
window._reloadPageData();
} else {
- toastr.error("瀹屽伐澶辫触" + data.Message);
+ toastr.error("纭璁㈠崟澶辫触" + data.Message);
}
},
error: function () {
- toastr.error("瀹屽伐澶辫触");
+ toastr.error("纭璁㈠崟澶辫触");
}
});
},
--
Gitblit v1.9.1