选择设备列表接口 过滤条件工序=工序名称 and 设备状态=在用 and 主设备=1

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentAccount.java

@@ -128,10 +128,10 @@ public class TEquipmentAccount implements Serializable {
     private String Zs;
 
     /**
-     * 状态,分为在用1和报废0
+     * 状态,在用和报废
      */
     @TableField("Sbzt")
-    private Boolean Sbzt;
+    private String Sbzt;
 
     /**
      * 备注

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentAccountServiceImpl.java

@@ -109,6 +109,8 @@ public class TEquipmentAccountServiceImpl extends ServiceImpl<TEquipmentAccountM
 		if(StringUtils.isNotBlank(ProcessesName)){
 			teaWrapper.eq("ProcessesName", ProcessesName);
 		}
+		teaWrapper.eq("Sbzt", "在用");
+		teaWrapper.eq("Zsb", 1);
 		List<TEquipmentAccount> list = equipmentAccountMapper.selectList(teaWrapper);
 		Rcode.NOT_FOUND.assertIsFalse(list== null || list.size()<=0);
 		return R.ok(list);

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TEquipmentRunMapper.xml

@@ -13,12 +13,17 @@
 
     <sql id="where">
         <where>
+            and tea.Zsb = 1
             <if test="params.Txr != null and params.Txr != ''">
                 and ter.Txr = #{params.Txr}
             </if>
             <if test="params.EquipmentName != null and params.EquipmentName != ''">
                 and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
             </if>
+            <if test="params.ProcessesName != null and params.ProcessesName != ''">
+                and tea.ProcessesName = #{params.ProcessesName}
+            </if>
+
         </where>
     </sql>
 </mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TEquipmentTroubleMapper.xml

@@ -18,6 +18,9 @@
             <if test="params.EquipmentName != null and params.EquipmentName != ''">
                 and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
             </if>
+            <if test="params.ProcessesName != null and params.ProcessesName != ''">
+                and tea.ProcessesName = #{params.ProcessesName}
+            </if>
         </where>
     </sql>
 </mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TMineStopeMapper.xml

@@ -4,4 +4,25 @@
     <select id="getStopeName" resultType="cn.wise.sc.acquisition.business.entity.TMineStope">
         select StopeName,StepName,BlastAreaName from T_Mine_Stope
     </select>
+
+
+    <select id="getStopeNewList" resultType="cn.wise.sc.acquisition.business.entity.TMineStope">
+        select Uid,StopeName,StepName,BlastAreaName,IsUsing,AddDate FROM T_Mine_Stope a
+        where Isusing =1 and 
+                not exists (
+                select StopeName , StepName , BlastAreaName  from T_Processes_BlastDesign_Hole b
+                where (a.StopeName=b.StopeName and a.StepName=b.StepName and a.BlastAreaName=b.BlastAreaName)
+                <if test="designDate != null and designDate != ''">
+                    and Convert(varchar(100),DesignDate,23) <![CDATA[ <> ]]> #{designDate}
+                </if>
+                group by  StopeName, StepName, BlastAreaName
+                ) 
+        order by AddDate desc
+    </select>
+
+
+
+
+
+
 </mapper>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TWeightMapper.xml

@@ -13,4 +13,31 @@
         </where>
     </select>
 
+
+    <select id="getWeightCount" resultType="cn.wise.sc.acquisition.business.model.vo.TWeightCountVo">
+        SELECT CONVERT(varchar(100), Rq, 23) AS Rq, TruckID, TruckName,
+        SUM(Mz)/1000 AS Zmz, SUM(Pz)/1000 AS Zpz, SUM(Jz)/1000 AS Zjz, SUM(Cs) AS Zcs,
+        SUM( CASE  when Kslx ='黏土' THEN Mz ELSE 0 END)/1000 as Ntmz ,
+        SUM( CASE  when Kslx ='黏土' THEN Pz ELSE 0 END)/1000 as Ntpz ,
+        SUM( CASE  when Kslx ='黏土' THEN Jz ELSE 0 END)/1000 as Ntjz ,
+        SUM( CASE  when Kslx ='黏土' THEN Cs ELSE 0 END) as Ntcs ,
+        SUM( CASE  when Kslx ='矿石' THEN Mz ELSE 0 END)/1000 as Ksmz ,
+        SUM( CASE  when Kslx ='矿石' THEN Pz ELSE 0 END)/1000 as Kspz ,
+        SUM( CASE  when Kslx ='矿石' THEN Jz ELSE 0 END)/1000 as Ksjz ,
+        SUM( CASE  when Kslx ='矿石' THEN Cs ELSE 0 END) as Kscs
+        FROM  V_WeightRock
+        where Jz > 0
+        <if test="params.TruckID != null and params.TruckID != ''">
+            and TruckID like concat('%', #{params.TruckID}, '%')
+        </if>
+        <if test="params.startDate != null and params.startDate != ''">
+            and Rq >= #{params.startDate}
+        </if>
+        <if test="params.endDate != null and params.endDate != ''">
+            and Rq &lt; #{params.endDate}
+        </if>
+        GROUP BY CONVERT(varchar(100), Rq, 23), TruckID, TruckName
+    </select>
+
+
 </mapper>