价格系数导入优化

src/custom/restcontroller/webmanage/sale/item/quarterpricenum.java

@@ -146,9 +146,21 @@ public class quarterpricenum extends Controller {
                 updateSQL.setValue("isright", false);
                 updateSQL.setValue("result", "价格系数不能小于0");
             } else {
-                Rows checkrows = dbConnect.runSqlQuery("select * from sa_quarterpricenum where status='已更新' and sa_agentsid='" + row.getString("sa_agentsid") + "' and `year`='" + row.getInteger("year") + "' and quarter='" + row.getInteger("quarter") + "' and pricerate=" + row.getBigDecimal("pricerate").doubleValue() + " order by changedate desc limit 1");
-                updateSQL.setValue("isright", checkrows.isEmpty());
-                updateSQL.setValue("result", "原有系数：" + (checkrows.get(0).getBigDecimal("pricerate").compareTo(BigDecimal.ZERO) == 0 ? 1 : checkrows.get(0).getBigDecimal("pricerate")) + " , 待导入系数：" + row.getBigDecimal("pricerate"));
+                Rows checkrows = dbConnect.runSqlQuery("select * from sa_quarterpricenum where status='已更新' and sa_agentsid='" + row.getString("sa_agentsid") + "' order by changedate desc limit 1");
+                if (checkrows.isEmpty()) {
+                    updateSQL.setValue("isright", true);
+                    updateSQL.setValue("result", "原有系数：1 , 待导入系数：" + row.getBigDecimal("pricerate"));
+                } else {
+                    int year = checkrows.get(0).getInteger("year");
+                    int quarter = checkrows.get(0).getInteger("quarter");
+                    BigDecimal pricerate = checkrows.get(0).getBigDecimal("pricerate");
+                    if (row.getInteger("year") == year && row.getInteger("quarter") == quarter && pricerate.compareTo(row.getBigDecimal("pricerate")) == 0) {
+                        updateSQL.setValue("isright", false);
+                    } else {
+                        updateSQL.setValue("isright", true);
+                    }
+                    updateSQL.setValue("result", "原有系数：" + (pricerate.compareTo(BigDecimal.ZERO) == 0 ? 1 : pricerate) + " , 待导入系数：" + row.getBigDecimal("pricerate"));
+                }
             }
             sqlList.add(updateSQL.getSQL());
         }