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

优化

master
God 2 years ago
parent
f0412fcb62
commit
e0d116e289
6 changed files with 133 additions and 12 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. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
  3. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java
  4. 76
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  5. 5
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  6. 58
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
View File

@ -98,4 +98,6 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity {
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("申请人组织路径")
private String orgSidPath;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
View File

@ -72,4 +72,6 @@ public class FinUncollectedReceivablesDetailedDto implements Dto {
private String receivablesName; // 应收项目名称
@ApiModelProperty("当前应收金额")
private String currentReceivableMoney; // 当前应收金额
@ApiModelProperty("申请人组织路径")
private String orgSidPath;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java
View File

@ -98,6 +98,4 @@ public class FinUncollectedReceivablesDetailedVo implements Vo {
private String payTypeKey;
@ApiModelProperty("付款类型(全款/贷款)")
private String payType;
@ApiModelProperty("是否可以操作")
private Boolean isCZ;
}

76
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
View File

@ -29,6 +29,7 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
@ -50,6 +51,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
@ -371,19 +373,77 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
params.setBusVinSids(busVinSids);
}
String orgPath = params.getOrgPath();
String orgSidPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
params.setUseOrgSid(orgSidPath);
QueryWrapper<FinUncollectedReceivablesDetailed> qw = myCreateQueryWrapper(params);
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
params.setUseOrgSid(useOrgSid);
QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
//授权
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(params.getOrgPath());
privilegeQuery.setMenuUrl(params.getMenuUrl());
privilegeQuery.setUserSid(params.getCreateBySid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
orgPath = orgPath + "/";
int i1 = orgPath.indexOf("/");
int i2 = orgPath.indexOf("/", i1 + 1);
int i3 = orgPath.indexOf("/", i2 + 1);
int i4 = orgPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgPath = orgPath.substring(0, i1);
qw.like("orgSidPath", orgPath);
} else if ("2".equals(orgLevelKey)) {
orgPath = orgPath.substring(0, i2);
qw.like("orgSidPath", orgPath);
} else if ("3".equals(orgLevelKey)) {
orgPath = orgPath.substring(0, i3);
qw.like("orgSidPath", orgPath);
} else if ("4".equals(orgLevelKey)) {
orgPath = orgPath.substring(0, i4);
qw.like("orgSidPath", orgPath);
} else if("5".equals(orgLevelKey)){
qw.eq("createBySid",params.getCreateBySid());
}else{
PagerVo<FinUncollectedReceivablesDetailedVo> p = new PagerVo<>();
return p;
}
}else{
PagerVo<FinUncollectedReceivablesDetailedVo> p = new PagerVo<>();
return p;
}
if (StringUtils.isNotBlank(params.getVinNo())) {
if (!params.getBusVinSids().isEmpty()) {
List<String> busVinSids = params.getBusVinSids();
for (int i = 0; i < busVinSids.size(); i++) {
qw.eq("busVinSid", busVinSids.get(i));
if (i < busVinSids.size() - 1) {
qw.or();
}
}
}
}
if (StringUtils.isNotBlank(params.getContractNo())) {
qw.like("contractNo", params.getContractNo());
}
if (StringUtils.isNotBlank(params.getCustomerName())) {
qw.like("customerName", params.getCustomerName());
}
if (StringUtils.isNotBlank(params.getReceivablesName())) {
qw.like("receivablesName", params.getReceivablesName());
}
String createStartTime = params.getCreateStartTime();
String createEndTime = params.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("isDelete", "0");
IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
IPage<FinUncollectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
//=============================分页结束======================================
List<FinUncollectedReceivablesDetailedVo> records = pagging.getRecords();
for (FinUncollectedReceivablesDetailedVo record : records) {
if (record.getCreateBySid().equals(params.getCreateBySid())){
record.setIsCZ(true);
}else {
record.setIsCZ(false);
}
record.setDownload(false);
//获取单条对应的应收未收sid
String sid = record.getSid();

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

@ -26,8 +26,9 @@ public enum ProcDefEnum {
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:4:1232504"),
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
//RECORDAPPLICATION("入库申请", "process_xbwq2c7p:4:1232504"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
SCMVEHICLERETURN("采购退库", "process_入库申请md8aeoap:2:722508"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
SALESORDER("销售订单审批流程", "process_p5ils2rn:10:1250008"),
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),

58
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -470,6 +470,35 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
UpdateFlowFieldVo uff = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(uff));
//数据推送
String name = "";
String confirmSid = "";
String confirmName = "";
String confirmDate = "";
ScmApplyInbound booad = fetchBySid(businessSid);
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid);
ResultBean<List<String>> sids = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(booad, scmApplyInboundVehicleDtos);
saveItem(sids);
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(bv.getInstanceId()).getData();
List<FlowTask> flowList = flowRecordVo.getFlowList();
for (FlowTask flowTask : flowList) {
if (flowTask.getTaskName().equals("账务部审批")) {
confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
break;
}else if (flowTask.getTaskName().equals("销售支持部经理审批")) {
confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
}
}
name = confirmSid + "," + confirmName + "," + confirmDate;
newBaseVehicleDto(booad, scmApplyInboundVehicleDtos, name);
//入账审批通关修改采购订单状态 state = 1
if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) {
busVehicleOrderFeign.updateState(booad.getVehicleOrderSid());
}
return resultBean1;
}
return submitBusinessData(dto, busSid, scmApplyInbound1);
@ -520,6 +549,35 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
UpdateFlowFieldVo uff = resultBean1.getData();
updateFlowFiled(BeanUtil.beanToMap(uff));
//数据推送
String name = "";
String confirmSid = "";
String confirmName = "";
String confirmDate = "";
ScmApplyInbound booad = fetchBySid(businessSid);
List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos = scmApplyInboundVehicleService.fetchByMainSid(businessSid);
ResultBean<List<String>> sids = scmVehicleExamineService.saveEntryCarInspectedInfoBatch(booad, scmApplyInboundVehicleDtos);
saveItem(sids);
FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(bv.getInstanceId()).getData();
List<FlowTask> flowList = flowRecordVo.getFlowList();
for (FlowTask flowTask : flowList) {
if (flowTask.getTaskName().equals("账务部审批")) {
confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
break;
}else if (flowTask.getTaskName().equals("销售支持部经理审批")) {
confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid();
confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName();
confirmDate = DateUtil.formatDate(flowTask.getFinishTime());
}
}
name = confirmSid + "," + confirmName + "," + confirmDate;
newBaseVehicleDto(booad, scmApplyInboundVehicleDtos, name);
//入账审批通关修改采购订单状态 state = 1
if (booad.getManPurOrderTypeKey().equals(ManPurOrderType.ManOrderType.PC_ORDER.getCode())) {
busVehicleOrderFeign.updateState(booad.getVehicleOrderSid());
}
return resultBean1;
} else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
dto.setVehicleList(scmApplyInboundVehicleDtos2);

Write Preview
Loading…
Cancel
Save