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 2 years ago
parent
606e83ed51 ea90329411
commit
9b168dfba8
5 changed files with 80 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue
  2. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
  3. 4
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
  4. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
  5. 123
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue
View File

@ -86,7 +86,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.collectionTypeKey === '03'"> <el-row v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">
<el-col :span="4" class="tleftb balanceStyle"> <el-col :span="4" class="tleftb balanceStyle">
<span>收款银行账号</span> <span>收款银行账号</span>
</el-col> </el-col>
@ -122,19 +122,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款账号后4位</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payAccount }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payAccount }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款银行</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款银行</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payBank }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
View File

@ -87,7 +87,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.collectionTypeKey === '03'"> <el-row v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">
<el-col :span="4" class="tleftb balanceStyle"> <el-col :span="4" class="tleftb balanceStyle">
<span>收款银行账号</span> <span>收款银行账号</span>
</el-col> </el-col>
@ -123,19 +123,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款账号后4位</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payAccount }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payAccount }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款银行</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款银行</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payBank }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

4
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
View File

@ -229,7 +229,7 @@ export default {
createBySid: '', createBySid: '',
state: '', state: '',
orgPath: '', orgPath: '',
auditState: '' auditState: 1
}, },
total: 0 total: 0
} }
@ -335,7 +335,7 @@ export default {
createBySid: '', createBySid: '',
state: '', state: '',
orgPath: '', orgPath: '',
auditState: '' auditState: 1
}, },
total: 0 total: 0
} }

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
View File

@ -96,7 +96,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.collectionTypeKey === '03'"> <el-row v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">
<el-col :span="4" class="tleftb balanceStyle"> <el-col :span="4" class="tleftb balanceStyle">
<span>收款银行账号</span> <span>收款银行账号</span>
</el-col> </el-col>
@ -132,19 +132,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款账号后4位</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payAccount }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payAccount }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款银行</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款银行</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payBank }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

