fix

src/main/java/com/cn/esermis/controller/DataAcquisitionInstrumentController.java

@@ -21,6 +21,7 @@ import javax.annotation.Resource;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static com.cn.esermis.dpld.model.AjaxResult.success;
 
@@ -147,4 +148,25 @@ public class DataAcquisitionInstrumentController {
         }
         return success();
     }
+
+    @GetMapping(value = "getCompony")
+    public AjaxResult getCompony()
+    {
+        List<Map<String,Object>> list = dataAcquisitionInstrumentService.getCompony();
+        return success(list);
+    }
+
+
+    /**
+     * 部门
+     * @return
+     */
+    @GetMapping(value = "getDepartment/{componyid}")
+    public AjaxResult getDepartment(@PathVariable String componyid)
+    {
+        List<Map<String,Object>> list = dataAcquisitionInstrumentService.getDepartment(componyid);
+        return success(list);
+    }
+
+
 }

src/main/java/com/cn/esermis/dpld/entity/DataAcquisitionInstrument.java

@@ -87,6 +87,11 @@ public class DataAcquisitionInstrument {
     @TableField(value = "company_code")
     private String companyCode;
     /**
+     * 单位编码
+     */
+    @TableField(value = "department_code")
+    private String departmentCode;
+    /**
      * 是否有排气筒 1是 0否
      */
     @TableField(value = "have_exhaust")

src/main/java/com/cn/esermis/dpld/mapper/DataAcquisitionInstrumentMapper.java

@@ -6,10 +6,14 @@ import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface DataAcquisitionInstrumentMapper extends BaseMapper<DataAcquisitionInstrument> {
 
     List<OutletAndFactorVo> selectListAll();
 
+    List<Map<String,Object>> getCompony();
+
+    List<Map<String, Object>> getDepartment(String componyid);
 }

src/main/java/com/cn/esermis/dpld/service/IDataAcquisitionInstrumentService.java

@@ -6,6 +6,7 @@ import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 public interface IDataAcquisitionInstrumentService extends IService<DataAcquisitionInstrument> {
@@ -13,4 +14,7 @@ public interface IDataAcquisitionInstrumentService extends IService<DataAcquisit
 
     List<OutletAndFactorVo> selectlist();
 
+    List<Map<String,Object>> getCompony();
+
+    List<Map<String, Object>> getDepartment(String componyid);
 }

src/main/java/com/cn/esermis/dpld/service/impl/DataAcquisitionInstrumentServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class DataAcquisitionInstrumentServiceImpl extends ServiceImpl<DataAcquisitionInstrumentMapper, DataAcquisitionInstrument> implements IDataAcquisitionInstrumentService {
@@ -22,4 +23,14 @@ public class DataAcquisitionInstrumentServiceImpl extends ServiceImpl<DataAcquis
     public List<OutletAndFactorVo> selectlist() {
         return mapper.selectListAll();
     }
+
+    @Override
+    public List<Map<String,Object>> getCompony() {
+        return mapper.getCompony();
+    }
+
+    @Override
+    public List<Map<String, Object>> getDepartment(String componyid) {
+        return mapper.getDepartment(componyid);
+    }
 }

src/main/resources/static/mybatis/DataAcquisitionInstrumentMapper.xml

@@ -10,5 +10,14 @@
                  left join analytical_instruments b on a.id = b.data_acquisition_instrument_id
                  left join monitoring_factor c on b.id = c.analytical_instrument_id
     </select>
+    <select id="getCompony" resultType="java.util.Map">
+        SELECT t.companyid,t.companylongname
+        FROM company t
+    </select>
+    <select id="getDepartment" resultType="java.util.Map" parameterType="java.lang.String">
+        SELECT t.departmentid,t.departmentname
+        FROM department t
+        WHERE t.companyid = #{companyid}
+    </select>
 </mapper>