提交代码

src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java

@@ -2,6 +2,7 @@ package com.steerinfo.dil.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.component.ImageFileUtils;
+import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.service.impl.RmsCapacityServiceImpl;
@@ -18,10 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description:
@@ -41,6 +39,23 @@ public class RmsCapacityController extends BaseRESTfulController {
     @Autowired
     private ImageFileUtils imageFileUtils;
 
+    @Autowired
+    ColumnDataFeign columnDataFeign;
+
+    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
+        Set<Map<String, Object>> setString = new HashSet<>();
+        for (Map<String, Object> map : list) {//遍历每条数据
+            Map<String, Object> map1 = new HashMap<>();
+            //map.get(name)获取每条数据中对应表头字段的数据
+            map1.put("text", map.get(name));
+            if (map.get(name) != null) {
+                map1.put("value", map.get(name));
+                setString.add(map1);
+            }
+        }
+        return setString;
+    }
+
     /**
      * 创建运力信息
      * @param
@@ -165,8 +180,36 @@ public class RmsCapacityController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCapacityService.getCapacityList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
-        return success(data);
+        //获取样式
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        int i=0;
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条
+            columnData.put("filters", setListMap(columnList, columnData.get("prop").toString()));
+            if (i==1){
+                columnData.put("min-width","128px");
+            }else if (i==2){
+                columnData.put("min-width","129px");
+            }else if (i==3){
+                columnData.put("min-width","139px");
+            }else if (i==4){
+                columnData.put("min-width","125px");
+            }else if (i==5){
+                columnData.put("min-width","135px");
+            }else if (i==6){
+                columnData.put("min-width","149px");
+            }else if (i==7){
+                columnData.put("min-width","109px");
+            }else if (i==8){
+                columnData.put("min-width","125px");
+            }else if (i==9){
+                columnData.put("min-width","89px");
+            }
+            i++;
+        }
+        PageListAdd pageList = new PageListAdd(columnList);
+        pageList.setColumnData(columnDataList);
+        return success(pageList);
     }
 
     //根据carrierSSOId查询承运商

src/main/java/com/steerinfo/dil/controller/RmsOilPriceController.java

@@ -101,8 +101,9 @@ public class RmsOilPriceController extends BaseRESTfulController {
 
 
     @PostMapping(value = "/updateOilPrice")
-    public RESTfulResult updateOilPrice(@RequestBody(required = false) Map<String, Object> mapValue){
-        int result = rmsOilPriceService.updateOilPrice(mapValue);
+    public RESTfulResult updateOilPrice(@RequestBody(required = false) Map<String, Object> map){
+        Integer priceId = (Integer) map.get("priceId");
+        int result = rmsOilPriceService.updateOilPrice(priceId);
         return success(result);
     }
 

src/main/java/com/steerinfo/dil/service/IRmsOilPriceService.java

@@ -27,7 +27,7 @@ public interface IRmsOilPriceService{
 
     int insertOilPrice(Map<String,Object> map);
 
-    int updateOilPrice(Map<String, Object> mapValue);
+    int updateOilPrice(Integer id);
 
     int deleteOilPrice(BigDecimal id);
 

src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java

@@ -118,17 +118,29 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
     * */
     @Override
     public int updateCapacity(Map<String,Object> map) {
-        String remark = (String) map.get("remark");
-        String userDep =(String) map.get("userDep");
-        String capacityTel =(String) map.get("capacityTel");
-        String capacityNumber =(String) map.get("capacityNumber");
+        String remark="";
+        String userDep ="";
+        String capacityTel="";
+        String capacityNumber="";
+        if (!("".equals(map.get("remark")))&&map.get("remark")!=null){
+            remark = (String) map.get("remark");
+        }
+        if (!("".equals(map.get("userDep")))&&map.get("userDep")!=null){
+            userDep = (String) map.get("userDep");
+        }
+        if (!("".equals(map.get("capacityTel")))&&map.get("capacityTel")!=null){
+            capacityTel = (String) map.get("capacityTel");
+        }
         BigDecimal capacityCarrierId =DataChange.dataToBigDecimal(map.get("capacityCarrierId"));
         RmsCapacityCarrier rmsCapacityCarrier=new RmsCapacityCarrier();
         rmsCapacityCarrier.setCapacityCarrierId(capacityCarrierId);
         rmsCapacityCarrier.setInsertUpdateRemark(remark);
         rmsCapacityCarrier.setCapacityUserDep(userDep);
         //更新司机电话
-        rmsCapacityMapper.updatecapacityTel(capacityTel,capacityNumber);
+        if (!("".equals(map.get("capacityNumber")))&&map.get("capacityNumber")!=null){
+            capacityNumber = (String) map.get("capacityNumber");
+            rmsCapacityMapper.updatecapacityTel(capacityNumber,capacityTel);
+        }
         return rmsCapacityCarrierMapper.updateByPrimaryKeySelective(rmsCapacityCarrier);
     }
 

src/main/java/com/steerinfo/dil/service/impl/RmsOilPriceServiceImpl.java

@@ -63,17 +63,17 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
      **/
     @Transactional
     @Override
-    public int updateOilPrice(Map<String, Object> mapValue) {
+    public int updateOilPrice(Integer id) {
         RmsOilPrice rmsOilPrice = new RmsOilPrice();
         //查询该启用油价的信息
-        Map<String, Object> mesMap = rmsOilPriceMapper.getOilPriceById(new BigDecimal(mapValue.get("priceId").toString()));
+        Map<String, Object> mesMap = rmsOilPriceMapper.getOilPriceById(new BigDecimal(id));
         if(DataChange.dataToBigDecimal(mesMap.get("priceStatus")).intValue() == 0){
             return 0;
         }else{
             //通过油品信息关闭该油品所有正在启用的油价
             rmsOilPriceMapper.closeLastOilPrice(mesMap);
         }
-        rmsOilPrice.setId(new BigDecimal(mapValue.get("priceId").toString()));
+        rmsOilPrice.setId(new BigDecimal(id));
         rmsOilPrice.setUpdateTime(new Date());
         rmsOilPrice.setPriceStatus(new BigDecimal(0));
         //加入正数条件