Commit 087c0e10 authored by tangfang's avatar tangfang

修改审核bug

parent e025eb16
...@@ -38,8 +38,6 @@ public class CompanyManagementController { ...@@ -38,8 +38,6 @@ public class CompanyManagementController {
@RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody OldSaveCompanyReqVo reqVo){ public ResponseResult<SaveCompanyResVo> saveCompany(@RequestBody OldSaveCompanyReqVo reqVo){
checkCompany(reqVo); checkCompany(reqVo);
return ResponseResult.result(companyServiceImpl.saveCompany(reqVo)); return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
} }
......
...@@ -47,6 +47,7 @@ import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo; ...@@ -47,6 +47,7 @@ import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo;
import com.yanzuoguang.util.base.ObjectHelper; import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException; import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper; import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.JsonHelper;
import com.yanzuoguang.util.helper.StringHelper; import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.PageSizeData; import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult; import com.yanzuoguang.util.vo.ResponseResult;
...@@ -1540,7 +1541,7 @@ public class CompanyServiceImpl implements CompanyService { ...@@ -1540,7 +1541,7 @@ public class CompanyServiceImpl implements CompanyService {
if (!StringHelper.isEmpty(req.getTollPoint())) { // if (!StringHelper.isEmpty(req.getTollPoint())) { //
CompanyTollPointReqVo companyTollPointReqVo = new CompanyTollPointReqVo(); CompanyTollPointReqVo companyTollPointReqVo = new CompanyTollPointReqVo();
companyTollPointReqVo.setCompanyId(req.getId()); companyTollPointReqVo.setCompanyId(req.getId());
companyTollPointReqVo.setTollPoints(req.getTollPoint()); companyTollPointReqVo.setTollPoints(req.getTollPoint().trim());
List<CompanyTollPointVo> companyTollPointVos = companyTollPointDao.loadList(companyTollPointReqVo, CompanyTollPointVo.class); List<CompanyTollPointVo> companyTollPointVos = companyTollPointDao.loadList(companyTollPointReqVo, CompanyTollPointVo.class);
if (StringHelper.isEmpty(companyTollPointVos) || companyTollPointVos.size() == 0) { if (StringHelper.isEmpty(companyTollPointVos) || companyTollPointVos.size() == 0) {
throw new CodeException("99", "未获取到收费点,请联系客服人员查询二维码是否正确。"); throw new CodeException("99", "未获取到收费点,请联系客服人员查询二维码是否正确。");
......
...@@ -18,6 +18,9 @@ public class ExamineConfigReqVo { ...@@ -18,6 +18,9 @@ public class ExamineConfigReqVo {
@ApiModelProperty(notes = "公司id") @ApiModelProperty(notes = "公司id")
private String companyId; private String companyId;
@ApiModelProperty(notes = "公司类别:0-供应商,1-接口商,2-分销商,3-供应商和分销商,4-代理商")
private Integer productOrInterface;
/** /**
* 入口比例 * 入口比例
*/ */
...@@ -547,4 +550,12 @@ public class ExamineConfigReqVo { ...@@ -547,4 +550,12 @@ public class ExamineConfigReqVo {
public void setCompanyAgreementReqVo(CompanyAgreementReqVo companyAgreementReqVo) { public void setCompanyAgreementReqVo(CompanyAgreementReqVo companyAgreementReqVo) {
this.companyAgreementReqVo = companyAgreementReqVo; this.companyAgreementReqVo = companyAgreementReqVo;
} }
public Integer getProductOrInterface() {
return productOrInterface;
}
public void setProductOrInterface(Integer productOrInterface) {
this.productOrInterface = productOrInterface;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment