Merge branch 'master' of http://192.168.65.152:3000/Jone/hzims-back

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java

@@ -1078,6 +1078,10 @@ public class RealTargetServiceImpl implements RealTargetService {
 		if(System.currentTimeMillis() - date.getTime() > 30 * 60 * 1000L){
 			return 0.0;
 		}
+		// 状态限制
+		if(fields.get(0).getQ() != 0){
+			return 0.0;
+		}
 		return Double.parseDouble(fields.get(0).getValue());
 	}
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml

@@ -191,7 +191,7 @@
         LEFT JOIN HZ_ST_EX_TASK_USER b on t.ID=b.TASK_ID and b.IS_DELETED=0
         where t.IS_DELETED=0
         <if test="task.userId != null ">
-            and u.USER_ID=#{task.userId}
+            and b.USER_ID=#{task.userId}
         </if>
         <include refid="getTaskListSql"></include>
         GROUP BY t.id
@@ -209,7 +209,7 @@
             LEFT JOIN HZ_ST_EX_TASK_USER b on t.ID=b.TASK_ID and b.IS_DELETED=0
         where t.IS_DELETED=0
         <if test="task.userId != null ">
-            and u.USER_ID=#{task.userId}
+            and b.USER_ID=#{task.userId}
         </if>
         <include refid="getTaskListSql"></include>
         GROUP BY t.id