Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
commit
9365b04027
  1. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java
  4. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
  5. 26
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java
  6. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  7. 44
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java
  8. 52
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@ -88,7 +88,7 @@ public interface BaseVehicleModelFeign {
@ApiOperation("删除、批量删除")
@DeleteMapping("/deleteBySids")
@ApiImplicitParam(name = "sids", value = "车型sid,若为多个sid,以逗号分隔")
public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid);
public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath);
/**
* 详情
@ -107,8 +107,8 @@ public interface BaseVehicleModelFeign {
* @return
*/
@ApiOperation("修改回显")
@GetMapping("/getAll/{sid}/{userSid}")
public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
@GetMapping("/getAll")
public ResultBean<BaseVehicleModelSelectVo> getAll(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath);
/**
* 快速新增回显

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@ -52,7 +52,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
}
@Override
public ResultBean deleteBySids(String sids, String userSid) {
public ResultBean deleteBySids(String sids, String userSid,String orgPath) {
return null;
}
@ -62,7 +62,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
}
@Override
public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid,String orgPath) {
return null;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java

@ -76,4 +76,6 @@ public class BaseVehmodelConfigDto implements Dto {
private Integer isCommonModel;
@ApiModelProperty(value = "内部编码")
private String insideCode;
private String orgPath;
}

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@ -75,7 +75,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
public ResultBean save(BaseModelConfigDto dto) {
ResultBean rb = ResultBean.fireFail();
String userSid = dto.getUserSid();
String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
// String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
BaseModelConfig entity = new BaseModelConfig();
dto.fillEntity(entity);
String configName = "";
@ -162,7 +162,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName = baseModelConfigService.configNameSpell(entity);
entity.setConfigName(configName);
configName += dto.getOtherConfig();
List<String> stringList = baseModelConfigService.checkByConfigName(sid);
List<String> stringList = baseModelConfigService.checkByConfigName(dto.getCreateOrgSId());
if (stringList != null || stringList.size() > 0){
for (String s : stringList) {
if (configName.equals(s)){
@ -170,7 +170,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
}
}
}
entity.setCreateOrgSId(sid);
// entity.setCreateOrgSId(sid);
// 配置编码
int i1 = baseModelConfigService.selectCount();
String num = String.format("%04d", i1 + 1); // 不足4位补0
@ -303,8 +303,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
return rb.setMsg("该配置已有关联车型,无法修改");
}
String userSid = dto.getUserSid();
/*
ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
String sid1 = useOrgByUserSid.getData().getSid();
*/
String sid1 = dto.getCreateOrgSId();
int i3 = baseModelConfigService.checkByCreateOrgSidAndConfigSid(sid1, sid);
if (i3 == 0) {
return rb.setMsg("该配置不属于当前分公司,无法修改");

26
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@ -11,7 +11,7 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.PagerUtil;
@ -74,6 +74,8 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Override
public ResultBean<PagerVo<BaseVehicleModelVo>> pagerList(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery) {
@ -148,15 +150,23 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
}
@Override
public ResultBean deleteBySids(String sids, String userSid) {
public ResultBean deleteBySids(String sids, String userSid,String orgPath) {
List<String> sidList = Arrays.asList(sids.split(","));
for (String sid : sidList) {
int i = baseVehmodelConfigService.checkByModelSid(sid);
if (i > 0) {
return ResultBean.fireFail().setMsg("该车型已有关联配置,无法删除");
}
/*
ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
String sid1 = useOrgByUserSid.getData().getSid();
*/
String sid1 = "";
if(StringUtils.isNotBlank(orgPath)){
sid1 = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}else{
sid1 = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
int i1 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
if (i1 == 0) {
return ResultBean.fireFail().setMsg("该车型不属于当前分公司,无法删除");
@ -185,7 +195,7 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
}
@Override
public ResultBean<BaseVehicleModelSelectVo> getAll(String sid, String userSid) {
public ResultBean<BaseVehicleModelSelectVo> getAll(String sid, String userSid,String orgPath) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid);
if (vo == null) {
@ -195,8 +205,16 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
if (i3 > 0) {
return rb.setMsg("该车型已有关联配置,无法修改");
}
/*
ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
String sid1 = useOrgByUserSid.getData().getSid();
*/
String sid1 = "";
if(StringUtils.isNotBlank(orgPath)){
sid1 = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}else{
sid1 = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}
int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
if (i4 == 0) {
return rb.setMsg("该车型不属于当前分公司,无法修改");
@ -211,7 +229,7 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
if (vo == null) {
return rb.setMsg("该车型信息不存在");
}
ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
// ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
return rb.success().setData(vo);
}

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@ -37,7 +37,6 @@ import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
@ -440,7 +439,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
for (BaseVehmodelConfigDto baseVehmodelConfigDto : dto) {
String modelSid = baseVehmodelConfigDto.getModelSid();
String configurationItemsSid = baseVehmodelConfigDto.getConfigurationItemsSid();
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(baseVehmodelConfigDto.getUserSid());
// ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(baseVehmodelConfigDto.getUserSid());
ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(baseVehmodelConfigDto.getOrgPath());
if ("0".equals(resultBean.getData())) {
return rb.setMsg("该用户无分公司,不允许操作");
}
@ -452,9 +452,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
String sid = baseVehmodelConfig.getSid();
BeanUtil.copyProperties(dto, baseVehmodelConfig);
baseVehmodelConfig.setSid(sid);
ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(baseVehmodelConfigDto.getUserSid());
String orgSid = useOrgByUserSid.getData().getSid();
baseVehmodelConfig.setUseOrgSid(orgSid);
// ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(baseVehmodelConfigDto.getUserSid());
// String orgSid = useOrgByUserSid.getData().getSid();
baseVehmodelConfig.setUseOrgSid(resultBean.getData());
baseVehmodelConfig.setModelSid(modelSid);
baseVehmodelConfig.setConfigurationItemsSid(configurationItemsSid);
save(baseVehmodelConfig);

44
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java

@ -106,49 +106,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();
if (StringUtils.isNotEmpty(sid)) {
StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (null != dto.getFilePaths()) {
for (String filePath : dto.getFilePaths()) {
String[] split = filePath.split(urlPrefix);
String s = split[1];
sb.append(s).append(",");
}
sb.delete(sb.length() - 1, sb.length());
dto.setFilePath(sb.toString());
}
if (StringUtils.isNotBlank(dto.getFilePath())) {
dto.setBillingStateKey("002");
dto.setBillingState("已开票");
}
if (StringUtils.isNotEmpty(dto.getVinNo())) {
String VIN = dto.getVinNo();
dto.setVIN(VIN);
}
finVehicleInvoiceService.updateBySid(dto, sid);
finVehicleInvoiceService.myUpdateBySid(dto, sid);
} else {
FinVehicleInvoice finVehicleInvoice = new FinVehicleInvoice();
String sidAdd = finVehicleInvoice.getSid();
BeanUtil.copyProperties(dto, finVehicleInvoice);
finVehicleInvoice.setSid(sidAdd);
StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (null != dto.getFilePaths()) {
for (String filePath : dto.getFilePaths()) {
String[] split = filePath.split(urlPrefix);
String s = split[1];
sb.append(s).append(",");
}
sb.delete(sb.length() - 1, sb.length());
finVehicleInvoice.setFilePath(sb.toString());
finVehicleInvoice.setBillingStateKey("002");
finVehicleInvoice.setBillingState("已开票");
}
if (StringUtils.isNotEmpty(dto.getVinNo())) {
String VIN = dto.getVinNo();
finVehicleInvoice.setVIN(VIN);
}
finVehicleInvoiceService.save(finVehicleInvoice);
finVehicleInvoiceService.mySave(dto);
}
return rb.success();
}

52
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.fin.api.finvehicleinvoice.*;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -11,6 +12,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -28,6 +30,9 @@ import java.util.List;
*/
@Service
public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoiceMapper, FinVehicleInvoice> {
@Resource
private FileUploadComponent fileUploadComponent;
public PagerVo<FinVehicleInvoice> listPage(PagerQuery<FinVehicleInvoiceQuery> pq) {
FinVehicleInvoiceQuery query = pq.getParams();
QueryWrapper<FinVehicleInvoice> qw = createQueryWrapper(query);
@ -183,4 +188,51 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
return vo;
}
public int myUpdateBySid(FinVehicleInvoiceDto dto, String sid) {
StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (null != dto.getFilePaths()) {
for (String filePath : dto.getFilePaths()) {
String[] split = filePath.split(urlPrefix);
String s = split[1];
sb.append(s).append(",");
}
sb.delete(sb.length() - 1, sb.length());
dto.setFilePath(sb.toString());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getFilePath())) {
dto.setBillingStateKey("002");
dto.setBillingState("已开票");
}
if (com.yxt.common.base.utils.StringUtils.isNotEmpty(dto.getVinNo())) {
String VIN = dto.getVinNo();
dto.setVIN(VIN);
}
return updateBySid(dto,sid);
}
public boolean mySave(FinVehicleInvoiceDto dto) {
FinVehicleInvoice finVehicleInvoice = new FinVehicleInvoice();
String sidAdd = finVehicleInvoice.getSid();
BeanUtil.copyProperties(dto, finVehicleInvoice);
finVehicleInvoice.setSid(sidAdd);
StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
if (null != dto.getFilePaths()) {
for (String filePath : dto.getFilePaths()) {
String[] split = filePath.split(urlPrefix);
String s = split[1];
sb.append(s).append(",");
}
sb.delete(sb.length() - 1, sb.length());
finVehicleInvoice.setFilePath(sb.toString());
finVehicleInvoice.setBillingStateKey("002");
finVehicleInvoice.setBillingState("已开票");
}
if (com.yxt.common.base.utils.StringUtils.isNotEmpty(dto.getVinNo())) {
String VIN = dto.getVinNo();
finVehicleInvoice.setVIN(VIN);
}
return save(finVehicleInvoice);
}
}
Loading…
Cancel
Save