tijiaoi

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

@@ -7,6 +7,7 @@ import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.service.impl.RmsCapacityServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -161,11 +162,10 @@ public class RmsCapacityController extends BaseRESTfulController {
                 mapValue.put("index", con);
             }
         }
-        List<Map<String, Object>> listTotal = rmsCapacityService.getCapacityList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCapacityService.getCapacityList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -179,7 +179,7 @@ public class RmsCapacityController extends BaseRESTfulController {
     @PostMapping("/deleteCapacityCarrier")
     public RESTfulResult deleteCapacityCarrier(@RequestBody() Map<String,Object> map){
         if(map.containsKey("capacityId")&&map.get("capacityId")!=null&&map.containsKey("carrierSSOId")&&map.get("carrierSSOId")!=null){
-            int i =rmsCapacityService.deleteCapacityCarrier(map.get("capacityId").toString(),map.get("carrierSSOId").toString());
+            int i =rmsCapacityService.deleteCapacityCarrier(DataChange.dataToBigDecimal(map.get("capacityCarrierId")));
            return success(i);
         }
         return failed();

src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java

@@ -38,7 +38,7 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
     String ssoIdBycapacityId(BigDecimal id);
 
  //逻辑删除
- int updateCapacityCarrier(@Param("capacityId") String capacityId,@Param("carrierSSOId")  String carrierSSOId);
+ int updateCapacityCarrier(@Param("capacityCarrierId") BigDecimal capacityCarrierId);
 
  List<Map<String, Object>> getCapacityByCapacityId(Integer id);
 }

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

@@ -38,7 +38,7 @@ public interface IRmsCapacityService{
 
     Map<String,Object> getCarrierNameBySSOId(String carrierSSOId);
 
-    int deleteCapacityCarrier(String capacityId, String carrierId);
+    int deleteCapacityCarrier(BigDecimal capacityCarrierId);
 
     List<Map<String, Object>> getCapacityByCapacityId(Integer id);
 }

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

@@ -58,7 +58,7 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
             map.put("capacityId",capacityId);
             map.put("carrierId",carrierIds);
             List<RmsCapacityCarrier> rmsCapacityCarriers = rmsCapacityCarrierMapper.selectByParameters(map);
-            if (rmsCapacityCarriers != null && rmsCapacityCarriers.size() != 0) {
+            if (rmsCapacityCarriers != null && rmsCapacityCarriers.size() != 0 && rmsCapacityCarriers.get(0).getDeleted().intValue() == 0) {
                 return -1;
             }
             else {
@@ -161,13 +161,13 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
 
     /**
      * 通过承运商车辆ID删除绑定关系
-     * @param capacityId
-     * @param carrierSSOId
+     * @param capacityCarrierId
+     * @param
      * @return
      */
     @Override
-    public int deleteCapacityCarrier(String capacityId, String carrierSSOId) {
-        return rmsCapacityMapper.updateCapacityCarrier(capacityId,carrierSSOId);
+    public int deleteCapacityCarrier(BigDecimal capacityCarrierId) {
+        return rmsCapacityMapper.updateCapacityCarrier(capacityCarrierId);
     }
 
 

src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ openFeign:
     ESFeign:
       url: ${ESFEIGN_URL:172.16.33.166:8089}
     ColumnDataFeign:
-      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+      url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
     AmsFeign:
       url: ${AMSFEIGN_URL:172.16.33.166:8079}
 

src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -900,9 +900,6 @@
       WHERE  RCC.CAPACITY_CARRIER_ID=#{id}
     </select>
     <update id="updateCapacityCarrier">
-    update RMS_CAPACITY_CARRIER set DELETED=1 ,UPDATE_TIME=sysDate  where CAPACITY_ID=#{capacityId} and CARRIER_ID in(
-        select RC.CARRIER_ID from RMS_CARRIER RC
-        where RC.CARRIER_SSO_ID = #{carrierSSOId}
-    )
+    update RMS_CAPACITY_CARRIER RCC set DELETED=1 ,UPDATE_TIME=sysDate  where RCC.CAPACITY_CARRIER_ID = #{capacityCarrierId}
   </update>
 </mapper>