From a575747440faec5d8949baa316752698744cd90b Mon Sep 17 00:00:00 2001
From: Shaun Chyxion <chyxion@163.com>
Date: Sun, 7 Jan 2018 20:11:19 +0800
Subject: [PATCH] week goal bug fixes

---
 .../main/resources/mybatis/mappers/week-goal-mapper.xml   | 8 ++++----
 web/app/templates/components/form-content.hbs             | 4 ++--
 web/run                                                   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/mapper/src/main/resources/mybatis/mappers/week-goal-mapper.xml b/server/mapper/src/main/resources/mybatis/mappers/week-goal-mapper.xml
index ea4cc4d..72d3f27 100644
--- a/server/mapper/src/main/resources/mybatis/mappers/week-goal-mapper.xml
+++ b/server/mapper/src/main/resources/mybatis/mappers/week-goal-mapper.xml
@@ -55,7 +55,7 @@
 		where year = #{year}
 		<if test="now != null">
 		<![CDATA[
-			and date_end < now()
+			and date_start < now()
 		]]>
 		</if>
 	</select>
@@ -68,12 +68,12 @@
         from crm_week_goal
         where year = year(now())
         <![CDATA[
-			and date_end < now()
+			and date_start < now()
 		]]>
         group by user_id
         union
         select user_id,
-            year(now()) -1 year,
+            year(now()) - 1 year,
             sum(goal) goal,
             sum(done) done
         from crm_week_goal
@@ -81,7 +81,7 @@
         group by user_id
         union
         select user_id,
-            year(now()) -2 year,
+            year(now()) - 2 year,
             sum(goal) goal,
             sum(done) done
         from crm_week_goal
diff --git a/web/app/templates/components/form-content.hbs b/web/app/templates/components/form-content.hbs
index 4af8092..8c11cd0 100644
--- a/web/app/templates/components/form-content.hbs
+++ b/web/app/templates/components/form-content.hbs
@@ -1,4 +1,4 @@
-<div class="row widget-box">
+<div class="row widget-box no-border">
     <div class="widget-body">
         <div class="widget-main">
             <form class="form-horizontal">
@@ -6,4 +6,4 @@
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web/run b/web/run
index fd7d4d7..822122f 100755
--- a/web/run
+++ b/web/run
@@ -3,7 +3,7 @@
 rm -rf tmp dist
 
 if [ "$1" = "prod" ]; then
-    ember s -p 4201 -pr http://116.62.189.211/
+    ember s -p 4201 -pr http://116.62.189.211/crm-api
 else
     ember s -pr http://127.0.0.1:8088/
 fi