ufo / ufo-platform · Commits

Go to a project

Authored by Lixiaodi
Commit 784bd0f9ee024929073223a9e03f6866d1e88338 1 parent 8f5115c4

bug修改

Inline Side-by-side
Showing 3 changed files with 7 additions and 3 deletions
@@ -241,6 +241,9 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService{ @@ -241,6 +241,9 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService{
241 List<Map<String, Object>> countInfo = appraiseOrderMapper.selectCountInfo(orderCode); 241 List<Map<String, Object>> countInfo = appraiseOrderMapper.selectCountInfo(orderCode);
242 int count = 0; 242 int count = 0;
243 for (Map<String, Object> record : countInfo) { 243 for (Map<String, Object> record : countInfo) {
  244 + if (record.get("status") == null) {
  245 + continue;
  246 + }
244 int c = ((Number) record.get("num")).intValue(); 247 int c = ((Number) record.get("num")).intValue();
245 count += c; 248 count += c;
246 if (record.get("status").toString().equals(Integer.toString(AppraiseOrderStatus.JUDGE_PASS.getCode()))) { 249 if (record.get("status").toString().equals(Integer.toString(AppraiseOrderStatus.JUDGE_PASS.getCode()))) {
@@ -279,7 +279,7 @@ @@ -279,7 +279,7 @@
279 url: contextPath + "/buyerOrder/queryExpressList", 279 url: contextPath + "/buyerOrder/queryExpressList",
280 method: 'POST', 280 method: 'POST',
281 queryParams: { 281 queryParams: {
282 - orderCode: orderCode, 282 + orderCode: pOrderCode,
283 expressTypeStr: "1" 283 expressTypeStr: "1"
284 }, 284 },
285 loadFilter: function (data) { 285 loadFilter: function (data) {
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
44 </div> 44 </div>
45 45
46 <script type="text/javascript"> 46 <script type="text/javascript">
  47 + var pOrderCode;
47 var orderCode; 48 var orderCode;
48 var uid; 49 var uid;
49 function viewOrder(orderCode) { 50 function viewOrder(orderCode) {
@@ -164,7 +165,7 @@ @@ -164,7 +165,7 @@
164 $(this).myDatagrid("getPanel").find("a[role='view']").linkbutton({ 165 $(this).myDatagrid("getPanel").find("a[role='view']").linkbutton({
165 iconCls: "icon-edit", 166 iconCls: "icon-edit",
166 onClick: function () { 167 onClick: function () {
167 - orderCode = $(this).attr("dataId"); 168 + pOrderCode = orderCode = $(this).attr("dataId");
168 uid = $(this).attr("uid"); 169 uid = $(this).attr("uid");
169 viewDetail(); 170 viewDetail();
170 } 171 }
@@ -172,7 +173,7 @@ @@ -172,7 +173,7 @@
172 $(this).myDatagrid("getPanel").find("a[role='cancel']").linkbutton({ 173 $(this).myDatagrid("getPanel").find("a[role='cancel']").linkbutton({
173 iconCls: "icon-edit", 174 iconCls: "icon-edit",
174 onClick: function () { 175 onClick: function () {
175 - orderCode = $(this).attr("dataId"); 176 + pOrderCode = orderCode = $(this).attr("dataId");
176 cancelParent(orderCode); 177 cancelParent(orderCode);
177 } 178 }
178 }); 179 });