123
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -174,10 +174,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
qw.eq("pushMessgae", 0); qw.eq("pushMessgae", 0);
if (StringUtils.isNotBlank(query.getCreateBySid())) { if (StringUtils.isNotBlank(query.getCreateBySid())) {
qw.eq("createBySid", query.getCreateBySid()); qw.eq("createBySid", query.getCreateBySid());
qw.eq("staffUserSid",query.getCreateBySid()); qw.eq("staffUserSid", query.getCreateBySid());
} }
} else { } else {
qw.ne("auditState", 0); if (StringUtils.isNotBlank(query.getAuditState())) {
qw.eq("auditState", query.getAuditState());
}
// qw.ne("auditState", 0);
} }
} }
qw.orderByDesc("id"); qw.orderByDesc("id");
@ -208,17 +211,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isNotBlank(query.getSubscriptionState())) { if (StringUtils.isNotBlank(query.getSubscriptionState())) {
qw.eq("paymentState", query.getSubscriptionState()); qw.eq("paymentState", query.getSubscriptionState());
} }
if(StringUtils.isNotBlank(query.getPayerName())){ if (StringUtils.isNotBlank(query.getPayerName())) {
qw.like("payerName",query.getPayerName()); qw.like("payerName", query.getPayerName());
} }
if(StringUtils.isNotBlank(query.getCreateDept())){ if (StringUtils.isNotBlank(query.getCreateDept())) {
qw.like("createDept",query.getCreateDept()); qw.like("createDept", query.getCreateDept());
} }
if(StringUtils.isNotBlank(query.getCreateByName())){ if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("createByName",query.getCreateByName()); qw.like("createByName", query.getCreateByName());
} }
if(StringUtils.isNotBlank(query.getCollectionMoney())){ if (StringUtils.isNotBlank(query.getCollectionMoney())) {
qw.eq("collectionMoney",query.getCollectionMoney()); qw.eq("collectionMoney", query.getCollectionMoney());
} }
//0是申请管理的，1是出纳款项管理 //0是申请管理的，1是出纳款项管理
if (StringUtils.isNotBlank(query.getState())) { if (StringUtils.isNotBlank(query.getState())) {
@ -227,9 +230,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
/* if (StringUtils.isNotBlank(query.getCreateBySid())) { /* if (StringUtils.isNotBlank(query.getCreateBySid())) {
qw.eq("createBySid", query.getCreateBySid()); qw.eq("createBySid", query.getCreateBySid());
}*/ }*/
}else{ } else {
if(StringUtils.isNotBlank(query.getAuditState())){ if (StringUtils.isNotBlank(query.getAuditState())) {
qw.eq("auditState",query.getAuditState()); qw.eq("auditState", query.getAuditState());
} }
} }
} }
@ -312,7 +315,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
QueryWrapper<FinCollectionConfirmation> qw = createQueryWrapperss(query); QueryWrapper<FinCollectionConfirmation> qw = createQueryWrapperss(query);
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq); IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<FinCollectionConfirmationVo> pagging = baseMapper.selectPageVoss(page, qw,query.getCreateBySid()); IPage<FinCollectionConfirmationVo> pagging = baseMapper.selectPageVoss(page, qw, query.getCreateBySid());
List<FinCollectionConfirmationVo> records = pagging.getRecords(); List<FinCollectionConfirmationVo> records = pagging.getRecords();
for (FinCollectionConfirmationVo record : records) { for (FinCollectionConfirmationVo record : records) {
//是否有余额 //是否有余额
@ -372,7 +375,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isBlank(v.getSubscriptionMoney())) { if (StringUtils.isBlank(v.getSubscriptionMoney())) {
return rb.setMsg("认款金额不允许为空"); return rb.setMsg("认款金额不允许为空");
} }
if(new BigDecimal(v.getSubscriptionMoney()).compareTo(new BigDecimal(v.getCurrentReceivableMoney()))>0){ if (new BigDecimal(v.getSubscriptionMoney()).compareTo(new BigDecimal(v.getCurrentReceivableMoney())) > 0) {
return rb.setMsg("认款金额不允许大于当前应收金额"); return rb.setMsg("认款金额不允许大于当前应收金额");
} }
} }
@ -381,7 +384,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//对收款申请进行赋值操作 //对收款申请进行赋值操作
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid"); BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
if(StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())){ if (StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())) {
finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName()); finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName());
finCollectionConfirmation.setStaffUserSid(dto.getUserSid()); finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept()); finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept());
@ -694,11 +697,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs); finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(finSelectedReceivablesDetailedVos); finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(finSelectedReceivablesDetailedVos);
if(finCollectionConfirmation.getAuditState() ==2){ if (finCollectionConfirmation.getAuditState() == 2) {
String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason(); String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已驳回，原因是：" + finCollectionConfirmation.getReason();
finCollectionConfirmationDetailsVo.setReason(confirmationDetails); finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
}else if(finCollectionConfirmation.getAuditState() == 3){ } else if (finCollectionConfirmation.getAuditState() == 3) {
String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认"; String confirmationDetails = finCollectionConfirmation.getConfirmName() + "于" + finCollectionConfirmation.getConfirmDate() + "已确认";
finCollectionConfirmationDetailsVo.setReason(confirmationDetails); finCollectionConfirmationDetailsVo.setReason(confirmationDetails);
} }
return rb.success().setData(finCollectionConfirmationDetailsVo); return rb.success().setData(finCollectionConfirmationDetailsVo);
@ -809,9 +812,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) { if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) {
qw.eq("useOrgSid", pagerQuery.getOrgPath()); qw.eq("useOrgSid", pagerQuery.getOrgPath());
} }
if(StringUtils.isNotBlank(pagerQuery.getUserSid())){ if (StringUtils.isNotBlank(pagerQuery.getUserSid())) {
qw.eq("createBySid",pagerQuery.getUserSid()); qw.eq("createBySid", pagerQuery.getUserSid());
qw.eq("staffUserSid",pagerQuery.getUserSid()); qw.eq("staffUserSid", pagerQuery.getUserSid());
} }
} }
qw.eq("pushMessgae", 0); qw.eq("pushMessgae", 0);
@ -875,7 +878,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finCollectionConfirmation.setStaffUserSid(dto.getUserSid()); finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
finCollectionConfirmation.setStaffDeptSid(createDeptSid); finCollectionConfirmation.setStaffDeptSid(createDeptSid);
finCollectionConfirmation.setStaffDeptName(deptName); finCollectionConfirmation.setStaffDeptName(deptName);
if("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())){ if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
//收款银行账号 //收款银行账号
finCollectionConfirmation.setCollectionBankNum(dto.getCollectionBankNum()); finCollectionConfirmation.setCollectionBankNum(dto.getCollectionBankNum());
finCollectionConfirmation.setCollectionBankNumKey(dto.getCollectionBankNumKey()); finCollectionConfirmation.setCollectionBankNumKey(dto.getCollectionBankNumKey());
@ -886,7 +889,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finCollectionConfirmation.setPayAccount(dto.getPayAccount()); finCollectionConfirmation.setPayAccount(dto.getPayAccount());
//付款银行 //付款银行
finCollectionConfirmation.setPayBank(dto.getPayBank()); finCollectionConfirmation.setPayBank(dto.getPayBank());
}else{ } else {
//收款银行账号 //收款银行账号
finCollectionConfirmation.setCollectionBankNum(""); finCollectionConfirmation.setCollectionBankNum("");
finCollectionConfirmation.setCollectionBankNumKey(""); finCollectionConfirmation.setCollectionBankNumKey("");
@ -991,7 +994,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
vo.setPayFiles(payFiles); vo.setPayFiles(payFiles);
vo.setUserSid(query.getUserSid()); vo.setUserSid(query.getUserSid());
String fils = fileUploadComponent.getUrlPrefix()+"confirm.docx"; String fils = fileUploadComponent.getUrlPrefix() + "confirm.docx";
vo.setDownLoadUrl(fils); vo.setDownLoadUrl(fils);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ -1023,12 +1026,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
vo.setImages(images); vo.setImages(images);
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(query.getCollectionBillSid()); FinCollectionConfirmation finCollectionConfirmation = fetchBySid(query.getCollectionBillSid());
if(finCollectionConfirmation.getAuditState() ==2){ if (finCollectionConfirmation.getAuditState() == 2) {
vo.setCotlectionBitiStateValue("驳回"); vo.setCotlectionBitiStateValue("驳回");
// String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason(); // String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
// String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason(); // String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已驳回，原因是："+finCollectionConfirmation.getReason();
vo.setReason(finCollectionConfirmation.getReason()); vo.setReason(finCollectionConfirmation.getReason());
}else if(finCollectionConfirmation.getAuditState() == 3){ } else if (finCollectionConfirmation.getAuditState() == 3) {
// String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认"; // String confirmationDetails = finCollectionConfirmation.getConfirmName()+"于"+finCollectionConfirmation.getConfirmDate()+"已确认";
// vo.setReason(confirmationDetails); // vo.setReason(confirmationDetails);
vo.setCotlectionBitiStateValue("确认"); vo.setCotlectionBitiStateValue("确认");
@ -1173,8 +1176,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isNotBlank(useOrgSid)) { if (StringUtils.isNotBlank(useOrgSid)) {
qw.eq("useOrgSid", useOrgSid); qw.eq("useOrgSid", useOrgSid);
} }
if(StringUtils.isNotBlank(userSid)){ if (StringUtils.isNotBlank(userSid)) {
qw.eq("createBySid",userSid); qw.eq("createBySid", userSid);
} }
if (params.getSidList().size() > 0) { if (params.getSidList().size() > 0) {
qw.notIn("sid", params.getSidList()); qw.notIn("sid", params.getSidList());
@ -1215,9 +1218,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
// IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName()); // IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
List<AppFinUncollectedReceivablesDetailedVo> collList = finSelectedReceivablesDetailedService.getPaymentList(qw,params.getName()); List<AppFinUncollectedReceivablesDetailedVo> collList = finSelectedReceivablesDetailedService.getPaymentList(qw, params.getName());
if(collList.isEmpty()){ if (collList.isEmpty()) {
collList = finSelectedReceivablesDetailedService.getPaymentList(qw,""); collList = finSelectedReceivablesDetailedService.getPaymentList(qw, "");
for (AppFinUncollectedReceivablesDetailedVo record : collList) { for (AppFinUncollectedReceivablesDetailedVo record : collList) {
record.setConfirmDate(dateFormat.format(new Date())); record.setConfirmDate(dateFormat.format(new Date()));
String busVinSid = record.getBusVinSid(); String busVinSid = record.getBusVinSid();
@ -1236,10 +1239,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
} }
if(StringUtils.isNotBlank(pagerQuery.getParams().getName())){ if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
collList = collList.stream().filter(v->v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); collList = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
} }
}else{ } else {
for (AppFinUncollectedReceivablesDetailedVo record : collList) { for (AppFinUncollectedReceivablesDetailedVo record : collList) {
record.setConfirmDate(dateFormat.format(new Date())); record.setConfirmDate(dateFormat.format(new Date()));
String busVinSid = record.getBusVinSid(); String busVinSid = record.getBusVinSid();
@ -1258,14 +1261,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
} }
} }
if(StringUtils.isNotBlank(pagerQuery.getParams().getName())){ if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
List<AppFinUncollectedReceivablesDetailedVo> cll = collList.stream().filter(v->v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList()); List<AppFinUncollectedReceivablesDetailedVo> cll = collList.stream().filter(v -> v.getVin().contains(pagerQuery.getParams().getName())).collect(Collectors.toList());
collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList()); collList = Stream.of(collList, cll).flatMap(Collection::stream).collect(Collectors.toList());
} }
} }
//将collList根据sid去重 //将collList根据sid去重
collList = collList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() collList = collList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
-> new TreeSet<>(Comparator.comparing(AppFinUncollectedReceivablesDetailedVo :: getSid))), ArrayList::new)); -> new TreeSet<>(Comparator.comparing(AppFinUncollectedReceivablesDetailedVo::getSid))), ArrayList::new));
//分页 //分页
IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>(); IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>();
page1.setRecords(collList); page1.setRecords(collList);
@ -1663,7 +1666,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i); FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos1_1.get(i);
String contractNo = vvvv.getContractNo(); String contractNo = vvvv.getContractNo();
String vinNo = vvvv.getVIN(); String vinNo = vvvv.getVIN();
BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid,vinNo); BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid, vinNo);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null) { if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode()); bdCustomer.setTOrgIds(data.getOrgCode());
@ -1681,7 +1684,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期 //登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if(vvvv.getVIN().length() >= 8){ if (vvvv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
} }
//收款用途 //收款用途
@ -1720,7 +1723,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//先推送客户 //先推送客户
String contractNo = vvvv.getContractNo(); String contractNo = vvvv.getContractNo();
String vinNo = vvvv.getVIN(); String vinNo = vvvv.getVIN();
BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid,vinNo); BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid, vinNo);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null) { if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode()); bdCustomer.setTOrgIds(data.getOrgCode());
@ -1737,7 +1740,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期 //登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if(vvvv.getVIN().length() >= 8){ if (vvvv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
} }
//收款用途 //收款用途
@ -1857,12 +1860,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
//根据应收未收表中的业务车辆sid查询车辆的sid //根据应收未收表中的业务车辆sid查询车辆的sid
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed1 = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid()); FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed1 = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
if(finUncollectedReceivablesDetailed1 != null){ if (finUncollectedReceivablesDetailed1 != null) {
String busVinSid = finUncollectedReceivablesDetailed1.getBusVinSid(); String busVinSid = finUncollectedReceivablesDetailed1.getBusVinSid();
if(StringUtils.isNotBlank(busVinSid)){ if (StringUtils.isNotBlank(busVinSid)) {
//查询销售订单中的车辆列表的车辆相关的sid //查询销售订单中的车辆列表的车辆相关的sid
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData(); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
if(busSalesOrderVehicle != null){ if (busSalesOrderVehicle != null) {
busDeliveredDto.setVinNo(busSalesOrderVehicle.getLinkNo()); busDeliveredDto.setVinNo(busSalesOrderVehicle.getLinkNo());
} }
} }
@ -1928,7 +1931,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return bdCustomer; return bdCustomer;
} }
private BdCustomer createBdCustomer1(String useOrgSid, String name, String contractNo, String collSid,String vinNo) { private BdCustomer createBdCustomer1(String useOrgSid, String name, String contractNo, String collSid, String vinNo) {
BdCustomer bdCustomer = new BdCustomer(); BdCustomer bdCustomer = new BdCustomer();
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(useOrgSid); ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
if (resultBean.getSuccess()) { if (resultBean.getSuccess()) {
@ -2042,7 +2045,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.success().setData(finCollectionConfirmation); return rb.success().setData(finCollectionConfirmation);
} }
public ResultBean<PdfPath> createPdf(String skdSid,String printerType) { public ResultBean<PdfPath> createPdf(String skdSid, String printerType) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PdfPath pdfPath = new PdfPath(); PdfPath pdfPath = new PdfPath();
//获取收款单信息 //获取收款单信息
@ -2062,8 +2065,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinCollectionConfirmationMaterial finCollectionConfirmationMaterial = new FinCollectionConfirmationMaterial(); FinCollectionConfirmationMaterial finCollectionConfirmationMaterial = new FinCollectionConfirmationMaterial();
id = id + 1; id = id + 1;
//主车物料编码 //主车物料编码
if (StringUtils.isNotBlank(finSelectedReceivablesDetailedVo.getVIN())){ if (StringUtils.isNotBlank(finSelectedReceivablesDetailedVo.getVIN())) {
if (finSelectedReceivablesDetailedVo.getVIN().length() > 7){ if (finSelectedReceivablesDetailedVo.getVIN().length() > 7) {
finCollectionConfirmationMaterial.setVinNo(finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8)); finCollectionConfirmationMaterial.setVinNo(finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8));
} }
} }
@ -2091,9 +2094,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String typeName = dateStr + seconds + ".doc"; String typeName = dateStr + seconds + ".doc";
//生成文件路径 //生成文件路径
String targetPath = sourcePath + dateStr; String targetPath = sourcePath + dateStr;
if (printerType.equals("针孔式打印机")){ if (printerType.equals("针孔式打印机")) {
WordUtils.creatWord(dataMap, "skdzks", sourcePath, targetPath, typeName); WordUtils.creatWord(dataMap, "skdzks", sourcePath, targetPath, typeName);
}else if (printerType.equals("激光打印机")){ } else if (printerType.equals("激光打印机")) {
WordUtils.creatWord(dataMap, "skdjg", sourcePath, targetPath, typeName); WordUtils.creatWord(dataMap, "skdjg", sourcePath, targetPath, typeName);
} }
//新生成的word路径 //新生成的word路径
@ -2103,18 +2106,18 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
String downNum = finCollectionConfirmationDetailsVo.getDownNum(); String downNum = finCollectionConfirmationDetailsVo.getDownNum();
if (StringUtils.isBlank(downNum)){ if (StringUtils.isBlank(downNum)) {
downNum = "1"; downNum = "1";
}else { } else {
downNum = String.valueOf((Integer.parseInt(downNum) + 1)); downNum = String.valueOf((Integer.parseInt(downNum) + 1));
} }
baseMapper.updateDown(skdSid,downNum); baseMapper.updateDown(skdSid, downNum);
return rb.success().setData(pdfPath); return rb.success().setData(pdfPath);
} }
public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) { public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
int i = baseMapper.updateVin(vinNo,contractNo,temporaryNo); int i = baseMapper.updateVin(vinNo, contractNo, temporaryNo);
return rb.success(); return rb.success();
} }
@ -2434,7 +2437,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}*/ }*/
String contractNo = vvvv.getContractNo(); String contractNo = vvvv.getContractNo();
String vinNo = vvvv.getVIN(); String vinNo = vvvv.getVIN();
BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid,vinNo); BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid, vinNo);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null) { if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode()); bdCustomer.setTOrgIds(data.getOrgCode());
@ -2452,7 +2455,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期 //登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if(vvvv.getVIN().length() >= 8){ if (vvvv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
} }
//收款用途 //收款用途
@ -2497,7 +2500,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}*/ }*/
String contractNo = vvvv.getContractNo(); String contractNo = vvvv.getContractNo();
String vinNo = vvvv.getVIN(); String vinNo = vvvv.getVIN();
BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid,vinNo); BdCustomer bdCustomer = createBdCustomer1(confirmation.getUseOrgSid(), vvvv.getCustomerName(), contractNo, sid, vinNo);
//推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code //推送金蝶客户，修改目标组织为采购系统对应的金蝶分公司code
if (data != null) { if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode()); bdCustomer.setTOrgIds(data.getOrgCode());
@ -2514,7 +2517,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney()); freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期 //登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate()); freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if(vvvv.getVIN().length() >= 8){ if (vvvv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8)); freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
} }
//收款用途 //收款用途

Write Preview
Loading…
Cancel
Save