From b1dc9988b9587add132a01faa6bc09e162fe1491 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 七月 2024 21:39:38 +0800
Subject: [PATCH] 1、开关阀报中增加农户关联； 2、工作报中增加农户关联； 3、取水口损失流量完善； 4、实现取水日取水量统计。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
index cb6bb55..25c4d9c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
@@ -411,7 +411,19 @@
return BaseResponseUtils.buildErrorMsg(SellResultCode.CANCEL_FAIL_WRITE_CANCELL_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ //return BaseResponseUtils.buildSuccess(true) ;
+
+ cardNumS = String.valueOf(cardNum).trim();
+ if(cardNumS.substring(0,2).equals("10")) {
+ cardNumS = cardNumS.substring(6, 12) + cardNumS.substring(13);
+ }
+ cardNum = Long.valueOf(cardNumS);
+
+ Map map_response = new HashMap();
+ map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map_response.put("orderNumber", rec);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response) ;
}
/**
@@ -507,7 +519,18 @@
return BaseResponseUtils.buildErrorMsg(SellResultCode.LOSS_FAIL_WRITE_LOSS_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ //return BaseResponseUtils.buildSuccess(true) ;
+ cardNumS = String.valueOf(cardNum).trim();
+ if(cardNumS.substring(0,2).equals("10")) {
+ cardNumS = cardNumS.substring(6, 12) + cardNumS.substring(13);
+ }
+ cardNum = Long.valueOf(cardNumS);
+
+ Map map_response = new HashMap();
+ map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map_response.put("orderNumber", rec);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response) ;
}
/**
@@ -598,7 +621,19 @@
return BaseResponseUtils.buildErrorMsg(SellResultCode.REVERSAL_FAIL_WRITE_REVERSAL_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ //return BaseResponseUtils.buildSuccess(true) ;
+ cardNumS = String.valueOf(cardNum).trim();
+ if(cardNumS.substring(0,2).equals("10")) {
+ cardNumS = cardNumS.substring(6, 12) + cardNumS.substring(13);
+ }
+ cardNum = Long.valueOf(cardNumS);
+
+ Map map_response = new HashMap();
+ map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map_response.put("orderNumber", rec);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response) ;
+
}
/**
@@ -778,7 +813,19 @@
return BaseResponseUtils.buildErrorMsg(SellResultCode.UNLOCK_FAIL_WRITE_UNLOCK_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ //return BaseResponseUtils.buildSuccess(true) ;
+ cardNumS = String.valueOf(cardNum).trim();
+ if(cardNumS.substring(0,2).equals("10")) {
+ cardNumS = cardNumS.substring(6, 12) + cardNumS.substring(13);
+ }
+ cardNum = Long.valueOf(cardNumS);
+
+ Map map_response = new HashMap();
+ map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+ map_response.put("orderNumber", rec);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response) ;
+
}
/**
--
Gitblit v1.8.0