缓存设置调整业绩目标查询调整

src/rest/openapi/restcontroller/wechatapp/tagents/Tagents.java

@@ -386,10 +386,14 @@ public class Tagents extends Controller {
              */
             for (Row amountRow : amountRows) {
                 double ftaskamount = yearrow.getDouble("ftaskamount");
-                if ("Äê".equals(amountRow.getString("ftype")) && ftaskamount > 0) {
+                if ("Äê".equals(amountRow.getString("ftype"))) {
                     double forderamount = amountRow.getDouble("forderamount");
                     yearrow.put("forderamount", forderamount);
-                    yearrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                    if (ftaskamount > 0) {
+                        yearrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                    } else {
+                        yearrow.put("fcompletionrate", 100);
+                    }
                     break;
                 }
             }
@@ -432,10 +436,14 @@ public class Tagents extends Controller {
                  */
                 for (Row amountRow : amountRows) {
                     double ftaskamount = quarterrow.getDouble("ftaskamount");
-                    if ("¼¾".equals(amountRow.getString("ftype")) && quarter.equals(amountRow.getString("number")) && ftaskamount > 0) {
+                    if ("¼¾".equals(amountRow.getString("ftype")) && quarter.equals(amountRow.getString("number"))) {
                         double forderamount = amountRow.getDouble("forderamount");
                         quarterrow.put("forderamount", forderamount);
-                        quarterrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                        if (ftaskamount > 0) {
+                            quarterrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                        } else {
+                            quarterrow.put("fcompletionrate", 100);
+                        }
                         break;
                     }
                 }
@@ -476,11 +484,14 @@ public class Tagents extends Controller {
                  */
                 for (Row amountRow : amountRows) {
                     double ftaskamount = monthrow.getDouble("ftaskamount");
-                    if ("ÔÂ".equals(amountRow.getString("ftype")) && month.equals(amountRow.getString("number")) && ftaskamount > 0) {
+                    if ("ÔÂ".equals(amountRow.getString("ftype")) && month.equals(amountRow.getString("number"))) {
                         double forderamount = amountRow.getDouble("forderamount");
                         monthrow.put("forderamount", forderamount);
-                        monthrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
-
+                        if (ftaskamount > 0) {
+                            monthrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                        } else {
+                            monthrow.put("fcompletionrate", 100);
+                        }
                         break;
                     }
                 }

src/rest/openapi/restcontroller/wechatapp/tsaler/Tsaler.java

@@ -117,10 +117,14 @@ public class Tsaler extends Controller {
              */
             for (Row amountRow : amountRows) {
                 double ftaskamount = yearrow.getDouble("ftaskamount");
-                if ("Äê".equals(amountRow.getString("ftype")) && ftaskamount > 0) {
+                if ("Äê".equals(amountRow.getString("ftype"))) {
                     double forderamount = amountRow.getDouble("forderamount");
                     yearrow.put("forderamount", forderamount);
-                    yearrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                    if (ftaskamount > 0) {
+                        yearrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                    } else {
+                        yearrow.put("fcompletionrate", 100);
+                    }
                     break;
                 }
             }
@@ -162,10 +166,14 @@ public class Tsaler extends Controller {
                  */
                 for (Row amountRow : amountRows) {
                     double ftaskamount = quarterrow.getDouble("ftaskamount");
-                    if ("¼¾".equals(amountRow.getString("ftype")) && quarter.equals(amountRow.getString("number")) && ftaskamount > 0) {
+                    if ("¼¾".equals(amountRow.getString("ftype")) && quarter.equals(amountRow.getString("number"))) {
                         double forderamount = amountRow.getDouble("forderamount");
                         quarterrow.put("forderamount", forderamount);
-                        quarterrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                        if (ftaskamount > 0) {
+                            quarterrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                        } else {
+                            quarterrow.put("fcompletionrate", 100);
+                        }
                         break;
                     }
                 }
@@ -206,11 +214,14 @@ public class Tsaler extends Controller {
                  */
                 for (Row amountRow : amountRows) {
                     double ftaskamount = monthrow.getDouble("ftaskamount");
-                    if ("ÔÂ".equals(amountRow.getString("ftype")) && month.equals(amountRow.getString("number")) && ftaskamount > 0) {
+                    if ("ÔÂ".equals(amountRow.getString("ftype")) && month.equals(amountRow.getString("number"))) {
                         double forderamount = amountRow.getDouble("forderamount");
                         monthrow.put("forderamount", forderamount);
-                        monthrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
-
+                        if (ftaskamount > 0) {
+                            monthrow.put("fcompletionrate", Math.mul(Math.div(forderamount, ftaskamount, 2), 100));
+                        } else {
+                            monthrow.put("fcompletionrate", 100);
+                        }
                         break;
                     }
                 }

src/rest/openapi/restcontroller/wechatapp/tshoppingcart/Tshoppingcart.java

@@ -106,7 +106,7 @@ public class Tshoppingcart extends Controller {
             row.put("pics", picmap.get(fitemno));
         }
         titemset.close();
-        return getReturnObject_suc_page(rows, false, 0).toString();
+        return getReturnObject_suc_page(rows, true, 0).toString();
     }
 
     /**
@@ -138,7 +138,7 @@ public class Tshoppingcart extends Controller {
         factory.addParameter_SQL("where", where);
         Rows rows = drpConnect.runSqlQuery(factory.getSQL());
 
-        return getReturnObject_suc(rows.get(0), false).toString();
+        return getReturnObject_suc(rows.get(0), true).toString();
     }