修改料控管理

shiwan/admin/src/main/java/com/huimv/admin/repo/secondary/MachineControlRepository.java

@@ -46,19 +46,19 @@ public interface MachineControlRepository extends JpaRepository<MachineControlEn
             "    ON zs.`ID` = jq.`ZSID`\n" +
             "  JOIN da_lkpz lk\n" +
             "    ON jq.`JQID` = lk.`jqid`\n" +
-            "WHERE ZSMC LIKE CONCAT('%',?3,'%') LIMIT ?1,?2")
+            "WHERE zs.MCID = 11 and zs.ZFBZ = 0 and jq.ZFBZ = 0 and ZSMC LIKE CONCAT('%',?3,'%') LIMIT ?1,?2")
     List<Map> getMachineControlInfo(Integer start, Integer pageSize, String keyword);
 
 //    @Query(nativeQuery = true,value = "SELECT zs.`ZSMC`,lk.* FROM da_zsda  zs JOIN da_jqda  jq ON zs.`ID`=jq.`ZSID` JOIN da_lkpz lk ON jq.`JQID`=lk.`jqid` where zs.ZSMC like %?3% limit ?1,?2")
 //    List<Map> findMachineControlInfo(Integer start,Integer pageSize,String keyword);
 
-    @Query(nativeQuery = true,value = "SELECT count(*) FROM da_zsda  zs JOIN da_jqda  jq ON zs.`ID`=jq.`ZSID` JOIN da_lkpz lk ON jq.`JQID`=lk.`jqid` where zs.ZSMC like %?1%")
+    @Query(nativeQuery = true,value = "SELECT count(*) FROM da_zsda  zs JOIN da_jqda  jq ON zs.`ID`=jq.`ZSID` and zs.MCID = 11 and zs.ZFBZ = 0 and jq.ZFBZ = 0 JOIN da_lkpz lk ON jq.`JQID`=lk.`jqid` where zs.ZSMC like %?1%")
     Long countTotalSize(String keyword);
 
     /**
      * 新增时的猪舍名称下拉框
      * @return
      */
-    @Query(nativeQuery = true,value = "SELECT zs.ZSMC,zs.id zsId,jq.JQID jqid FROM da_zsda zs JOIN da_jqda jq ON zs.ID = jq.ZSID WHERE jq.JQID NOT IN (SELECT jqid FROM da_lkpz lk)")
+    @Query(nativeQuery = true,value = "SELECT zs.ZSMC,zs.id zsId,jq.JQID jqid  FROM da_zsda zs JOIN da_jqda jq ON zs.ID = jq.ZSID WHERE zs.MCID = 11 and zs.ZFBZ = 0 and jq.ZFBZ = 0 and jq.JQID NOT IN (SELECT jqid FROM da_lkpz lk)")
     List<Map<String,Object>> selectZsList();
 }