weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wms费用科目bug修改;nc推送修改;

Browse Source
This commit is contained in:
王奎兴
2026-04-13 15:14:48 +08:00
parent 0a9e127d64
commit 5849be8e8f
7 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java
+10 -10
View File
@@ -247,8 +247,8 @@ public class ContractManageApplicationService {
BigDecimal price = subjectAndPriceReturn.getPrice();
BigDecimal num = subjectAndPriceReturn.getNum();
String chargingId = subjectAndPriceReturn.getChargingId();
Integer isFee = subjectAndPriceReturn.getIsFee();
if (isFee != null && isFee == 1) {
String isFee = subjectAndPriceReturn.getIsFee();
if (isFee != null && "1".equals(isFee)) {
billingFormula = billingFormula.replace(chargingId, price.toEngineeringString());
} else {
billingFormula = billingFormula.replace(chargingId, num.toEngineeringString());
@@ -306,10 +306,10 @@ public class ContractManageApplicationService {
Map<String, Object> stringObjectMap1 = preSetRulesList.get(0);
for (Map<String, Object> stringObjectMap : billingParamsList) {
String fieldsName = (String) stringObjectMap.get("fieldsName");
Integer isShow = (Integer) stringObjectMap.get("isShow");
Integer isFee = (Integer) stringObjectMap.get("isFee");
Integer isPush = (Integer) stringObjectMap.get("isPush");
if (isFee==1) {
String isShow = (String) stringObjectMap.get("isShow");
String isFee = (String) stringObjectMap.get("isFee");
String isPush = (String) stringObjectMap.get("isPush");
if ("1".equals(isFee)) {
Integer sort = (Integer) stringObjectMap.get("sort");
String chargingId = (String) stringObjectMap.get("chargingId");
String fields = (String) stringObjectMap.get("fields");
@@ -379,10 +379,10 @@ public class ContractManageApplicationService {
List<Map<String, Object>> billingParamsList = JSON.parseObject(billingParamsJson, new TypeReference<List<Map<String, Object>>>() {});
for (Map<String, Object> stringObjectMap : billingParamsList) {
String fieldsName = (String) stringObjectMap.get("fieldsName");
Integer isShow = (Integer) stringObjectMap.get("isShow");
Integer isFee = (Integer) stringObjectMap.get("isFee");
Integer isPush = (Integer) stringObjectMap.get("isPush");
if (isShow==1) {
String isShow = (String) stringObjectMap.get("isShow");
String isFee = (String) stringObjectMap.get("isFee");
String isPush = (String) stringObjectMap.get("isPush");
if ("1".equals(isShow)) {
String chargingId = (String) stringObjectMap.get("chargingId");
String fields = (String) stringObjectMap.get("fields");
SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn();
mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/contractManage/SubjectAndPriceReturn.java
+3 -3
View File
@@ -13,9 +13,9 @@ public class SubjectAndPriceReturn {
private Long billingRulesId;
private String fields;
private BigDecimal num;
private Integer isShow;
private Integer isPush;
private Integer isFee;
private String isShow;
private String isPush;
private String isFee;
private String subjectCode;
private String subjectName;
private String serviceItemsCode;