Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	target/classes/main/resources/mapper/MouldEquipmentMapper.xml
#	target/classes/main/resources/mapper/MouldMapper.xml

cloud-model/src/main/resources/mapper/MouldHistoryTimeMapper.xml

@@ -37,6 +37,7 @@
                 between concat(#{startTime},' 00:00:00') and
                 concat(#{endTime},' 23:59:59')
             </if>
+            and time_cost &gt; 0
         </where>
     </select>
 </mapper>

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -126,6 +126,7 @@
             <if test="userVO.type == 0">
                 AND tbm.equipment_id is not null
                 AND tbm.state != 4
+                AND tbm.project_id is not null
             </if>
             <if test="userVO.mouleMap == -1">
                 AND tbmp.lng IS NOT NULL and tbmp.lat IS NOT NULL
@@ -172,6 +173,7 @@
             <if test="userVO.type == 0">
                 AND tbm.equipment_id is not null
                 AND tbm.state != 4
+                AND tbm.project_id is not null
             </if>
             AND tbm.project_id in
             <foreach item="item" index="index" collection="list"

target/classes/main/resources/mapper/MouldMapper.xml

@@ -69,6 +69,7 @@
         <result column="endTime" property="endTime"/>
         <result column="lastopentime" property="lastOpenTime"/>
         <result column="hillNumber" property="hillNumber"/>
+        <result column="temperature " property="temperature"/>
         <result column="ownerCompanyName" property="ownerCompanyName"/>
         <result column="companyName" property="companyName"/>
         <result column="is_maintain" property="isMaintain" />
@@ -125,6 +126,7 @@
             <if test="userVO.type == 0">
                 AND tbm.equipment_id is not null
                 AND tbm.state != 4
+                AND tbm.project_id is not null
             </if>
             <if test="userVO.mouleMap == -1">
                 AND tbmp.lng IS NOT NULL and tbmp.lat IS NOT NULL
@@ -171,6 +173,7 @@
             <if test="userVO.type == 0">
                 AND tbm.equipment_id is not null
                 AND tbm.state != 4
+                AND tbm.project_id is not null
             </if>
             AND tbm.project_id in
             <foreach item="item" index="index" collection="list"