修改个人统计bug

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/StatisticsDao.java

@@ -32,7 +32,7 @@ public interface StatisticsDao  {
 	
 	public List<StatisticsBean> selectCheckedItemScoreInfo(StatisticsBean obj);
 	
-	public List<StatisticsBean> selectOneCheckedInfo(StatisticsBean obj);
+	public List<StatisticsBean> selectOneCheckedInfoData(StatisticsBean obj);
 	
 	public List<StatisticsBean> selectOneCheckedItemInfo(StatisticsBean obj);
 	

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -353,9 +353,9 @@
 
 
     <!--包含扣分-->
-    <sql id="selectOneAllCheckedInfo">
+    <sql id="selectOneAllCheckedInfoData">
         SELECT
-        check_num_t.checked_num , check_num_t.mth, IFNULL(checked_score_t.checkd_all_score ,0) as checkd_all_score, check_num_t.checked_person,check_num_t.checked_dept
+        check_num_t.checked_num , check_num_t.mth, IFNULL(checked_score_t.checkd_all_score ,0) as all_check_score, check_num_t.checked_person,check_num_t.checked_dept
         FROM
 
         (
@@ -369,7 +369,7 @@
         t.checked_person IS NOT NULL
         AND t.check_status != 22 and t.id not in <include refid="taskexclouddeleteUser"/>
         <if test="start_date !=null">
-            AND t.start_time >= #{start_date}
+            AND t.start_time &gt;= #{start_date}
         </if>
         <if test="end_date !=null">
             AND t.end_time &lt; #{end_date}
@@ -389,7 +389,7 @@
         ( select * From check_task t
         where t.check_status != 22  and t.id not in <include refid="taskexclouddeleteUser"/>
         <if test="start_date !=null">
-            AND t.start_time >= #{start_date}
+            AND t.start_time &gt;= #{start_date}
         </if>
         <if test="end_date !=null">
             AND t.end_time &lt; #{end_date}
@@ -419,7 +419,7 @@
 				( select * From check_task t 
 						where t.check_status != 22  and t.id not in <include refid="taskexclouddeleteUser"/>
 						<if test="start_date !=null">
-							AND t.start_time >= #{start_date}
+							AND t.start_time &gt;= #{start_date}
 						</if>
 						<if test="end_date !=null">
 							AND t.end_time &lt; #{end_date}
@@ -443,7 +443,7 @@
 				t.checked_person IS NOT NULL
 			AND t.check_status != 22 and t.id not in <include refid="taskexclouddeleteUser"/>
 			<if test="start_date !=null">
-				AND t.start_time >= #{start_date}
+				AND t.start_time &gt;= #{start_date}
 			</if>
 			<if test="end_date !=null">
 				AND t.end_time &lt; #{end_date}
@@ -456,8 +456,8 @@
 		AND check_num_t.mth = checked_score_t.mth
      </sql>
      
-     <select id="selectOneCheckedInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-     	SELECT * FROM ( <include refid="selectOneAllCheckedInfo"/> ) t
+     <select id="selectOneCheckedInfoData" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
+     	SELECT * FROM ( <include refid="selectOneAllCheckedInfoData"/> ) t
      </select>
      
      <select id="selectOneCheckedItemInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -1244,7 +1244,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	@Override
 	public List<StatisticsBean> getOneFSCheckedInfo(StatisticsBean obj) {
 
-        List<StatisticsBean> datas =  statisticsDao.selectOneCheckedInfo(obj);
+        List<StatisticsBean> datas =  statisticsDao.selectOneCheckedInfoData(obj);
         for (StatisticsBean d:
                 datas) {
             Map<Long,StatisticsBo> p =  getMasterNumAndScore(d.getMth());