ss

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBean.java

@@ -38,6 +38,8 @@ public class StatisticsBean {
     
     private String name ;
     
+    private String parent_name ;
+    
     private int score;
     
     private Integer item_id ;
@@ -119,6 +121,8 @@ public class StatisticsBean {
     
     private List<Integer> position_ids;
     
+    private Integer score_flag  ;
+    
     // 比较大小 1 小 ， -1 大
     public int compareTo(StatisticsBean o2){
     	if(this.getChecked_num()!=0 && o2.getChecked_num()!=0){

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

@@ -284,10 +284,10 @@
      </select>
      
      <select id="selectOneCheckedDetailInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-     	SELECT t.name AS check_task_name , t.start_time AS start_date , t.end_time AS end_date,cs.check_item_score AS score , ci.name AS name, cs.pics ,t.checkman AS checkman_id,
+     	SELECT t.name AS check_task_name , t.start_time AS start_date , t.end_time AS end_date,cs.check_item_score AS score , ci.name AS name,ci.parent_name, cs.pics ,t.checkman AS checkman_id,
      	t.checked_person AS user_id ,t.checked_dept AS dept_id FROM check_task t 
-     		INNER JOIN check_score cs ON t.id = cs.task_id 
-     		LEFT JOIN check_item ci ON ci.id = cs.check_item_id  
+     		LEFT JOIN check_score cs ON t.id = cs.task_id 
+     		LEFT JOIN (SELECT ci.* ,cp.name AS parent_name FROM check_item  ci LEFT JOIN check_item cp ON ci.parent_id = cp.id) ci ON ci.id = cs.check_item_id  
      		where   t.check_status !=22
      		<if test="queryType!=null and queryType==0">
      			AND   t.checked_person = #{user_id}
@@ -304,6 +304,12 @@
 			<if test="end_date !=null and queryType == 0">
 				AND t.end_time &lt;= #{end_date}
 			</if>
+			<if test="score_flag!=null and score_flag == 1">
+				AND cs.score IS NOT NULL
+			</if>
+			<if test="score_flag!=null and score_flag == 0">
+				AND cs.score IS  NULL
+			</if>
      </select>
      
       <select id="selectCheckManInfo" parameterType="com.xintong.visualinspection.bean.CheckmanStatisticsBean" resultType="com.xintong.visualinspection.bean.CheckmanStatisticsBean">