温红权 8 jaren geleden
bovenliggende
commit
0097d8eaca

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

@@ -483,7 +483,7 @@
          sum(cs.check_item_score) AS all_check_score ,
          (select parent_id from check_item where check_item.id = cs.check_item_id LIMIT 1) as parent_id,
          ( select name from check_item where id = (select parent_id from check_item where check_item.id = cs.check_item_id LIMIT 1)) AS NAME,
-         t.checked_person as user_id
+         cs.checked_person as user_id
          FROM
          check_task t
 
@@ -507,7 +507,7 @@
      
      <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,ci.parent_name, cs.pics ,t.checkman AS checkman_id,
-     	t.checked_person AS user_id ,t.checked_dept AS dept_id
+     	cs.checked_person AS user_id ,t.checked_dept AS dept_id
          <if test="queryType!=null and queryType==1">
            ,cst.update_time,t.id as task_id
          </if>
@@ -530,7 +530,7 @@
          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 and t.id not in <include refid="taskexclouddeleteUser"/>
      		<if test="queryType!=null and queryType==0">
-     			AND (t.checked_person = #{user_id} OR t.monitor_user_id = #{user_id}  )
+     			AND ((t.checked_person = #{user_id} and cs.checked_person = #{user_id}) OR t.monitor_user_id = #{user_id}  )
      		</if>
      		<if test="queryType!=null and queryType==1 and user_id!=null and user_id!=''">
      			AND  t.checkman = #{user_id}