asd

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

@@ -119,7 +119,7 @@ public class RmsShipperController extends BaseRESTfulController {
     @PostMapping(value = "/insertShipper")
     public RESTfulResult insertShipper(@RequestBody RmsShipper rmsShipper){
         int result= rmsShipperService.insertShipper(rmsShipper);
-        if(result <= 0){
+        if(result==-1){
             return failed();
         }
         return success(result);
@@ -166,4 +166,44 @@ public class RmsShipperController extends BaseRESTfulController {
         List<Map<String, Object>> list= rmsShipperService.getShipperById(id);
         return success(list);
     }
+
+    @ApiOperation(value="新增组织结构实绩")
+    @PostMapping(value = "/addShipperResult")
+    public RESTfulResult addShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        Integer i = null;
+        try {
+            i = rmsShipperService.addShipperResult(map);
+            if(i != 1){
+                return failed(i);
+            }
+        } catch (Exception e) {
+            return failed();
+        }
+        return success(i);
+    }
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "/updateShipperResult")
+    public RESTfulResult updateShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        Integer i = null;
+        try {
+            i = rmsShipperService.updateShipperResult(map);
+            if(i != 1){
+                return failed();
+            }
+        } catch (Exception e) {
+            return failed();
+        }
+        return success(i);
+    }
+
+    @ApiOperation(value="删除组织结构实绩")
+    @PostMapping(value = "/deleteShipperResult")
+    public RESTfulResult deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        Integer i = rmsShipperService.deleteShipperResult(map);
+        if(i != 1){
+            return failed(i);
+        }
+        return success(i);
+    }
 }

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

@@ -22,5 +22,9 @@ public interface RmsShipperMapper extends IBaseMapper<RmsShipper, BigDecimal> {
 //根据id详细获取托运人信息
     List<Map<String, Object>> selectShipperById(BigDecimal id);
 
-    int selectByParametersCompanyBranch(String shipperCompanyBranch);
+    Integer selectByParametersCompanyBranch(String shipperCompanyBranch);
+
+    //通过SSO主键查询组织机构主键
+    Integer selectShipperResultId(String pId);
+
 }

src/main/java/com/steerinfo/dil/model/RmsShipper.java

