修改料控管理

shiwan/admin/src/main/java/com/huimv/admin/controller/secondary/MachineControlController.java

@@ -64,7 +64,7 @@ public class MachineControlController {
      */
     @RequestMapping("/selectBox")
     public Result selectBox4add(){
-        List<String> zsList = machineControlService.selectBox4add();
+        List<Map<String,Object>> zsList = machineControlService.selectBox4add();
         return new Result(ResultCode.SUCCESS,zsList);
     }
 

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

@@ -59,6 +59,6 @@ public interface MachineControlRepository extends JpaRepository<MachineControlEn
      * 新增时的猪舍名称下拉框
      * @return
      */
-    @Query(nativeQuery = true,value = "SELECT zs.ZSMC FROM da_zsda zs JOIN da_jqda jq ON zs.ID = jq.ZSID WHERE jq.JQID NOT IN (SELECT jqid FROM da_lkpz lk)")
-    List<String> selectZsList();
+    @Query(nativeQuery = true,value = "SELECT zs.ZSMC,zs.id zsId,jq.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)")
+    List<Map<String,Object>> selectZsList();
 }

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/MachineControlService.java

@@ -48,6 +48,6 @@ public interface MachineControlService {
      * 新增时选择猪舍的下拉框
      * @return
      */
-    List<String> selectBox4add();
+    List<Map<String,Object>> selectBox4add();
 
 }

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/impl/MachineControlServiceImpl.java

@@ -91,7 +91,7 @@ public class MachineControlServiceImpl implements MachineControlService {
     }
 
     @Override
-    public List<String> selectBox4add() {
+    public List<Map<String,Object>> selectBox4add() {
         return machineControlRepository.selectZsList();
     }