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

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
4387c7c253 46f643be82
commit
05421f9017
5 changed files with 131 additions and 11 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. 36
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
  2. 36
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue
  3. 14
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordQuery.java
  4. 54
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  5. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml

36
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
View File

@ -7,7 +7,7 @@
<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 ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -23,6 +23,24 @@
<el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="收款单位名称">
<el-input v-model="listQuery.params.receiveCompany" placeholder="" clearable/>
</el-form-item>
<el-form-item label="收款账号">
<el-input v-model="listQuery.params.receiveBankAccount" placeholder="" clearable/>
</el-form-item>
<el-form-item label="金额">
<el-input v-model="listQuery.params.cost" placeholder="" clearable/>
</el-form-item>
<el-form-item label="付款时需备注内容">
<el-input v-model="listQuery.params.busRemarks" placeholder="" clearable/>
</el-form-item>
<el-form-item label="开户名称">
<el-input v-model="listQuery.params.payBank" placeholder="" clearable/>
</el-form-item>
<el-form-item label="付款账号">
<el-input v-model="listQuery.params.payBankAccount" placeholder="" clearable/>
</el-form-item>
<el-form-item label="审批日期">
<el-date-picker v-model="listQuery.params.createStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
@ -360,7 +378,13 @@ export default {
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
orgPath: '',
receiveCompany: '',
receiveBankAccount: '',
cost: '',
busRemarks: '',
payBank: '',
payBankAccount: ''
},
current: 1,
size: 10,
@ -537,7 +561,13 @@ export default {
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
orgPath: '',
receiveCompany: '',
receiveBankAccount: '',
cost: '',
busRemarks: '',
payBank: '',
payBankAccount: ''
},
current: 1,
size: 10,

36
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue
View File

@ -7,7 +7,7 @@
<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 ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -23,6 +23,24 @@
<el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="收款单位名称">
<el-input v-model="listQuery.params.receiveCompany" placeholder="" clearable/>
</el-form-item>
<el-form-item label="收款账号">
<el-input v-model="listQuery.params.receiveBankAccount" placeholder="" clearable/>
</el-form-item>
<el-form-item label="金额">
<el-input v-model="listQuery.params.cost" placeholder="" clearable/>
</el-form-item>
<el-form-item label="付款时需备注内容">
<el-input v-model="listQuery.params.busRemarks" placeholder="" clearable/>
</el-form-item>
<el-form-item label="开户名称">
<el-input v-model="listQuery.params.payBank" placeholder="" clearable/>
</el-form-item>
<el-form-item label="付款账号">
<el-input v-model="listQuery.params.payBankAccount" placeholder="" clearable/>
</el-form-item>
<el-form-item label="审批日期">
<el-date-picker v-model="listQuery.params.createStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
@ -209,7 +227,13 @@ export default {
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
orgPath: '',
receiveCompany: '',
receiveBankAccount: '',
cost: '',
busRemarks: '',
payBank: '',
payBankAccount: ''
},
current: 1,
size: 10,
@ -303,7 +327,13 @@ export default {
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
orgPath: '',
receiveCompany: '',
receiveBankAccount: '',
cost: '',
busRemarks: '',
payBank: '',
payBankAccount: ''
},
current: 1,
size: 10,

14
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordQuery.java
View File

@ -65,4 +65,18 @@ public class FinPaymentrecordQuery implements Query {
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
//出纳付款列表中增加查询条件：收款单位名称、收款账号、金额、付款时需要备注内容、开户名称、付款账号
@ApiModelProperty(value = "收款单位名称")
private String receiveCompany;
@ApiModelProperty(value = "收款账号")
private String receiveBankAccount;
@ApiModelProperty(value = "金额")
private Integer cost;
@ApiModelProperty("付款时备注")
private String busRemarks;
@ApiModelProperty("开户名称")
private String payBank;
@ApiModelProperty("付款账号")
private String payBankAccount;
}

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

@ -179,6 +179,29 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
qw.eq("fp.useOrgSid", resultBean.getData());
}
}
//收款单位名称
if (StringUtils.isNotBlank(pageQuery.getReceiveCompany())) {
qw.like("fp.receiveCompany", pageQuery.getReceiveCompany());
}
//收款账号
if (StringUtils.isNotBlank(pageQuery.getReceiveBankAccount())) {
qw.like("fp.receiveBankAccount", pageQuery.getReceiveBankAccount());
}
if (pageQuery.getCost() != null) {
qw.eq("fp.cost", pageQuery.getCost());
}
//付款时备注
if (StringUtils.isNotBlank(pageQuery.getBusRemarks())) {
qw.like("fp.busRemarks", pageQuery.getBusRemarks());
}
//付款银行
if (StringUtils.isNotBlank(pageQuery.getPayBank())) {
qw.like("fp.payBank", pageQuery.getPayBank());
}
//付款账号
if (StringUtils.isNotBlank(pageQuery.getPayBankAccount())) {
qw.like("fp.payBankAccount", pageQuery.getPayBankAccount());
}
}
IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
@ -234,6 +257,29 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
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')"
);
//收款单位名称
if (StringUtils.isNotBlank(pageQuery.getReceiveCompany())) {
qw.like("fp.receiveCompany", pageQuery.getReceiveCompany());
}
//收款账号
if (StringUtils.isNotBlank(pageQuery.getReceiveBankAccount())) {
qw.like("fp.receiveBankAccount", pageQuery.getReceiveBankAccount());
}
if (pageQuery.getCost() != null) {
qw.eq("fp.cost", pageQuery.getCost());
}
//付款时备注
if (StringUtils.isNotBlank(pageQuery.getBusRemarks())) {
qw.like("fp.busRemarks", pageQuery.getBusRemarks());
}
//付款银行
if (StringUtils.isNotBlank(pageQuery.getPayBank())) {
qw.like("fp.payBank", pageQuery.getPayBank());
}
//付款账号
if (StringUtils.isNotBlank(pageQuery.getPayBankAccount())) {
qw.like("fp.payBankAccount", pageQuery.getPayBankAccount());
}
}
IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
@ -293,10 +339,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
for (int i = 0; i < sids.size(); i++) {
FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
FinPaymentrecord finPaymentrecordOne = null;
if(dto.getCost()<finPaymentrecord.getAccountsReceive()){//实收金额小于应收金额
if (dto.getCost() < finPaymentrecord.getAccountsReceive()) {//实收金额小于应收金额
finPaymentrecordOne = new FinPaymentrecord();
BeanUtil.copyProperties(finPaymentrecord,finPaymentrecordOne,"sid");
finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive()-dto.getCost());
BeanUtil.copyProperties(finPaymentrecord, finPaymentrecordOne, "sid");
finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive() - dto.getCost());
finPaymentrecordOne.setCost(finPaymentrecordOne.getAccountsReceive());
}
BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
@ -326,7 +372,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
baseManufUpdateDto.setState("1");
ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto);
}
if(finPaymentrecordOne != null){
if (finPaymentrecordOne != null) {
baseMapper.insert(finPaymentrecordOne);
}
//给外采或排产申请人系统消息提醒

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysreportparametermain/SysReportParameterMainMapper.xml
View File

@ -13,7 +13,7 @@
SELECT concat(
tableNameValue,
':',
group_concat(colText SEPARATOR ',')) AS parameterValue,
group_concat(colText order by id asc SEPARATOR ',')) AS parameterValue,
mainSid
FROM sys_report_parameter
GROUP BY tableNameKey,mainSid

Write Preview
Loading…
Cancel
Save