@@ -28,22 +28,22 @@ public class RmsShipper implements IBasePO<BigDecimal> {
     private String shipperAbbreviation;
 
     /**
-     * 属分公司(SHIPPER_COMPANY_BRANCH,VARCHAR,32)
+     * 父级ID(SHIPPER_FATHER_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="属分公司",required=false)
-    private String shipperCompanyBranch;
+    @ApiModelProperty(value="父级ID",required=false)
+    private BigDecimal shipperFatherId;
 
     /**
-     * 分公司下属分厂(SHIPPER_BRANCH_FACTORY,VARCHAR,32)
+     * SSO主键(SHIPPER_SSO_ID,VARCHAR,32)
      */
-    @ApiModelProperty(value="分公司下属分厂",required=false)
-    private String shipperBranchFactory;
+    @ApiModelProperty(value="SSO主键",required=false)
+    private String shipperSsoId;
 
     /**
-     * 分厂下属区域(SHIPPER_FACTORY_AREA,VARCHAR,32)
+     * 部门级别(SHIPPER_DEPARTMENT_LEVEL,VARCHAR,32)
      */
-    @ApiModelProperty(value="分厂下属区域",required=false)
-    private String shipperFactoryArea;
+    @ApiModelProperty(value="部门级别",required=false)
+    private String shipperDepartmentLevel;
 
     /**
      * 区分代码(SHIPPER_PARTITION_CODE,VARCHAR,8)
@@ -225,6 +225,30 @@ public class RmsShipper implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 属分公司(SHIPPER_COMPANY_BRANCH,VARCHAR,100)
+     */
+    @ApiModelProperty(value="属分公司",required=false)
+    private String shipperCompanyBranch;
+
+    /**
+     * 分公司下属分厂(SHIPPER_BRANCH_FACTORY,VARCHAR,100)
+     */
+    @ApiModelProperty(value="分公司下属分厂",required=false)
+    private String shipperBranchFactory;
+
+    /**
+     * 分厂下属区域(SHIPPER_FACTORY_AREA,VARCHAR,100)
+     */
+    @ApiModelProperty(value="分厂下属区域",required=false)
+    private String shipperFactoryArea;
+
+    /**
+     * 机构编码(SHIPPER_ORG_CODE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="机构编码",required=false)
+    private String shipperOrgCode;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -261,28 +285,28 @@ public class RmsShipper implements IBasePO<BigDecimal> {
         this.shipperAbbreviation = shipperAbbreviation == null ? null : shipperAbbreviation.trim();
     }
 
-    public String getShipperCompanyBranch() {
-        return shipperCompanyBranch;
+    public BigDecimal getShipperFatherId() {
+        return shipperFatherId;
     }
 
-    public void setShipperCompanyBranch(String shipperCompanyBranch) {
-        this.shipperCompanyBranch = shipperCompanyBranch == null ? null : shipperCompanyBranch.trim();
+    public void setShipperFatherId(BigDecimal shipperFatherId) {
+        this.shipperFatherId = shipperFatherId;
     }
 
-    public String getShipperBranchFactory() {
-        return shipperBranchFactory;
+    public String getShipperSsoId() {
+        return shipperSsoId;
     }
 
-    public void setShipperBranchFactory(String shipperBranchFactory) {
-        this.shipperBranchFactory = shipperBranchFactory == null ? null : shipperBranchFactory.trim();
+    public void setShipperSsoId(String shipperSsoId) {
+        this.shipperSsoId = shipperSsoId == null ? null : shipperSsoId.trim();
     }
 
-    public String getShipperFactoryArea() {
-        return shipperFactoryArea;
+    public String getShipperDepartmentLevel() {
+        return shipperDepartmentLevel;
     }
 
-    public void setShipperFactoryArea(String shipperFactoryArea) {
-        this.shipperFactoryArea = shipperFactoryArea == null ? null : shipperFactoryArea.trim();
+    public void setShipperDepartmentLevel(String shipperDepartmentLevel) {
+        this.shipperDepartmentLevel = shipperDepartmentLevel == null ? null : shipperDepartmentLevel.trim();
     }
 
     public String getShipperPartitionCode() {
@@ -525,6 +549,38 @@ public class RmsShipper implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public String getShipperCompanyBranch() {
+        return shipperCompanyBranch;
+    }
+
+    public void setShipperCompanyBranch(String shipperCompanyBranch) {
+        this.shipperCompanyBranch = shipperCompanyBranch == null ? null : shipperCompanyBranch.trim();
+    }
+
+    public String getShipperBranchFactory() {
+        return shipperBranchFactory;
+    }
+
+    public void setShipperBranchFactory(String shipperBranchFactory) {
+        this.shipperBranchFactory = shipperBranchFactory == null ? null : shipperBranchFactory.trim();
+    }
+
+    public String getShipperFactoryArea() {
+        return shipperFactoryArea;
+    }
+
+    public void setShipperFactoryArea(String shipperFactoryArea) {
+        this.shipperFactoryArea = shipperFactoryArea == null ? null : shipperFactoryArea.trim();
+    }
+
+    public String getShipperOrgCode() {
+        return shipperOrgCode;
+    }
+
+    public void setShipperOrgCode(String shipperOrgCode) {
+        this.shipperOrgCode = shipperOrgCode == null ? null : shipperOrgCode.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -534,9 +590,9 @@ public class RmsShipper implements IBasePO<BigDecimal> {
         sb.append(", shipperId=").append(shipperId);
         sb.append(", shipperName=").append(shipperName);
         sb.append(", shipperAbbreviation=").append(shipperAbbreviation);
-        sb.append(", shipperCompanyBranch=").append(shipperCompanyBranch);
-        sb.append(", shipperBranchFactory=").append(shipperBranchFactory);
-        sb.append(", shipperFactoryArea=").append(shipperFactoryArea);
+        sb.append(", shipperFatherId=").append(shipperFatherId);
+        sb.append(", shipperSsoId=").append(shipperSsoId);
+        sb.append(", shipperDepartmentLevel=").append(shipperDepartmentLevel);
         sb.append(", shipperPartitionCode=").append(shipperPartitionCode);
         sb.append(", shipperAddress=").append(shipperAddress);
         sb.append(", shipperLegalRepresentative=").append(shipperLegalRepresentative);
@@ -567,6 +623,10 @@ public class RmsShipper implements IBasePO<BigDecimal> {
         sb.append(", shipperAppid=").append(shipperAppid);
         sb.append(", shipperSecretkey=").append(shipperSecretkey);
         sb.append(", deleted=").append(deleted);
+        sb.append(", shipperCompanyBranch=").append(shipperCompanyBranch);
+        sb.append(", shipperBranchFactory=").append(shipperBranchFactory);
+        sb.append(", shipperFactoryArea=").append(shipperFactoryArea);
+        sb.append(", shipperOrgCode=").append(shipperOrgCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -19,7 +19,7 @@ import java.util.Map;
  * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
-public interface IRmsShipperService{
+public interface IRmsShipperService {
 //    实现获取托运人列表
     List<Map<String, Object>> getShipperList(Map<String, Object> mapVal);
 //增加托运人信息
@@ -30,4 +30,13 @@ public interface IRmsShipperService{
     int deleteShipper(BigDecimal id);
 //    根据id值展示托运人
     List<Map<String, Object>> getShipperById(BigDecimal id);
+
+    //新增组织机构实绩
+    int addShipperResult(Map<String, Object> map);
+
+    //修改组织机构实绩
+    int updateShipperResult(Map<String, Object> map);
+
+    //删除组织机构实绩
+    int deleteShipperResult(Map<String, Object> map);
 }

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

@@ -2,14 +2,12 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsShipperMapper;
 import com.steerinfo.dil.model.RmsShipper;
-import com.steerinfo.dil.model.RmsSupplier;
 import com.steerinfo.dil.service.IRmsShipperService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -50,20 +48,20 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
      */
     @Override
     public int insertShipper(RmsShipper rmsShipper) {
-        int i=0;
-        String shipperCompanyBranch=rmsShipper.getShipperCompanyBranch();
-        int size=rmsShipperMapper.selectByParametersCompanyBranch(shipperCompanyBranch);
-        if (size==0){
-            rmsShipper.setInsertTime(new Date());
-            rmsShipper.setInsertUsername("admin");
-            rmsShipper.setDeleted(new BigDecimal(0));
-            rmsShipper.setShipperId(rmsShipperMapper.getShipperId());
-            i+=rmsShipperMapper.insertSelective(rmsShipper);
-        }
-        else{
-            i=-1;
-        }
-        return i;
+//        int i=0;
+////        String shipperCompanyBranch=rmsShipper.getShipperCompanyBranch();
+////        int size=rmsShipperMapper.selectByParametersCompanyBranch(shipperCompanyBranch);
+//        if (size==0){
+//            rmsShipper.setInsertTime(new Date());
+//            rmsShipper.setInsertUsername("admin");
+//            rmsShipper.setDeleted(new BigDecimal(0));
+//            rmsShipper.setShipperId(rmsShipperMapper.getShipperId());
+//            i+=rmsShipperMapper.insertSelective(rmsShipper);
+//        }
+//        else{
+//            i=-1;
+//        }
+        return 0;
     }
 
     /**
@@ -99,4 +97,66 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
     public List<Map<String, Object>> getShipperById(BigDecimal id) {
         return rmsShipperMapper.selectShipperById(id);
     }
+
+    /**
+     * 新增组织结构实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public int addShipperResult(Map<String, Object> map) {
+        RmsShipper rmsShipper = new RmsShipper();
+        //新增主键
+        BigDecimal shipperId = rmsShipperMapper.getShipperId();
+        rmsShipper.setId(shipperId);
+        //添加机构名称
+        rmsShipper.setShipperName((String) map.get("orgName"));
+        //设置机构主键
+        rmsShipper.setShipperSsoId((String) map.get("orgId"));
+        //设置机构编码
+        rmsShipper.setShipperOrgCode((String) map.get("orgCode"));
+        //通过父级主键查询实绩主键
+        if(map.get("pId") != null){
+            Integer id = rmsShipperMapper.selectShipperResultId((String) map.get("pId"));
+            rmsShipper.setShipperFatherId(new BigDecimal(id));
+        }
+        //添加部门级别
+        rmsShipper.setShipperDepartmentLevel((String) map.get("depType"));
+        rmsShipper.setInsertTime(new Date());
+        rmsShipper.setInsertUsername("admin");
+        return rmsShipperMapper.insertSelective(rmsShipper);
+    }
+
+    /**
+     * 修改组织结构实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public int updateShipperResult(Map<String, Object> map) {
+        RmsShipper rmsShipper = new RmsShipper();
+        //查询实绩主键
+        Integer orgId = rmsShipperMapper.selectShipperResultId((String) map.get("orgId"));
+        rmsShipper.setId(new BigDecimal(orgId));
+        //添加机构名称
+        rmsShipper.setShipperName((String) map.get("orgName"));
+        return rmsShipperMapper.updateByPrimaryKeySelective(rmsShipper);
+    }
+
+    /**
+     * 删除组织结构实绩
+     * @param map
+     * @return
+     */
+    public int deleteShipperResult(Map<String, Object> map) {
+        String mes = (String) map.get("orgId");
+        if(mes == null || "".equals(mes)){
+            return 0;
+        }
+        Integer orgId = rmsShipperMapper.selectShipperResultId(mes);
+        if(orgId == null){
+            return 0;
+        }
+        return rmsShipperMapper.deleteByPrimaryKey(new BigDecimal(orgId));
+    }
 }