yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题修改

master
God 2 years ago
parent
ab3fa6cc3e
commit
1ff7d18c34
16 changed files with 147 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java
  3. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
  4. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
  6. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
  7. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  8. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  9. 39
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  10. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
  11. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
  12. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
  13. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
  14. 56
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  15. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  16. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java
View File

@ -113,4 +113,8 @@ public class BaseVehicleOut extends BaseEntity {
@ApiModelProperty("财务中客户编码")
private String cwCustomerNo;
@ApiModelProperty("采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java
View File

@ -83,4 +83,9 @@ public class BaseVehicleOutDetailsVo implements Vo {
private String innerName;
@ApiModelProperty("内部引荐人用户sid")
private String innerUserSid;
@ApiModelProperty("采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
View File

@ -106,4 +106,9 @@ public class BaseVehicleOutDto implements Dto {
private String innerName;
@ApiModelProperty("内部引荐人用户sid")
private String innerUserSid;
@ApiModelProperty("采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
View File

@ -109,4 +109,7 @@ public class BaseVehicleOutVo implements Vo {
private String trailerOrInstallCode;
@ApiModelProperty("内部引荐人姓名")
private String innerName;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
View File

@ -3,6 +3,8 @@ package com.yxt.anrui.base.api.busvehicleapply;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -73,4 +75,6 @@ public class BusVehicleApplyDetailsVo implements Vo {
@ApiModelProperty(value = "供应商sid")
private String supplierSid;
@ApiModelProperty("附件信息")
private List<CommonAppendixVo> commonAppendixs; //附件信息
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
View File

@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.busvehicleapply;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -87,5 +88,6 @@ public class BusVehicleApplyDto implements Dto {
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
@ApiModelProperty("附件信息")
private List<CommonAppendixDto> commonAppendixs; //附件信息
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
View File

@ -491,6 +491,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid());
baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseVehicleOutService.save(baseVehicleOut);
//推送金蝶挂车销售出库单

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -292,6 +292,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOut.setCreateBySid(dto.getCreateBySid());
baseVehicleOut.setCreateByName(dto.getCreateByName());
baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseMapper.insert(baseVehicleOut);
dto.setBillNo(billNo);
@ -582,6 +584,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOut.setCreateBySid(dto.getCreateBySid());
baseVehicleOut.setCreateByName(dto.getCreateByName());
baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseMapper.insert(baseVehicleOut);
dto.setBillNo(billNo);

39
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
View File

@ -23,6 +23,8 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService;
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
@ -31,6 +33,8 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.biz.commoncontract.CommonContractService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.DictCommonEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
@ -52,6 +56,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
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;
@ -127,7 +132,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
private SysProUrlFeign sysProUrlFeign;
@Autowired
private BasePurchaseSystemService basePurchaseSystemService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private CommonAppendixService commonAppendixService;
/**
* 分页列表
*
@ -215,6 +223,14 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
busVehicleApplyDetailsVo.setOrgPath(busVehicleApply.getOrgSidPath());
List<BusVehicleApplyDetailVo> busVehicleApplyDetailVos = busVehicleApplyDetailService.fetchByApplySid(sid);
busVehicleApplyDetailsVo.setBusVehicleApplyDetailList(busVehicleApplyDetailVos);
List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid(sid);
for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
commonAppendixVo.setFilePath(filePath);
}
busVehicleApplyDetailsVo.setCommonAppendixs(commonAppendixVos);
return busVehicleApplyDetailsVo;
}
@ -237,6 +253,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
public ResultBean<String> saveOrUpdateDto(BusVehicleApplyDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
List<CommonAppendixDto> commonAppendixs = dto.getCommonAppendixs();
if (StringUtils.isBlank(sid)) {//新增
//=======================================
String orgSidPath = "";
@ -295,6 +312,15 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
entity.setSupplierSid(manufacturerSid);
baseMapper.insert(entity);
sid = entity.getSid();
for (CommonAppendixDto commonAppendix : commonAppendixs) {
String filePath = commonAppendix.getFilePath();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendix.setFilePath(filePath);
commonAppendix.setLinkSid(sid);
commonAppendixService.saveOrUpdateDto(commonAppendix);
}
} else {//修改
BusVehicleApply busVehicleApply = fetchBySid(sid);
if (busVehicleApply == null) {
@ -326,7 +352,16 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
}
busVehicleApply.setCurrentAmount(i);
baseMapper.updateById(busVehicleApply);
commonAppendixService.deleteFiles(sid);
for (CommonAppendixDto commonAppendix : commonAppendixs) {
String filePath = commonAppendix.getFilePath();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendix.setFilePath(filePath);
commonAppendix.setLinkSid(sid);
commonAppendixService.saveOrUpdateDto(commonAppendix);
}
}
return rb.success().setData(sid);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
View File

@ -62,6 +62,11 @@ public interface FinPaymentrecordFeign {
@ResponseBody
public ResultBean<PagerVo<FinPaymentrecordVo>> listPage(@RequestBody PagerQuery<FinPaymentrecordQuery> pq);
@ApiOperation("根据条件分页查询数据的列表（层级查询）")
@PostMapping("/listPageCJCX")
@ResponseBody
public ResultBean<PagerVo<FinPaymentrecordVo>> listPageCJCX(@RequestBody PagerQuery<FinPaymentrecordQuery> pq);
@ApiOperation("新增")
@PostMapping("/save")
@ResponseBody

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
View File

@ -56,6 +56,11 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
return rb.setMsg("接口anrui-fin/finpaymentrecord/listPage无法访问");
}
@Override
public ResultBean<PagerVo<FinPaymentrecordVo>> listPageCJCX(PagerQuery<FinPaymentrecordQuery> pq) {
return null;
}
@Override
public ResultBean save(FinPaymentrecordDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentrecord/save无法访问");

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
View File

@ -25,6 +25,7 @@
fp.payFile,
fp.payCode
FROM fin_paymentrecord fp
LEFT JOIN anrui_portal.sys_organization so ON fp.createOrgSid = so.sid
<where>
${ew.sqlSegment}
</where>

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
View File

@ -65,6 +65,13 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<FinPaymentrecordVo>> listPageCJCX(PagerQuery<FinPaymentrecordQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<FinPaymentrecordVo> pv = finPaymentrecordService.listPageCJCX(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean save(FinPaymentrecordDto dto) {
return finPaymentrecordService.saveDto(dto);

56
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -182,6 +182,62 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
return p;
}
public PagerVo<FinPaymentrecordVo> listPageCJCX(PagerQuery<FinPaymentrecordQuery> pq) {
FinPaymentrecordQuery pageQuery = pq.getParams();
QueryWrapper<FinPaymentrecord> qw = new QueryWrapper<>();
if (pageQuery != null) {
//根据用户的组织机构查询分公司
String orgSidPath = pageQuery.getOrgPath();
//分公司sid
String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
String orgLevelKey = data.getOrgLevelKey();
if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, 73);
qw.like("so.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
qw.eq("fp.createOrgSid", orgSid);
}
//付款状态
if (StringUtils.isNotBlank(pageQuery.getState())) {
qw.eq("fp.state", pageQuery.getState());
}
//款项类别
if (StringUtils.isNotBlank(pageQuery.getCostTypeKey())) {
qw.eq("fp.costTypekey", pageQuery.getCostTypeKey());
}
//款项名称
if (StringUtils.isNotBlank(pageQuery.getCostTitleKey())) {
qw.eq("fp.costTitleKey", pageQuery.getCostTitleKey());
}
//申请日期
qw.apply(StringUtils.isNotBlank(pageQuery.getCreateStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getCreateStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(pageQuery.getCreateEndDate()), "date_format (fp.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getCreateEndDate() + "','%Y-%m-%d')"
);
}
qw.orderByDesc("fp.createTime");
IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
List<FinPaymentrecordVo> list = pagging.getRecords();
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
for (FinPaymentrecordVo vv : list) {
String payFile = vv.getPayFile();
if (StringUtils.isNotBlank(payFile)) {
List<String> strings = Arrays.asList(payFile.split(","));
for (int i = 0; i < strings.size(); i++) {
if (!strings.get(i).contains(fileUploadComponent.getUrlPrefix())) {
strings.set(i, fileUploadComponent.getUrlPrefix() + strings.get(i));
}
}
vv.setPayFiles(strings);
}
}
}
PagerVo<FinPaymentrecordVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveDto(FinPaymentrecordDto dto) {
ResultBean rb = ResultBean.fireFail();
FinPaymentrecord finPaymentrecord = new FinPaymentrecord();

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -10,7 +10,7 @@ public enum ProcDefEnum {
ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),//TODO：正式新2023-02-21
FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java
View File

@ -183,6 +183,11 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
List<SysFunctionTreeVo> sysSourceVos = sysSourceService.listFunctionTreeVo(name);
for (SysFunctionTreeVo s : sysSourceVos) {
List<SysFunctionTreeVo> sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid());
for (SysFunctionTreeVo sysFunctionTreeVo : sysFunctionVoList) {
if (StringUtils.isNotBlank(sysFunctionTreeVo.getRemarks())){
sysFunctionTreeVo.setName(sysFunctionTreeVo.getName() + "(" + sysFunctionTreeVo.getRemarks() + ")");
}
}
s.setChildren(sysFunctionVoList);
s.setIsSource("1");
//判断该资源下的功能是否有可用的状态

Write Preview
Loading…
Cancel
Save