提交

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

@@ -58,7 +58,7 @@ public class RmsShipperController extends BaseRESTfulController {
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
         @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "apiId", value = "344", required = false, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "apiId", value = "451", required = false, dataType = "BigDecimal"),
     })
     //@RequiresPermissions("rmsshipper:view")
     @PostMapping(value = "/getShipperList")

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

@@ -48,6 +48,14 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
      */
     @Override
     public int insertShipper(RmsShipper rmsShipper) {
+//        创建一个新的托运人实体类进行操作
+        RmsShipper shipper = new RmsShipper();
+        shipper.setShipperName(rmsShipper.getShipperBranchFactory());
+        shipper.setShipperFatherId(new BigDecimal(rmsShipper.getShipperCompanyBranch()));
+        shipper.setDeleted(new BigDecimal(0));
+        shipper.setInsertUsername("admin");
+        shipper.setInsertTime(new Date());
+        shipper.setShipperId(rmsShipperMapper.getShipperId());
 //        int i=0;
 ////        String shipperCompanyBranch=rmsShipper.getShipperCompanyBranch();
 ////        int size=rmsShipperMapper.selectByParametersCompanyBranch(shipperCompanyBranch);
@@ -61,7 +69,7 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
 //        else{
 //            i=-1;
 //        }
-        return 0;
+        return rmsShipperMapper.insertSelective(shipper);
     }
 
     /**

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

@@ -1135,9 +1135,10 @@
     RS.SHIPPER_ID as "shipperId",
     RS.SHIPPER_NAME as "shipperName",
     RS.SHIPPER_ABBREVIATION as "shipperAbbreviation",
-    RS.SHIPPER_COMPANY_BRANCH as "shipperCompanyBranch",
-    RS.SHIPPER_BRANCH_FACTORY as "shipperBranchFactory"
+    RS2.SHIPPER_NAME as "superiorDepartment"
     from  RMS_SHIPPER RS
+    left join RMS_SHIPPER RS2
+    on RS2.SHIPPER_ID = RS.SHIPPER_FATHER_ID
     where RS.DELETED !=1
     ORDER BY RS.INSERT_TIME DESC
     )
@@ -1160,16 +1161,10 @@
           "shipperAbbreviation" in #{item}
         </foreach>
       </if>
-      <if test="shipperCompanyBranch!= null">
-        and
-        <foreach collection="shipperCompanyBranch" item="item" open="(" separator="," close=")">
-          "shipperCompanyBranch" in #{item}
-        </foreach>
-      </if>
-      <if test="shipperBranchFactory!= null">
+      <if test="superiorDepartment!= null">
         and
-        <foreach collection="shipperBranchFactory" item="item" open="(" separator="," close=")">
-          "shipperBranchFactory" in #{item}
+        <foreach collection="superiorDepartment" item="item" open="(" separator="," close=")">
+          "superiorDepartment" in #{item}
         </foreach>
       </if>
     </where>