|
|
@@ -15,10 +15,12 @@ namespace Util
|
|
|
public class PrizeDo
|
|
|
{
|
|
|
public static string batchNo = "";
|
|
|
+ public static string publicStep = "";
|
|
|
//发奖入口
|
|
|
public static void sendPrize(int prizeInId, string content)
|
|
|
{
|
|
|
batchNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Function.get_Random(3);
|
|
|
+ publicStep = "";
|
|
|
string priObjString = prizeInSet(prizeInId);
|
|
|
if(!string.IsNullOrEmpty(priObjString))
|
|
|
{
|
|
|
@@ -579,10 +581,8 @@ namespace Util
|
|
|
bool op = true;
|
|
|
int index = 0;
|
|
|
loopAmount = 0;
|
|
|
- Dictionary<string, object> topStepDic = new Dictionary<string, object>(); //递归日志数据
|
|
|
while(!string.IsNullOrEmpty(objId) && objId != "0" && op)
|
|
|
{
|
|
|
- List<Dictionary<string, string>> logStepDics = new List<Dictionary<string, string>>(); //条件日志数据
|
|
|
List<QueryCondition> condiDic = loopCondition(projectId, sub, objId, content);
|
|
|
if(condiDic.Count > 0)
|
|
|
{
|
|
|
@@ -911,7 +911,7 @@ namespace Util
|
|
|
}
|
|
|
}
|
|
|
logStepDic.Add("状态", passFlag ? "通过" : "未通过");
|
|
|
- logStepDics.Add(logStepDic);
|
|
|
+ setLogStep(sub.id, Newtonsoft.Json.JsonConvert.SerializeObject(logStepDic));
|
|
|
}
|
|
|
}
|
|
|
if(loopSet.conditionMode == "all" && passCount == allCount) prizeFlag = true;
|
|
|
@@ -930,7 +930,6 @@ namespace Util
|
|
|
op = afterPrizeFlag;
|
|
|
}
|
|
|
}
|
|
|
- topStepDic.Add(objId, logStepDics);
|
|
|
var parent = db.Ado.GetScalar("select " + parentField + " from " + tableEnName + " where " + sonField + "=" + objId);
|
|
|
if(parent != null)
|
|
|
{
|
|
|
@@ -942,7 +941,6 @@ namespace Util
|
|
|
}
|
|
|
index += 1;
|
|
|
}
|
|
|
- setLogStep(sub.id, Newtonsoft.Json.JsonConvert.SerializeObject(topStepDic));
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -1944,7 +1942,7 @@ namespace Util
|
|
|
var log = logService.GetFirst(m => m.batchNo == batchNo && m.listId == listId);
|
|
|
if(log != null)
|
|
|
{
|
|
|
- log.stepList = step;
|
|
|
+ log.stepList += step;
|
|
|
logService.Update(log);
|
|
|
}
|
|
|
}
|
