|
@@ -84,7 +84,9 @@ public class IncomeProofBillExPlugin extends AbstractHcssBaseFormPlugin {
|
|
|
BigDecimal monthCount = salaryDetailObj.getBigDecimal("monthCount");
|
|
BigDecimal monthCount = salaryDetailObj.getBigDecimal("monthCount");
|
|
|
BigDecimal monthlyAmount = amount.divide(monthCount, 2, BigDecimal.ROUND_HALF_UP);
|
|
BigDecimal monthlyAmount = amount.divide(monthCount, 2, BigDecimal.ROUND_HALF_UP);
|
|
|
//赋值
|
|
//赋值
|
|
|
- dealIncomeInfo(amount, monthlyAmount);
|
|
|
|
|
|
|
+ if(amount.compareTo(BigDecimal.ZERO) > 0 && monthCount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
|
|
+ dealIncomeInfo(amount.setScale(2), monthlyAmount);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -106,16 +108,18 @@ public class IncomeProofBillExPlugin extends AbstractHcssBaseFormPlugin {
|
|
|
List<String> customItems = getCustomItems();
|
|
List<String> customItems = getCustomItems();
|
|
|
IDataModel model = this.getModel();
|
|
IDataModel model = this.getModel();
|
|
|
int rowCount = model.getEntryRowCount("entryentity");
|
|
int rowCount = model.getEntryRowCount("entryentity");
|
|
|
- String regex = "[^0-9.]";
|
|
|
|
|
for(int i = 0; i < rowCount; i++) {
|
|
for(int i = 0; i < rowCount; i++) {
|
|
|
- String revenueFieldNum = model.getValue("frevenuefieldid.number", i).toString();
|
|
|
|
|
- if(revenueFieldNum.equals(customItems.get(0))){
|
|
|
|
|
- model.setValue("calvalue", amount.toString(), i);
|
|
|
|
|
- model.setValue("checkvalue", amount.toString(), i);
|
|
|
|
|
- }
|
|
|
|
|
- if(revenueFieldNum.equals(customItems.get(1))){
|
|
|
|
|
- model.setValue("calvalue", monthlyAmount.toString(), i);
|
|
|
|
|
- model.setValue("checkvalue", monthlyAmount.toString(), i);
|
|
|
|
|
|
|
+ if(model.getValue("revenuefield", i) != null){
|
|
|
|
|
+ DynamicObject revenuefieldDyn = (DynamicObject)model.getValue("revenuefield", i);
|
|
|
|
|
+ String revenueFieldNum = revenuefieldDyn.getString("number");
|
|
|
|
|
+ if(revenueFieldNum.equals(customItems.get(0))){
|
|
|
|
|
+ model.setValue("calvalue", amount.toString(), i);
|
|
|
|
|
+ model.setValue("checkvalue", amount.toString(), i);
|
|
|
|
|
+ }
|
|
|
|
|
+ if(revenueFieldNum.equals(customItems.get(1))){
|
|
|
|
|
+ model.setValue("calvalue", monthlyAmount.toString(), i);
|
|
|
|
|
+ model.setValue("checkvalue", monthlyAmount.toString(), i);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|