修改

YijiaRestful/src/main/java/com/platform/yijia/controller/StationController.java

@@ -600,18 +600,27 @@ public class StationController {
                     Map<String, Object> params = new HashMap<>();
                     params.put("personnelId", personnelId);
                     params.put("stationId", stationId);
-                    List<Map<String, Object>> stationOilGunList = stationOilGunService.selectOilGunByPersonalId(params);
-                    resultMap.put("stationOilGunList", stationOilGunList);
-                    //resultData=ResultData.success(stationOilGunList);
+                    List<Map<String, Object>> list = stationOilGunService.selectOilGunByPersonalId(params);
+                    if(list !=null && list.size() >0){
+                        List<Map<String, Object>> stationOilGunList = stationOilGunService.selectOilGunByPersonalId(params);
+                        resultMap.put("stationOilGunList", stationOilGunList);
+                        resultMap.put("isAliPayFlag", stationInfo.getIsAliPayFlag());
+                        resultData = ResultData.success(resultMap);
+                    }else {
+                        resultData = ResultData.error(CodeMsg.NO_PERSONNAL);
+                    }
                 }else {
-                    StationOilGun stationOilGun =new StationOilGun();
-                    stationOilGun.setStationId(stationId);
-                    List<StationOilGun> stationOilGunList = stationOilGunService.stationOilGunList(stationOilGun);
+//                    StationOilGun stationOilGun =new StationOilGun();
+//                    stationOilGun.setStationId(stationId);
+//                    List<StationOilGun> stationOilGunList = stationOilGunService.stationOilGunList(stationOilGun);
+                    Map<String, Object> params = new HashMap<>();
+                    params.put("stationId", stationId);
+                    List<Map<String, Object>> stationOilGunList = stationOilGunService.selectStationAllOilGun(params);
                     resultMap.put("stationOilGunList", stationOilGunList);
-                    //resultData=ResultData.success(stationOilGunList);
+                    resultMap.put("isAliPayFlag", stationInfo.getIsAliPayFlag());
+                    resultData = ResultData.success(resultMap);
                 }
-                resultMap.put("isAliPayFlag", stationInfo.getIsAliPayFlag());
-                resultData = ResultData.success(resultMap);
+
             }else {
                 resultData=ResultData.success(CodeMsg.STATION_NULL_INFO);
             }

YijiaRestful/src/main/java/com/platform/yijia/dao/StationOilGunMapper.java

@@ -107,4 +107,7 @@ public interface StationOilGunMapper {
     //根据加油员获取油枪列表信息
     List<Map<String, Object>> selectOilGunByPersonalId(Map<String, Object> params);
 
+    //获取油站所有油枪
+    List<Map<String, Object>>  selectStationAllOilGun(Map<String, Object> params);
+
 }

YijiaRestful/src/main/java/com/platform/yijia/service/StationOilGunService.java

@@ -18,4 +18,7 @@ public interface StationOilGunService {
     //根据加油员获取油枪列表信息
     List<Map<String, Object>> selectOilGunByPersonalId(Map<String, Object> params);
 
+    //获取油站所有油枪
+    List<Map<String, Object>>  selectStationAllOilGun(Map<String, Object> params);
+
 }

YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationOilGunServiceImpl.java

@@ -21,6 +21,12 @@ public class StationOilGunServiceImpl implements StationOilGunService {
         return stationOilGunMapper.selectOilGunByPersonalId(params);
     }
 
+    //获取油站所有油枪
+    @Override
+    public List<Map<String, Object>> selectStationAllOilGun(Map<String, Object> params) {
+        return stationOilGunMapper.selectStationAllOilGun(params);
+    }
+
     //根据油站Id油枪号获取打印机编号
     @Override
     public List<Map<String, Object>> getPrinterSnByStationIdAndOilGunNoList(Map<String, Object> params) {

YijiaRestful/src/main/resources/mapper/StationOilGunMapper.xml

@@ -305,9 +305,11 @@
             T2.oil_gun_no               AS oilGunNo,
             T2.oil_name                 AS oilName,
             T2.oil_price                AS oilPrice,
-            T2.date                     AS date
+            T2.date                     AS date,
+            T3.dict_value               AS oilsType
         FROM        station_personnel    AS T1
         LEFT JOIN   station_oil_gun      AS T2 ON FIND_IN_SET(T2.oil_gun_no, T1.gun_no) AND T1.station_id = T2.station_id
+        LEFT JOIN   sys_dict_data        AS T3 ON T2.oil_name = T3.dict_label AND T3.dict_type = "oil_name"
         <where>
           T1.del_flag = "0"
           <if test="personnelId != null and personnelId !=''">
@@ -319,6 +321,27 @@
         </where>
   </select>
 
+  <!--查询油站油枪-->
+  <select id="selectStationAllOilGun" parameterType="map" resultType="map">
+    SELECT
+      T2.station_id               AS stationId,
+      T2.oil_gun_id               AS oilGunId,
+      T2.oil_gun_no               AS oilGunNo,
+      T2.oil_name                 AS oilName,
+      T2.oil_price                AS oilPrice,
+      T2.date                     AS date,
+      T3.dict_value               AS oilsType
+    FROM        station_oil_gun      AS T2
+    LEFT JOIN   sys_dict_data        AS T3 ON T2.oil_name = T3.dict_label
+    <where>
+      T3.dict_type = "oil_name"
+      <if test="stationId != null">
+        AND T2.station_id = #{stationId}
+      </if>
+    </where>
+  </select>
+
+
   <!--根据油站Id油枪号获取打印机编号 -->
   <select id="getPrinterSnByStationIdAndOilGunNoList" parameterType="map" resultType="map">
     SELECT