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

开票管理列表显示问题、金融业务变更代码

master
fanzongzhe 2 years ago
parent
185f8e8748
commit
ad73704cd0
4 changed files with 57 additions and 9 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-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussolutionschange/BusSolutionsChangeDetailsVo.java
  2. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java
  3. 58
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeService.java
  4. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussolutionschange/BusSolutionsChangeDetailsVo.java
View File

@ -49,5 +49,5 @@ public class BusSolutionsChangeDetailsVo implements Vo {
private String taskId;
@ApiModelProperty("实例id")
private String instanceId;
private String modelSid;
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java
View File

@ -126,7 +126,7 @@ public class BusSolutionsChangeRest implements BusSolutionsChangeFeign {
@Override
public ResultBean<List<SolutionsGetNodeVo>> getPreviousNodesForReject(SolutionsGetNodeQuery query) {
return busSolutionsChangeService.getNextNodesForSubmit(query);
return busSolutionsChangeService.getPreviousNodesForReject(query);
}

58
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeService.java
View File

@ -30,6 +30,8 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
@ -119,6 +121,8 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
private FlowableFeign flowableFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private BaseVehicleModelFeign baseVehicleModelFeign;
public PagerVo<BusSolutionsChangeVo> listPage(PagerQuery<BusSolutionsChangeQuery> pq) {
IPage<BusSolutionsChange> page = PagerUtil.queryToPage(pq);
@ -262,6 +266,13 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
}
}
}
//车型
BusSalesOrderModel vinModel = busSalesOrderModelService.fetchByOrderSid(salesOrderSid).getData();
if (null != vinModel) {
if (StringUtils.isNotBlank(vinModel.getModelSid())) {
vo.setModelSid(vinModel.getModelSid());
}
}
return rb.success().setData(vo);
}
@ -278,6 +289,9 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
if (StringUtils.isNotBlank(busSolutionsChange.getProcInstId())) {
vo.setInstanceId(busSolutionsChange.getProcInstId());
}
if (StringUtils.isNotBlank(busSolutionsChange.getModelSid())) {
vo.setModelSid(busSolutionsChange.getModelSid());
}
if (StringUtils.isNotBlank(busSolutionsChange.getCreateBySid())) {
vo.setUserSid(busSolutionsChange.getCreateBySid());
}
@ -286,7 +300,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
}
if (StringUtils.isNotBlank(busSolutionsChange.getSolutionsBusSId())) {
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectSolutionsChange(busSolutionsChange.getSolutionsBusSId(),busSolutionsChange.getSalesOrderSid());
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectSolutionsChange(busSolutionsChange.getSolutionsBusSId(), busSolutionsChange.getSalesOrderSid());
if (solutionsDetailsVoResultBean.getData() != null) {
SolutionsVo solutionsDetailsssVo = new
SolutionsVo();
@ -522,6 +536,23 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
Map<String, Object> appMap = new HashMap<>();
// -----------------------------------------
//部门名称<客户>系列-全款/贷款销售订单
String customerName = entity.getCustomerName();
String xilie = "";
if (StringUtils.isNotBlank(entity.getModelSid())) {
ResultBean<BaseVehicleModel> vehicleModelResultBean = baseVehicleModelFeign.selectDetails(entity.getModelSid());
if (vehicleModelResultBean.getData() != null) {
xilie = vehicleModelResultBean.getData().getProductLineValue();
}
}
String orgName = "";
if (StringUtils.isNotBlank(entity.getDept())) {
orgName = entity.getDept();
}
String orderNames = orgName + "<" + customerName + ">" + xilie + "-" + "贷款销售订单" + "-" + "金融方案变更";
variables.put("orderNames", orderNames);
// -------------------------------------------
//若有网关，则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
appMap.put("sid", businessSid);
@ -537,8 +568,8 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
// String nextNodeUserSids_ = sysOrganization.getManagerSid();
// bv.setNextNodeUserSids(nextNodeUserSids_);
//流程定义id
bv.setModelId(ProcDefEnum.BUSSOLUTIONSCHANGE.getProDefId());
if (r == 1) {
@ -1181,6 +1212,23 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
Map<String, Object> appMap = new HashMap<>();
// -----------------------------------------
//部门名称<客户>系列-全款/贷款销售订单
String customerName = entity.getCustomerName();
String xilie = "";
if (StringUtils.isNotBlank(entity.getModelSid())) {
ResultBean<BaseVehicleModel> vehicleModelResultBean = baseVehicleModelFeign.selectDetails(entity.getModelSid());
if (vehicleModelResultBean.getData() != null) {
xilie = vehicleModelResultBean.getData().getProductLineValue();
}
}
String orgName = "";
if (StringUtils.isNotBlank(entity.getDept())) {
orgName = entity.getDept();
}
String orderNames = orgName + "<" + customerName + ">" + xilie + "-" + "贷款销售订单" + "-" + "金融方案变更";
variables.put("orderNames", orderNames);
// -------------------------------------------
//若有网关，则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
appMap.put("sid", businessSid);
@ -1196,8 +1244,8 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
//用户sid
bv.setUserSid(dto.getUserSid());
bv.setFormVariables(variables);
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
// String nextNodeUserSids_ = sysOrganization.getManagerSid();
// bv.setNextNodeUserSids(nextNodeUserSids_);
//流程定义id
bv.setModelId(ProcDefEnum.BUSSOLUTIONSCHANGE.getProDefId());
if (r == 1) {

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
View File

@ -41,7 +41,7 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo">
SELECT DISTINCT
SELECT
v.useOrgSid,
v.sid,
v.`state`,
@ -75,7 +75,7 @@
left join anrui_portal.sys_organization so on v.useOrgSid = so.sid
<where>
${ew.sqlSegment}
ORDER BY v.billingStateKey ASC,v.invoiceDate DESC
ORDER BY v.billingStateKey ASC,v.invoiceDate DESC,v.id
</where>
</select>

Write Preview
Loading…
Cancel
Save