|
|
@@ -156,7 +156,7 @@ public class quarterpricenum extends Controller {
|
|
|
updateSQL.setUniqueid(row.getLong("sa_quarterpricenumid")).setSiteid(siteid);
|
|
|
updateSQL.setValue("ischeck", true);
|
|
|
updateSQL.setValue("isright", false);
|
|
|
- updateSQL.setValue("result", "原有系数:" + agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate")+ " , 待导入系数:" + row.getBigDecimal("pricerate"));
|
|
|
+ updateSQL.setValue("result", "原有系数:" + (agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate").compareTo(BigDecimal.ZERO)==0?1:agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate"))+ " , 待导入系数:" + row.getBigDecimal("pricerate"));
|
|
|
updateSQL.setValue("status", "已检验");
|
|
|
updateSQL.setDateValue("changedate");
|
|
|
updateSQL.setDateValue("operatedate");
|
|
|
@@ -167,7 +167,7 @@ public class quarterpricenum extends Controller {
|
|
|
updateSQL.setUniqueid(row.getLong("sa_quarterpricenumid")).setSiteid(siteid);
|
|
|
updateSQL.setValue("ischeck", true);
|
|
|
updateSQL.setValue("isright", true);
|
|
|
- updateSQL.setValue("result", "原有系数:" + agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate")+ " , 待导入系数:" + row.getBigDecimal("pricerate"));
|
|
|
+ updateSQL.setValue("result", "原有系数:" + (agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate").compareTo(BigDecimal.ZERO)==0?1:agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate"))+ " , 待导入系数:" + row.getBigDecimal("pricerate"));
|
|
|
updateSQL.setValue("status", "已检验");
|
|
|
updateSQL.setDateValue("changedate");
|
|
|
updateSQL.setDateValue("operatedate");
|