Browse Source

问题修改

master
dimengzhe 2 years ago
parent
commit
f472b8b9a5
  1. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
  2. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java
  3. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@ -679,6 +679,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
qw.eq("ss.isDelete", 0);
qw.ne("sso.orgSid", deptSid);
qw.ne("ss.personTypeKey","01");
return baseMapper.getStaffName(qw);
}
@ -689,6 +690,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
}
qw.eq("sso.orgSid", deptSid);
qw.eq("ss.isDelete", 0);
qw.ne("ss.personTypeKey","01");
return baseMapper.getStaffNameByDeptSid(qw);
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java

@ -26,6 +26,8 @@
package com.yxt.anrui.scm.api.scmvehicleexamine;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -90,4 +92,7 @@ public class ScmVehicleExaminePageVo implements Vo {
private String modelSidAndConfig;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty(value = "单台指导价")
private String guidedPrice;
}

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@ -229,6 +229,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
ResultBean<BaseVehmodelVo> resultBean = baseVehmodelConfigFeign.selectOne(record.getModelSid(),record.getConfigSid(), record.getUseOrgSid());
if(resultBean.getData() != null){
record.setModelSidAndConfig(resultBean.getData().getModelConfigSid());
record.setGuidedPrice(resultBean.getData().getGuidedPrice());
}
}
return iPage;

Loading…
Cancel
Save