ligaode
5 months ago
59 changed files with 2019 additions and 209 deletions
@ -0,0 +1,38 @@ |
|||||
|
import request from '@/utils/request' |
||||
|
|
||||
|
export default { |
||||
|
// 查询分页列表
|
||||
|
listPage: function(params) { |
||||
|
return request({ |
||||
|
url: '/fin/v1/finpayment/listPage', |
||||
|
method: 'post', |
||||
|
data: params, |
||||
|
headers: { 'Content-Type': 'application/json' } |
||||
|
}) |
||||
|
}, |
||||
|
// 保存修改记录
|
||||
|
saveOrUpdate: function(params) { |
||||
|
return request({ |
||||
|
url: '/fin/v1/finpayment/save', |
||||
|
method: 'post', |
||||
|
data: params, |
||||
|
headers: { 'Content-Type': 'application/json' } |
||||
|
}) |
||||
|
}, |
||||
|
// 通过sid查询一条记录
|
||||
|
fetchBySid: function(sid) { |
||||
|
return request({ |
||||
|
url: '/fin/v1/finpayment/fetchDetailsBySid/' + sid, |
||||
|
method: 'get' |
||||
|
}) |
||||
|
}, |
||||
|
// 通过sid删除一条或多条记录
|
||||
|
delBySids: function(data) { |
||||
|
return request({ |
||||
|
url: '/fin/v1/finpayment/delBySids', |
||||
|
method: 'DELETE', |
||||
|
data: data, |
||||
|
headers: { 'Content-Type': 'application/json' } |
||||
|
}) |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,387 @@ |
|||||
|
<template> |
||||
|
<div class="app-container"> |
||||
|
<!--列表页面--> |
||||
|
<div v-show="viewState == 1"> |
||||
|
<button-bar view-title="付款信息管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/> |
||||
|
<!--Start查询列表部分--> |
||||
|
<div class="main-content"> |
||||
|
<div class="searchcon"> |
||||
|
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> |
||||
|
<div v-show="isSearchShow" class="search"> |
||||
|
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header"> |
||||
|
<el-form-item label="单位名称"> |
||||
|
<el-input v-model="listQuery.params.companyName" placeholder="" clearable/> |
||||
|
</el-form-item> |
||||
|
<el-form-item label="银行账号"> |
||||
|
<el-input v-model="listQuery.params.receivingAccount" placeholder="" clearable/> |
||||
|
</el-form-item> |
||||
|
<el-form-item label="业务类型"> |
||||
|
<el-input v-model="listQuery.params.businessTypeValue" placeholder="" clearable/> |
||||
|
</el-form-item> |
||||
|
</el-form> |
||||
|
<div class="btn" style="text-align: center;"> |
||||
|
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button> |
||||
|
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<!--End查询列表部分--> |
||||
|
<div class="listtop"> |
||||
|
<div class="tit">付款信息列表</div> |
||||
|
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> |
||||
|
</div> |
||||
|
<!--Start 主页面主要部分 --> |
||||
|
<div class=""> |
||||
|
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange"> |
||||
|
<el-table-column fixed type="selection" align="center" width="50"/> |
||||
|
<el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/> |
||||
|
<el-table-column fixed label="操作" width="180px" align="center"> |
||||
|
<template slot-scope="scope"> |
||||
|
<el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button> |
||||
|
</template> |
||||
|
</el-table-column> |
||||
|
<el-table-column prop="companyCode" label="单位编码" align="center" /> |
||||
|
<el-table-column prop="companyName" label="单位名称" align="center" /> |
||||
|
<el-table-column prop="bank" label="开户行" align="center" /> |
||||
|
<el-table-column prop="receivingAccount" label="银行账号" align="center" /> |
||||
|
<el-table-column prop="businessTypeValue" label="业务类型" align="center" /> |
||||
|
<el-table-column prop="remarks" label="备注" align="center" /> |
||||
|
</el-table> |
||||
|
</div> |
||||
|
<!--End 主页面主要部分--> |
||||
|
<div class="pages"> |
||||
|
<div class="tit"/> |
||||
|
<!-- 翻页 --> |
||||
|
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> |
||||
|
</div> |
||||
|
<!--End查询列表部分--> |
||||
|
</div> |
||||
|
</div> |
||||
|
<el-dialog center :visible.sync="dialogVisible" width="70%"> |
||||
|
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> |
||||
|
<el-row style="border-top: 1px solid #E0E3EB"> |
||||
|
<el-col :span="12"> |
||||
|
<div class="span-sty">单位编码</div> |
||||
|
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.companyCode" clearable placeholder="" /></el-form-item> |
||||
|
</el-col> |
||||
|
<el-col :span="12"> |
||||
|
<div class="span-sty">单位名称</div> |
||||
|
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.companyName" clearable placeholder="" /></el-form-item> |
||||
|
</el-col> |
||||
|
</el-row> |
||||
|
<el-row> |
||||
|
<el-col :span="12"> |
||||
|
<div class="span-sty">开户行</div> |
||||
|
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bank" clearable placeholder="" /></el-form-item> |
||||
|
</el-col> |
||||
|
<el-col :span="12"> |
||||
|
<div class="span-sty">银行账号</div> |
||||
|
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.receivingAccount" clearable placeholder="" /></el-form-item> |
||||
|
</el-col> |
||||
|
</el-row> |
||||
|
<el-row> |
||||
|
<el-col :span="12"> |
||||
|
<div class="span-sty">业务类型</div> |
||||
|
<el-form-item> |
||||
|
<el-select class="addinputInfo" v-model="formobj.businessTypeValue" placeholder="请选择" @change="businessTypeChange" clearable filterable> |
||||
|
<el-option v-for="item in businessType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option> |
||||
|
</el-select> |
||||
|
</el-form-item> |
||||
|
</el-col> |
||||
|
<el-col :span="12"> |
||||
|
<div class="span-sty">备注</div> |
||||
|
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item> |
||||
|
</el-col> |
||||
|
</el-row> |
||||
|
</el-form> |
||||
|
<div slot="footer" class="dialog-footer" style="text-align: center"> |
||||
|
<el-button type="primary" size="small" @click="handleConfirm">确定</el-button> |
||||
|
<el-button size="small" @click="handleClose">取消</el-button> |
||||
|
</div> |
||||
|
</el-dialog> |
||||
|
</div> |
||||
|
</template> |
||||
|
|
||||
|
<script> |
||||
|
import Pagination from '@/components/pagination' |
||||
|
import pageye from '@/components/pagination/pageye' |
||||
|
import ButtonBar from '@/components/ButtonBar' |
||||
|
import req from '@/api/anruifinmanagement/paymentInformation' |
||||
|
import { typeValues, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons' |
||||
|
|
||||
|
export default { |
||||
|
name: 'PaymentInformation', |
||||
|
components: { |
||||
|
Pagination, |
||||
|
pageye, |
||||
|
ButtonBar |
||||
|
}, |
||||
|
data() { |
||||
|
return { |
||||
|
dialogVisible: false, |
||||
|
businessType_list: [], |
||||
|
formobj: { |
||||
|
companyCode: '', // 单位编码 |
||||
|
companyName: '', // 单位名称 |
||||
|
bank: '', // 开户行 |
||||
|
receivingAccount: '', // 收款银行账号 |
||||
|
businessTypeKey: '', // 业务类型key |
||||
|
businessTypeValue: '', // 业务类型value |
||||
|
remarks: '', // 备注 |
||||
|
useOrgSid: '', // 分公司sid |
||||
|
useOrgName: '' |
||||
|
}, |
||||
|
rules: {}, |
||||
|
btndisabled: false, |
||||
|
btnList: [ |
||||
|
{ |
||||
|
type: 'primary', |
||||
|
size: 'small', |
||||
|
icon: 'plus', |
||||
|
btnKey: 'toAdd', |
||||
|
btnLabel: '新增' |
||||
|
}, |
||||
|
{ |
||||
|
type: 'danger', |
||||
|
size: 'small', |
||||
|
icon: 'del', |
||||
|
btnKey: 'doDel', |
||||
|
btnLabel: '删除' |
||||
|
}, |
||||
|
{ |
||||
|
type: 'info', |
||||
|
size: 'small', |
||||
|
icon: 'cross', |
||||
|
btnKey: 'doClose', |
||||
|
btnLabel: '关闭' |
||||
|
} |
||||
|
], |
||||
|
isSearchShow: false, |
||||
|
searchxianshitit: '显示查询条件', |
||||
|
viewState: 1, // 1、列表 2、新增 3、编辑 4、查看 |
||||
|
tableKey: 0, |
||||
|
list: [], |
||||
|
sids: [], // 用于导出的时候保存已选择的SIDs |
||||
|
listLoading: false, |
||||
|
// 翻页 |
||||
|
listQuery: { |
||||
|
current: 1, |
||||
|
size: 5, |
||||
|
total: 0, |
||||
|
params: { |
||||
|
companyCode: '', |
||||
|
companyName: '', |
||||
|
businessTypeValue: '', |
||||
|
orgPath: '', |
||||
|
menuUrl: '', |
||||
|
userSid: '' |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
}, |
||||
|
created() { |
||||
|
// 初始化变量 |
||||
|
this.init() |
||||
|
this.getList() |
||||
|
}, |
||||
|
mounted() { |
||||
|
this.$refs['btnbar'].setButtonList(this.btnList) |
||||
|
}, |
||||
|
methods: { |
||||
|
init() { |
||||
|
typeValues({ type: 'cw_businessType' }).then((res) => { |
||||
|
if (res.success) { |
||||
|
this.businessType_list = res.data |
||||
|
} |
||||
|
}) |
||||
|
}, |
||||
|
// 搜索条件效果 |
||||
|
clicksearchShow() { |
||||
|
this.isSearchShow = !this.isSearchShow |
||||
|
if (this.isSearchShow) { |
||||
|
this.searchxianshitit = '隐藏查询条件' |
||||
|
} else { |
||||
|
this.searchxianshitit = '显示查询条件' |
||||
|
} |
||||
|
}, |
||||
|
btnHandle(btnKey) { |
||||
|
console.log('XXXXXXXXXXXXXXX ' + btnKey) |
||||
|
switch (btnKey) { |
||||
|
case 'toAdd': |
||||
|
this.toAdd() |
||||
|
break |
||||
|
case 'doDel': |
||||
|
this.doDel() |
||||
|
break |
||||
|
case 'doClose': |
||||
|
this.doClose() |
||||
|
break |
||||
|
default: |
||||
|
break |
||||
|
} |
||||
|
}, |
||||
|
// 信息条数 获取点击时当前的sid |
||||
|
handleSelectionChange(row) { |
||||
|
const aa = [] |
||||
|
row.forEach(element => { |
||||
|
aa.push(element.sid) |
||||
|
}) |
||||
|
this.sids = aa |
||||
|
}, |
||||
|
// 表中序号 |
||||
|
indexMethod(index) { |
||||
|
var pagestart = (this.listQuery.current - 1) * this.listQuery.size |
||||
|
var pageindex = index + 1 + pagestart |
||||
|
return pageindex |
||||
|
}, |
||||
|
// 查询列表信息 |
||||
|
getList() { |
||||
|
this.listLoading = true |
||||
|
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') |
||||
|
this.listQuery.params.menuUrl = this.$route.path |
||||
|
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') |
||||
|
req.listPage(this.listQuery).then(response => { |
||||
|
this.listLoading = false |
||||
|
if (response.success) { |
||||
|
this.list = response.data.records |
||||
|
this.listQuery.total = response.data.total |
||||
|
} else { |
||||
|
this.list = [] |
||||
|
this.listQuery.total = 0 |
||||
|
} |
||||
|
}) |
||||
|
}, |
||||
|
// 查询按钮 |
||||
|
handleFilter() { |
||||
|
this.listQuery.current = 1 |
||||
|
this.getList() |
||||
|
}, |
||||
|
// 点击重置 |
||||
|
handleReset() { |
||||
|
this.listQuery = { |
||||
|
current: 1, |
||||
|
size: 5, |
||||
|
total: 0, |
||||
|
params: { |
||||
|
companyCode: '', |
||||
|
companyName: '', |
||||
|
businessTypeValue: '', |
||||
|
orgPath: '', |
||||
|
menuUrl: '', |
||||
|
userSid: '' |
||||
|
} |
||||
|
} |
||||
|
this.getList() |
||||
|
}, |
||||
|
toAdd() { |
||||
|
this.dialogVisible = true |
||||
|
this.$nextTick(() => { |
||||
|
this.$refs['form_obj'].clearValidate() |
||||
|
}) |
||||
|
}, |
||||
|
toEdit(row) { |
||||
|
this.dialogVisible = true |
||||
|
this.$nextTick(() => { |
||||
|
this.$refs['form_obj'].clearValidate() |
||||
|
}) |
||||
|
req.fetchBySid(row.sid).then((res) => { |
||||
|
if (res.success) { |
||||
|
this.formobj = res.data |
||||
|
} |
||||
|
}) |
||||
|
}, |
||||
|
businessTypeChange(value) { |
||||
|
const choose = this.businessType_list.filter((item) => item.dictValue === value) |
||||
|
if (choose !== null && choose.length > 0) { |
||||
|
this.formobj.businessTypeKey = choose[0].dictKey |
||||
|
} else { |
||||
|
this.formobj.businessTypeKey = '' |
||||
|
} |
||||
|
}, |
||||
|
handleConfirm() { |
||||
|
this.formobj.createBySid = window.sessionStorage.getItem('userSid') |
||||
|
this.formobj.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) |
||||
|
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { |
||||
|
if (res.success) { |
||||
|
this.formobj.createOrgSid = res.data |
||||
|
this.$refs['form_obj'].validate((valid) => { |
||||
|
if (valid) { |
||||
|
req.saveOrUpdate(this.formobj).then((resp) => { |
||||
|
if (resp.success) { |
||||
|
this.$message({ showClose: true, type: 'success', message: '保存成功' }) |
||||
|
this.getList() |
||||
|
this.handleClose() |
||||
|
} |
||||
|
}) |
||||
|
} |
||||
|
}) |
||||
|
} |
||||
|
}) |
||||
|
}, |
||||
|
handleClose() { |
||||
|
this.dialogVisible = false |
||||
|
this.$refs['form_obj'].resetFields() |
||||
|
this.formobj = { |
||||
|
companyCode: '', // 单位编码 |
||||
|
companyName: '', // 单位名称 |
||||
|
bank: '', // 开户行 |
||||
|
receivingAccount: '', // 收款银行账号 |
||||
|
businessTypeKey: '', // 业务类型key |
||||
|
businessTypeValue: '', // 业务类型value |
||||
|
remarks: '', // 备注 |
||||
|
useOrgSid: '', // 分公司sid |
||||
|
useOrgName: '' |
||||
|
} |
||||
|
}, |
||||
|
// 删除 |
||||
|
doDel() { |
||||
|
if (this.sids.length === 0) { |
||||
|
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) |
||||
|
return |
||||
|
} |
||||
|
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' |
||||
|
this.$confirm(tip, '提示', { |
||||
|
confirmButtonText: '确定', |
||||
|
cancelButtonText: '取消', |
||||
|
type: 'warning' |
||||
|
}).then(() => { |
||||
|
const loading = this.$loading({ |
||||
|
lock: true, |
||||
|
text: 'Loading', |
||||
|
spinner: 'el-icon-loading', |
||||
|
background: 'rgba(0, 0, 0, 0.7)' |
||||
|
}) |
||||
|
req.delBySids(this.sids).then(resp => { |
||||
|
if (resp.success) { |
||||
|
this.$message({ type: 'success', message: resp.msg, showClose: true }) |
||||
|
} |
||||
|
this.getList() |
||||
|
loading.close() |
||||
|
}).catch(e => { |
||||
|
loading.close() |
||||
|
}) |
||||
|
}).catch(() => { |
||||
|
}) |
||||
|
}, |
||||
|
doClose() { |
||||
|
this.$store.dispatch('tagsView/delView', this.$route) |
||||
|
this.$router.go(-1) |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
</script> |
||||
|
<style scoped> |
||||
|
.span-sty { |
||||
|
width: 80px !important; |
||||
|
} |
||||
|
.addinputInfo { |
||||
|
margin-left: 75px !important; |
||||
|
} |
||||
|
/deep/ .el-form-item__error { |
||||
|
margin-left: 75px !important; |
||||
|
} |
||||
|
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { |
||||
|
margin-left: 75px !important; |
||||
|
width: calc(100% - 70px); |
||||
|
} |
||||
|
</style> |
||||
@ -1,4 +1,4 @@ |
|||||
package com.yxt.anrui.portal.api.sysstafforg; |
package com.yxt.anrui.portal.api.sysorganization; |
||||
|
|
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
@ -0,0 +1,78 @@ |
|||||
|
package com.yxt.anrui.scm.api.scmfinanceadjustapply.app; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
@Data |
||||
|
public class AppDetailsVo { |
||||
|
|
||||
|
private String sid; |
||||
|
/** |
||||
|
* 调整方式 |
||||
|
*/ |
||||
|
private String adjustWay; |
||||
|
/** |
||||
|
* 申请编号 |
||||
|
*/ |
||||
|
private String billNo; |
||||
|
/** |
||||
|
* 申请人姓名 |
||||
|
*/ |
||||
|
private String createByName; |
||||
|
/** |
||||
|
* 申请日期 |
||||
|
*/ |
||||
|
private String createTime; |
||||
|
/** |
||||
|
* 附件 |
||||
|
*/ |
||||
|
private List<String> files; |
||||
|
/** |
||||
|
* 明细列表 |
||||
|
*/ |
||||
|
private List<AppListVo> list; |
||||
|
private String procInsId; |
||||
|
/** |
||||
|
* 分公司-部门 |
||||
|
*/ |
||||
|
private String publishInfo; |
||||
|
/** |
||||
|
* 备注 |
||||
|
*/ |
||||
|
private String remarks; |
||||
|
/** |
||||
|
* 销售经理 |
||||
|
*/ |
||||
|
private String salesManage; |
||||
|
/** |
||||
|
* 销售专员 |
||||
|
*/ |
||||
|
private String staffName; |
||||
|
private String taskId; |
||||
|
/** |
||||
|
* 差额 |
||||
|
*/ |
||||
|
private String adjustmentMoneyTotal; |
||||
|
/** |
||||
|
* 已调整金额 |
||||
|
*/ |
||||
|
private String alreadyMoneyTotal; |
||||
|
/** |
||||
|
* 订单贴息金额 |
||||
|
*/ |
||||
|
private String estimateRebateTotal; |
||||
|
/** |
||||
|
* 本次调整金额 |
||||
|
*/ |
||||
|
private String nowAdjustmentMoneyTotal; |
||||
|
/** |
||||
|
* 当前差额 |
||||
|
*/ |
||||
|
private String nowDiffAmountTotal; |
||||
|
/** |
||||
|
* 上传贴息金额 |
||||
|
*/ |
||||
|
private String uploadMoneyTotal; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,64 @@ |
|||||
|
package com.yxt.anrui.scm.api.scmfinanceadjustapply.app; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
@Data |
||||
|
public class AppListVo { |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* 差额 |
||||
|
*/ |
||||
|
private String adjustmentMoney; |
||||
|
/** |
||||
|
* 已调整金额 |
||||
|
*/ |
||||
|
private String alreadyMoney; |
||||
|
/** |
||||
|
* 品牌 |
||||
|
*/ |
||||
|
private String brandName; |
||||
|
/** |
||||
|
* 合同号 |
||||
|
*/ |
||||
|
private String contractNo; |
||||
|
/** |
||||
|
* 客户 |
||||
|
*/ |
||||
|
private String customerName; |
||||
|
/** |
||||
|
* 订单贴息金额 |
||||
|
*/ |
||||
|
private String estimateRebate; |
||||
|
/** |
||||
|
* 本次调整金额 |
||||
|
*/ |
||||
|
private String nowAdjustmentMoney; |
||||
|
/** |
||||
|
* 当前差额 |
||||
|
*/ |
||||
|
private String nowDiffAmount; |
||||
|
|
||||
|
/** |
||||
|
* 采购系统名称 |
||||
|
*/ |
||||
|
private String purchaseSystemName; |
||||
|
/** |
||||
|
* 调整说明 |
||||
|
*/ |
||||
|
private String remarks; |
||||
|
/** |
||||
|
* 上传贴息金额 |
||||
|
*/ |
||||
|
private String uploadMoney; |
||||
|
/** |
||||
|
* 车型 |
||||
|
*/ |
||||
|
private String vehModelName; |
||||
|
/** |
||||
|
* 车架号 |
||||
|
*/ |
||||
|
private String vinNo; |
||||
|
|
||||
|
private String salesOrderSid; |
||||
|
} |
||||
@ -0,0 +1,82 @@ |
|||||
|
package com.yxt.anrui.terminal.api.supplychain.financeadjustapply; |
||||
|
|
||||
|
import com.yxt.common.core.vo.Vo; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author Administrator |
||||
|
* @description |
||||
|
* @date 2023/11/13 15:38 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class AdjustApplyDetailsVo implements Vo { |
||||
|
private String sid; |
||||
|
/** |
||||
|
* 调整方式 |
||||
|
*/ |
||||
|
private String adjustWay; |
||||
|
/** |
||||
|
* 申请编号 |
||||
|
*/ |
||||
|
private String billNo; |
||||
|
/** |
||||
|
* 申请人姓名 |
||||
|
*/ |
||||
|
private String createByName; |
||||
|
/** |
||||
|
* 申请日期 |
||||
|
*/ |
||||
|
private String createTime; |
||||
|
/** |
||||
|
* 附件 |
||||
|
*/ |
||||
|
private List<String> files; |
||||
|
/** |
||||
|
* 明细列表 |
||||
|
*/ |
||||
|
private List<AdjustApplyRecordVo> list; |
||||
|
private String procInsId; |
||||
|
/** |
||||
|
* 分公司-部门 |
||||
|
*/ |
||||
|
private String publishInfo; |
||||
|
/** |
||||
|
* 备注 |
||||
|
*/ |
||||
|
private String remarks; |
||||
|
/** |
||||
|
* 销售经理 |
||||
|
*/ |
||||
|
private String salesManage; |
||||
|
/** |
||||
|
* 销售专员 |
||||
|
*/ |
||||
|
private String staffName; |
||||
|
private String taskId; |
||||
|
/** |
||||
|
* 差额 |
||||
|
*/ |
||||
|
private String adjustmentMoneyTotal; |
||||
|
/** |
||||
|
* 已调整金额 |
||||
|
*/ |
||||
|
private String alreadyMoneyTotal; |
||||
|
/** |
||||
|
* 订单贴息金额 |
||||
|
*/ |
||||
|
private String estimateRebateTotal; |
||||
|
/** |
||||
|
* 本次调整金额 |
||||
|
*/ |
||||
|
private String nowAdjustmentMoneyTotal; |
||||
|
/** |
||||
|
* 当前差额 |
||||
|
*/ |
||||
|
private String nowDiffAmountTotal; |
||||
|
/** |
||||
|
* 上传贴息金额 |
||||
|
*/ |
||||
|
private String uploadMoneyTotal; |
||||
|
} |
||||
@ -0,0 +1,72 @@ |
|||||
|
package com.yxt.anrui.terminal.api.supplychain.financeadjustapply; |
||||
|
|
||||
|
|
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import io.swagger.annotations.Api; |
||||
|
import io.swagger.annotations.ApiOperation; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.cloud.openfeign.SpringQueryMap; |
||||
|
import org.springframework.web.bind.annotation.*; |
||||
|
|
||||
|
import javax.validation.Valid; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: fzz |
||||
|
* @date: 2023/8/8 |
||||
|
**/ |
||||
|
@Api(tags = "金融贴息差异调整") |
||||
|
@FeignClient( |
||||
|
contextId = "terminal-financeadjustapply", |
||||
|
name = "anrui-terminal", |
||||
|
path = "/v1/financeadjustapply", |
||||
|
fallback = AdjustApplyFeignFallback.class) |
||||
|
public interface AdjustApplyFeign { |
||||
|
|
||||
|
|
||||
|
@ApiOperation("详情") |
||||
|
@GetMapping("/fetchDetailsBySid/{sid}") |
||||
|
@ResponseBody |
||||
|
ResultBean<AdjustApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid); |
||||
|
|
||||
|
//-------------------------流程-----------------------------------------
|
||||
|
|
||||
|
@ApiOperation("办理") |
||||
|
@PutMapping("/agreeCreditInfo") |
||||
|
@ResponseBody |
||||
|
ResultBean agreeCreditInfo(@Valid @RequestBody CompleteAdjustApplyDto dto); |
||||
|
|
||||
|
@ApiOperation("驳回") |
||||
|
@PutMapping("/rejectCreditInfo") |
||||
|
@ResponseBody |
||||
|
ResultBean rejectCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query); |
||||
|
|
||||
|
@ApiOperation("撤回") |
||||
|
@PutMapping("/recallCreditInfo") |
||||
|
@ResponseBody |
||||
|
ResultBean recallCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query); |
||||
|
|
||||
|
@ApiOperation("终止") |
||||
|
@PutMapping("/stopCreditInfo") |
||||
|
@ResponseBody |
||||
|
ResultBean stopCreditInfo(@Valid @RequestBody AppAdjustApplyTaskQuery query); |
||||
|
|
||||
|
@ApiOperation("获取流程操作标题") |
||||
|
@GetMapping("/getFlowOperateTitle") |
||||
|
@ResponseBody |
||||
|
ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap AdjustApplyFlowableQuery query); |
||||
|
|
||||
|
@ApiOperation(value = "加签") |
||||
|
@PutMapping(value = "/delegate") |
||||
|
@ResponseBody |
||||
|
public ResultBean delegate(@RequestBody AppAdjustApplyDelegateQuery delegateQuery); |
||||
|
|
||||
|
@ApiOperation(value = "转办") |
||||
|
@PutMapping(value = "/assignTask") |
||||
|
@ResponseBody |
||||
|
public ResultBean assignTask(@RequestBody AppAdjustApplyDelegateQuery delegateQuery); |
||||
|
} |
||||
@ -0,0 +1,57 @@ |
|||||
|
package com.yxt.anrui.terminal.api.supplychain.financeadjustapply; |
||||
|
|
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import org.springframework.stereotype.Component; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: fzz |
||||
|
* @date: |
||||
|
**/ |
||||
|
@Component |
||||
|
public class AdjustApplyFeignFallback implements AdjustApplyFeign { |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean<AdjustApplyDetailsVo> fetchDetailsBySid(String sid) { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean<String> getFlowOperateTitle(AdjustApplyFlowableQuery query) { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) { |
||||
|
return null; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) { |
||||
|
return null; |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,72 @@ |
|||||
|
package com.yxt.anrui.terminal.api.supplychain.financeadjustapply; |
||||
|
|
||||
|
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author Administrator |
||||
|
* @description |
||||
|
* @date 2023/11/13 15:45 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class AdjustApplyRecordVo { |
||||
|
/** |
||||
|
* 差额 |
||||
|
*/ |
||||
|
private String adjustmentMoney; |
||||
|
/** |
||||
|
* 已调整金额 |
||||
|
*/ |
||||
|
private String alreadyMoney; |
||||
|
/** |
||||
|
* 品牌 |
||||
|
*/ |
||||
|
private String brandName; |
||||
|
/** |
||||
|
* 合同号 |
||||
|
*/ |
||||
|
private String contractNo; |
||||
|
/** |
||||
|
* 客户 |
||||
|
*/ |
||||
|
private String customerName; |
||||
|
/** |
||||
|
* 订单贴息金额 |
||||
|
*/ |
||||
|
private String estimateRebate; |
||||
|
/** |
||||
|
* 本次调整金额 |
||||
|
*/ |
||||
|
private String nowAdjustmentMoney; |
||||
|
/** |
||||
|
* 当前差额 |
||||
|
*/ |
||||
|
private String nowDiffAmount; |
||||
|
|
||||
|
/** |
||||
|
* 采购系统名称 |
||||
|
*/ |
||||
|
private String purchaseSystemName; |
||||
|
/** |
||||
|
* 调整说明 |
||||
|
*/ |
||||
|
private String remarks; |
||||
|
/** |
||||
|
* 上传贴息金额 |
||||
|
*/ |
||||
|
private String uploadMoney; |
||||
|
/** |
||||
|
* 车型 |
||||
|
*/ |
||||
|
private String vehModelName; |
||||
|
/** |
||||
|
* 车架号 |
||||
|
*/ |
||||
|
private String vinNo; |
||||
|
|
||||
|
private String salesOrderSid; |
||||
|
|
||||
|
@ApiModelProperty("销售订单页面") |
||||
|
private AppLoanHomeVisitVo orderPage; |
||||
|
} |
||||
@ -0,0 +1,21 @@ |
|||||
|
package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotNull; |
||||
|
|
||||
|
@Data |
||||
|
public class AdjustApplyFlowableQuery implements Query { |
||||
|
private static final long serialVersionUID = -5879668616710833830L; |
||||
|
|
||||
|
@ApiModelProperty(value = "节点key") |
||||
|
private String taskDefKey; |
||||
|
@ApiModelProperty(value = "业务sid") |
||||
|
private String businessSid; |
||||
|
@ApiModelProperty(value = "0 上一环节 1下一环节") |
||||
|
@NotNull(message = "参数错误：next") |
||||
|
private Integer next; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,25 @@ |
|||||
|
package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow; |
||||
|
|
||||
|
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author Administrator |
||||
|
* @description |
||||
|
* @date 2023/9/28 10:16 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class AppAdjustApplyDelegateQuery { |
||||
|
@ApiModelProperty |
||||
|
private String userSid; |
||||
|
@ApiModelProperty("流程实例id") |
||||
|
@JsonProperty("procInsId") |
||||
|
private String instanceId; |
||||
|
@ApiModelProperty("任务Id") |
||||
|
private String taskId; |
||||
|
@ApiModelProperty("审批人sid") |
||||
|
private String assignee; |
||||
|
@ApiModelProperty("填写意见") |
||||
|
private String views; |
||||
|
} |
||||
@ -0,0 +1,46 @@ |
|||||
|
package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow; |
||||
|
|
||||
|
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
|
||||
|
/** |
||||
|
* @author Administrator |
||||
|
* @description |
||||
|
* @date 2023/10/17 9:14 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class AppAdjustApplyTaskQuery implements Query { |
||||
|
/** |
||||
|
* 终止、驳回、撤回 |
||||
|
*/ |
||||
|
@ApiModelProperty("任务Id") |
||||
|
@NotBlank(message = "参数错误：taskId") |
||||
|
private String taskId; |
||||
|
/** |
||||
|
* 终止、驳回、撤回 |
||||
|
*/ |
||||
|
@ApiModelProperty("业务sid") |
||||
|
@NotBlank(message = "参数错误：businessSid") |
||||
|
private String businessSid; |
||||
|
/** |
||||
|
* 终止、驳回 |
||||
|
*/ |
||||
|
@ApiModelProperty("任务意见") |
||||
|
private String comment; |
||||
|
/** |
||||
|
* 终止、撤回、驳回 |
||||
|
*/ |
||||
|
@ApiModelProperty("用户Sid") |
||||
|
private String userSid; |
||||
|
/** |
||||
|
* 终止 |
||||
|
*/ |
||||
|
@ApiModelProperty("流程实例Id") |
||||
|
@JsonProperty("procInsId") |
||||
|
private String instanceId; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,35 @@ |
|||||
|
package com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow; |
||||
|
|
||||
|
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
|
import com.yxt.common.core.dto.Dto; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
|
||||
|
/** |
||||
|
* @author Administrator |
||||
|
* @description |
||||
|
* @date 2023/10/17 9:13 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class CompleteAdjustApplyDto implements Dto { |
||||
|
@ApiModelProperty(value = "任务id") |
||||
|
@NotBlank(message = "参数错误：taskId") |
||||
|
private String taskId; |
||||
|
@ApiModelProperty(value = "流程id") |
||||
|
@NotBlank(message = "参数错误：procInsId") |
||||
|
@JsonProperty("procInsId") |
||||
|
private String instanceId; |
||||
|
@ApiModelProperty(value = "意见") |
||||
|
private String comment; |
||||
|
@ApiModelProperty(value = "业务sid") |
||||
|
@NotBlank(message = "参数错误：businessSid") |
||||
|
private String businessSid; |
||||
|
@ApiModelProperty(value = "用户sid") |
||||
|
@NotBlank(message = "参数错误：userSid") |
||||
|
private String userSid; |
||||
|
@ApiModelProperty(value = "节点id") |
||||
|
@NotBlank(message = "参数错误：taskDefKey") |
||||
|
private String taskDefKey; |
||||
|
} |
||||
@ -0,0 +1,67 @@ |
|||||
|
package com.yxt.anrui.terminal.biz.supplychain.financeadjustapply; |
||||
|
|
||||
|
|
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyDetailsVo; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyFeign; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Controller; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: fzz |
||||
|
* @date: |
||||
|
**/ |
||||
|
@Controller |
||||
|
@RequestMapping("/v1/financeadjustapply") |
||||
|
public class AdjustApplyRest implements AdjustApplyFeign { |
||||
|
|
||||
|
@Autowired |
||||
|
private AdjustApplyService adjustApplyService; |
||||
|
|
||||
|
|
||||
|
@Override |
||||
|
public ResultBean<AdjustApplyDetailsVo> fetchDetailsBySid(String sid) { |
||||
|
return adjustApplyService.detail(sid); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) { |
||||
|
return adjustApplyService.agreeCreditInfo(dto); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
return adjustApplyService.rejectCreditInfo(query); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
return adjustApplyService.recallCreditInfo(query); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
return adjustApplyService.stopCreditInfo(query); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean<String> getFlowOperateTitle(AdjustApplyFlowableQuery query) { |
||||
|
return adjustApplyService.getFlowOperateTitle(query); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) { |
||||
|
return adjustApplyService.delegate(delegateQuery); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) { |
||||
|
return adjustApplyService.assignTask(delegateQuery); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,178 @@ |
|||||
|
package com.yxt.anrui.terminal.biz.supplychain.financeadjustapply; |
||||
|
|
||||
|
|
||||
|
import cn.hutool.core.bean.BeanUtil; |
||||
|
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.anrui.scm.api.scmfinanceadjustapply.ScmFinanceAdjustApplyFeign; |
||||
|
import com.yxt.anrui.scm.api.scmfinanceadjustapply.app.AppDetailsVo; |
||||
|
import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*; |
||||
|
import com.yxt.anrui.terminal.api.base.common.CarModelVo; |
||||
|
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyDetailsVo; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.AdjustApplyRecordVo; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AdjustApplyFlowableQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyDelegateQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.AppAdjustApplyTaskQuery; |
||||
|
import com.yxt.anrui.terminal.api.supplychain.financeadjustapply.flow.CompleteAdjustApplyDto; |
||||
|
import com.yxt.anrui.terminal.biz.base.common.CommonService; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
|
||||
|
import java.util.Collections; |
||||
|
import java.util.List; |
||||
|
import java.util.Map; |
||||
|
import java.util.stream.Collectors; |
||||
|
|
||||
|
/** |
||||
|
* @description: |
||||
|
* @author: fzz |
||||
|
* @date: |
||||
|
**/ |
||||
|
@Service |
||||
|
public class AdjustApplyService { |
||||
|
|
||||
|
@Autowired |
||||
|
private SysUserFeign sysUserFeign; |
||||
|
@Autowired |
||||
|
private SysStaffOrgFeign sysStaffOrgFeign; |
||||
|
@Autowired |
||||
|
private ScmFinanceAdjustApplyFeign scmFinanceAdjustApplyFeign; |
||||
|
@Autowired |
||||
|
private CommonService commonService; |
||||
|
public ResultBean<AdjustApplyDetailsVo> detail(String sid) { |
||||
|
ResultBean<AdjustApplyDetailsVo> rb = ResultBean.fireFail(); |
||||
|
AdjustApplyDetailsVo vo = new AdjustApplyDetailsVo(); |
||||
|
AppDetailsVo data = scmFinanceAdjustApplyFeign.getAppDetails(sid).getData(); |
||||
|
if (null != data) { |
||||
|
BeanUtil.copyProperties(data, vo); |
||||
|
List<AdjustApplyRecordVo> list = vo.getList(); |
||||
|
if (!list.isEmpty() && list.size() > 0) { |
||||
|
List<String> orderSids = list.stream().map(AdjustApplyRecordVo::getSalesOrderSid).collect(Collectors.toList()); |
||||
|
Map<String, CarModelVo> voMap = commonService.getOrderListByOrderSids(orderSids).getData(); |
||||
|
if (!voMap.isEmpty()) { |
||||
|
for (AdjustApplyRecordVo recordVo : list) { |
||||
|
CarModelVo carModelVo = voMap.get(recordVo.getSalesOrderSid()); |
||||
|
AppLoanHomeVisitVo appOrderVo = new AppLoanHomeVisitVo(); |
||||
|
BeanUtil.copyProperties(carModelVo,appOrderVo); |
||||
|
recordVo.setOrderPage(appOrderVo); |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
return rb.success().setData(vo); |
||||
|
} |
||||
|
|
||||
|
|
||||
|
public ResultBean agreeCreditInfo(CompleteAdjustApplyDto dto) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
//根据用户sid获取staffSid
|
||||
|
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); |
||||
|
if (!userVoResultBean.getSuccess()) { |
||||
|
return rb.setMsg(userVoResultBean.getMsg()); |
||||
|
} |
||||
|
//根据staffSid获取用户的组织全路径
|
||||
|
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); |
||||
|
if (!staffOrgResultBean.getSuccess()) { |
||||
|
return rb.setMsg(staffOrgResultBean.getMsg()); |
||||
|
} |
||||
|
//用户的组织全路径
|
||||
|
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); |
||||
|
AdjustCompleteDto completeDto = new |
||||
|
AdjustCompleteDto(); |
||||
|
BeanUtil.copyProperties(dto, completeDto); |
||||
|
completeDto.setOrgSidPath(orgSidPath); |
||||
|
ResultBean resultBean = scmFinanceAdjustApplyFeign.complete(completeDto); |
||||
|
if (!resultBean.getSuccess()) { |
||||
|
return rb.setMsg(resultBean.getMsg()); |
||||
|
} |
||||
|
return rb.success().setData(resultBean.getData()); |
||||
|
} |
||||
|
|
||||
|
public ResultBean rejectCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
AdjustTaskQuery taskQuery = new |
||||
|
AdjustTaskQuery(); |
||||
|
BeanUtil.copyProperties(query, taskQuery); |
||||
|
ResultBean resultBean = scmFinanceAdjustApplyFeign.taskReject(taskQuery); |
||||
|
if (!resultBean.getSuccess()) { |
||||
|
return rb.setMsg(resultBean.getMsg()); |
||||
|
} |
||||
|
return rb.success().setData(resultBean.getData()); |
||||
|
} |
||||
|
|
||||
|
public ResultBean recallCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
AdjustTaskQuery taskQuery = new |
||||
|
AdjustTaskQuery(); |
||||
|
BeanUtil.copyProperties(query, taskQuery); |
||||
|
ResultBean resultBean = scmFinanceAdjustApplyFeign.revokeProcess(taskQuery); |
||||
|
if (!resultBean.getSuccess()) { |
||||
|
return rb.setMsg(resultBean.getMsg()); |
||||
|
} |
||||
|
return rb.success().setData(resultBean.getData()); |
||||
|
} |
||||
|
|
||||
|
public ResultBean stopCreditInfo(AppAdjustApplyTaskQuery query) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
AdjustTaskQuery taskQuery = new |
||||
|
AdjustTaskQuery(); |
||||
|
BeanUtil.copyProperties(query, taskQuery); |
||||
|
ResultBean resultBean = scmFinanceAdjustApplyFeign.breakProcess(taskQuery); |
||||
|
if (!resultBean.getSuccess()) { |
||||
|
return rb.setMsg(resultBean.getMsg()); |
||||
|
} |
||||
|
return rb.success().setData(resultBean.getData()); |
||||
|
} |
||||
|
|
||||
|
public ResultBean<String> getFlowOperateTitle(AdjustApplyFlowableQuery query) { |
||||
|
ResultBean<String> rb = ResultBean.fireFail(); |
||||
|
//0 上一环节 1下一环节
|
||||
|
int next = query.getNext(); |
||||
|
AdjustGetNodeQuery getNodeQuery = new |
||||
|
AdjustGetNodeQuery(); |
||||
|
BeanUtil.copyProperties(query, getNodeQuery); |
||||
|
String data = ""; |
||||
|
if (next == 0) { |
||||
|
ResultBean<List<AdjustGetNodeVo>> getPreviousNodesForReject = scmFinanceAdjustApplyFeign.getPreviousNodesForReject(getNodeQuery); |
||||
|
if (getPreviousNodesForReject.getSuccess()) { |
||||
|
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); |
||||
|
data = getPreviousNodesForReject.getData().get(0).getName(); |
||||
|
} else { |
||||
|
return rb.setMsg(getPreviousNodesForReject.getMsg()); |
||||
|
} |
||||
|
} else if (next == 1) { |
||||
|
ResultBean<List<AdjustGetNodeVo>> getNextNodesForSubmit = scmFinanceAdjustApplyFeign.getNextNodesForSubmit(getNodeQuery); |
||||
|
if (getNextNodesForSubmit.getSuccess()) { |
||||
|
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); |
||||
|
data = getNextNodesForSubmit.getData().get(0).getName(); |
||||
|
} else { |
||||
|
return rb.setMsg(getNextNodesForSubmit.getMsg()); |
||||
|
} |
||||
|
} else { |
||||
|
return rb.setMsg("参数错误：next"); |
||||
|
} |
||||
|
return rb.success().setData(data); |
||||
|
} |
||||
|
|
||||
|
public ResultBean delegate(AppAdjustApplyDelegateQuery delegateQuery) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
AdjustDelegateQuery delegateQuery1 = new |
||||
|
AdjustDelegateQuery(); |
||||
|
BeanUtil.copyProperties(delegateQuery, delegateQuery1); |
||||
|
ResultBean delegate = scmFinanceAdjustApplyFeign.delegate(delegateQuery1); |
||||
|
return rb.success(); |
||||
|
} |
||||
|
|
||||
|
public ResultBean assignTask(AppAdjustApplyDelegateQuery delegateQuery) { |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
AdjustDelegateQuery delegateQuery1 = new |
||||
|
AdjustDelegateQuery(); |
||||
|
BeanUtil.copyProperties(delegateQuery, delegateQuery1); |
||||
|
ResultBean delegate = scmFinanceAdjustApplyFeign.assignTask(delegateQuery1); |
||||
|
return rb.success(); |
||||
|
} |
||||
|
} |
||||
@ -1,26 +0,0 @@ |
|||||
package com.yxt.anrui.oa.biz.oamendapply; |
|
||||
|
|
||||
import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyDto; |
|
||||
import com.yxt.anrui.oa.biz.oamendapply.OaMendApplyDto; |
|
||||
import io.swagger.annotations.ApiModel; |
|
||||
import io.swagger.annotations.ApiModelProperty; |
|
||||
import lombok.Data; |
|
||||
|
|
||||
/** |
|
||||
* @author liuguohui |
|
||||
* @version 1.0 |
|
||||
* @description |
|
||||
* @date 2022/04/13 |
|
||||
*/ |
|
||||
@ApiModel("提交") |
|
||||
@Data |
|
||||
public class SubmitOaMendApplyDto extends OaMendApplyDto { |
|
||||
|
|
||||
private static final long serialVersionUID = 8607710587497609779L; |
|
||||
@ApiModelProperty("意见") |
|
||||
private String comment; |
|
||||
@ApiModelProperty("流程实例id") |
|
||||
private String instanceId; |
|
||||
@ApiModelProperty("任务id") |
|
||||
private String taskId; |
|
||||
} |
|
||||
@ -1,4 +1,4 @@ |
|||||
package com.yxt.anrui.oa.feign.portal.sysstafforg; |
package com.yxt.anrui.oa.feign.portal.sysorganization; |
||||
|
|
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
@ -0,0 +1,21 @@ |
|||||
|
package com.yxt.anrui.oa.feign.sysuser; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @Author dimengzhe |
||||
|
* @Date 2022/6/21 8:47 |
||||
|
* @Description |
||||
|
*/ |
||||
|
@Data |
||||
|
public class UserQuery implements Query { |
||||
|
|
||||
|
private static final long serialVersionUID = -3979717077029562761L; |
||||
|
@ApiModelProperty(value = "角色sid必传项") |
||||
|
private String roleSid; |
||||
|
@ApiModelProperty(value = "用户部门sid路径是必传项") |
||||
|
private String orgSidPath; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,19 @@ |
|||||
|
package com.yxt.anrui.oa.feign.sysuser; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @Author dimengzhe |
||||
|
* @Date 2022/8/25 8:38 |
||||
|
* @Description |
||||
|
*/ |
||||
|
@Data |
||||
|
public class UserRoleQuery implements Query { |
||||
|
private static final long serialVersionUID = 1913450300189800653L; |
||||
|
|
||||
|
@ApiModelProperty("角色sid") |
||||
|
private String roleSid; |
||||
|
private String orgSid; |
||||
|
} |
||||
Loading…
Reference in new issue