diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
index d544b52f76..188c07750c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
@@ -42,7 +42,9 @@ public enum CommonAttachTypeEnum {
ADVANCE_GIN("0005", "提前开票附件"),
CUSTOMER_FILE("0006", "客户资料附件"),
ARREARS("0007", "欠款提车附件"),
- SCENESIGN("0008", "现场签署附件");
+ SCENESIGN("0008", "现场签署附件"),
+ PAYMENT_VOUCHER("0009", "打款凭证附件"),
+ REMITTAN_CECONFIRMATION("0010", "汇款确认书附件");
/**
* 附件类型
*/
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java
new file mode 100644
index 0000000000..e28da55338
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(安瑞基础信息模块)
+ * File: CommonAppendixDto.java
+ * Class: com.yxt.anrui.base.api.commonappendix.CommonAppendixDto
+ * Description: 公共附件表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-10-28 08:59:25
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "公共附件表 数据传输对象", description = "公共附件表 数据传输对象")
+@Data
+public class BusCollectionConfirmationAppendixDto implements Dto {
+
+ @ApiModelProperty("上传人sid")
+ private String createBySid;
+ @ApiModelProperty("上传人姓名")
+ private String name;
+ @ApiModelProperty("文件名")
+ private String fileName;
+ @ApiModelProperty("文件类型")
+ private String fileType;
+ @ApiModelProperty("关联业务对象sid")
+ private String linkSid;
+ @ApiModelProperty("附件类型")
+ private String attachType;
+ @ApiModelProperty("文件大小")
+ private String fileSize;
+ @ApiModelProperty("文件的路径")
+ private String filePath;
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
index b38c8ec731..e4386a5d11 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java
@@ -26,11 +26,15 @@
package com.yxt.anrui.buscenter.api.buscollectionconfirmation;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: anrui-buscenter(销售相关)
* File: BusCollectionConfirmationVo.java
@@ -51,37 +55,28 @@ public class BusCollectionConfirmationDetailsVo implements Vo {
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
-
@ApiModelProperty("收款日期")
private String collectionDate; // 收款日期
-
@ApiModelProperty("收款银行")
private String collectionBank; // 收款银行
-
@ApiModelProperty("收款银行账号")
private String collectionBankNum; // 收款银行账号
-
@ApiModelProperty("收款方式key")
private String collectionTypeKey; // 收款方式key
-
@ApiModelProperty("收款方式value")
private String collectionTypeValue; // 收款方式value
-
@ApiModelProperty("付款方名称")
private String payerName; // 付款方名称
-
@ApiModelProperty("收款金额")
private String collectionMoney; // 收款金额
-
@ApiModelProperty("打款凭证Url")
private String paymentVoucherUrl; // 打款凭证Url
-
@ApiModelProperty("汇款确认书Url")
private String remittanceConfirmationUrl; // 汇款确认书Url
-
@ApiModelProperty("余额")
private String balance; // 余额
-
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
+ @ApiModelProperty("已选应收款项明细")
+ private List busSelectedReceivablesDetailedVos; // 已选应收款项明细
}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
index e61590b140..6f8c3aa680 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java
@@ -54,6 +54,8 @@ public class BusCollectionConfirmationDto implements Dto {
@ApiModelProperty("收款确认单sid")
private String sid; // 收款确认单sid
+ @ApiModelProperty("业务员sid")
+ private String staffSid; // 业务员sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("收款日期")
@@ -80,4 +82,8 @@ public class BusCollectionConfirmationDto implements Dto {
private String useOrgSid; // 分公司sid
@ApiModelProperty("已选应收款项明细")
private List busSelectedReceivablesDetailedDtos; // 已选应收款项明细
+ @ApiModelProperty("打款凭证附件")
+ private List paymentVoucherAppendixs; // 打款凭证附件
+ @ApiModelProperty("汇款确认书附件")
+ private List remittanceConfirmationAppendixs; // 汇款确认书附件
}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
index 5f4b4a41f9..dd48fba2a4 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java
@@ -49,6 +49,8 @@ import lombok.Data;
@Data
public class BusCollectionConfirmationVo implements Vo {
+ @ApiModelProperty("收款确认单sid")
+ private String sid; // 收款确认单sid
@ApiModelProperty("收款日期")
private String collectionDate; // 收款日期
@ApiModelProperty("收款银行")
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
index 7c0f8fcf47..6716c4f444 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java
@@ -77,9 +77,7 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- busCollectionConfirmationService.delBySids(sids);
- return rb.success();
+ return busCollectionConfirmationService.delAllBySids(sids);
}
@Override
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
index c3635e05c1..f19c4c613f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
@@ -28,7 +28,16 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto;
+import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
+import com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService;
+import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -36,6 +45,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -55,18 +65,14 @@ import java.util.List;
*/
@Service
public class BusCollectionConfirmationService extends MybatisBaseService {
- public PagerVo listPage(PagerQuery pq) {
- BusCollectionConfirmationQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPage(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
- public List listAll(BusCollectionConfirmationQuery query) {
- QueryWrapper qw = createQueryWrapper(query);
- return baseMapper.selectList(qw);
- }
+
+ @Autowired
+ private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService;
+ @Autowired
+ private CommonAppendixFeign commonAppendixFeign;
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+
private QueryWrapper createQueryWrapper(BusCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -96,39 +102,84 @@ public class BusCollectionConfirmationService extends MybatisBaseService listAllVo(BusCollectionConfirmationQuery query) {
- QueryWrapper qw = createQueryWrapper(query);
- return baseMapper.selectListAllVo(qw);
- }
-
- public List listVo() {
- return baseMapper.selectListVo();
- }
-
- public void saveOrUpdateDto(BusCollectionConfirmationDto dto){
- BusCollectionConfirmation entity = new BusCollectionConfirmation();
- dto.fillEntity(entity);
- this.saveOrUpdate(entity);
- }
-
- public BusCollectionConfirmationVo fetchByIdVo(String id){
- BusCollectionConfirmation entity = this.fetchById(id);
- BusCollectionConfirmationVo vo = new BusCollectionConfirmationVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
-
public ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) {
ResultBean rb = ResultBean.fireFail();
+ BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation();
+ List busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos();
+ CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+ List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
+ List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
+ String sid1 = busCollectionConfirmation.getSid();
String sid = dto.getSid();
- if (StringUtils.isBlank(sid)){
-
+ if (StringUtils.isBlank(sid)){//新增
+ BeanUtil.copyProperties(dto,busCollectionConfirmation);
+ busCollectionConfirmation.setSid(sid1);
+ String payFilePath = "";
+ String remFilePath = "";
+ for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
+ BeanUtil.copyProperties(paymentVoucherAppendix,commonAppendixDto);
+ payFilePath = commonAppendixDto.getFilePath();
+ if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+ payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+ commonAppendixDto.setLinkSid(sid1);
+ commonAppendixDto.setFilePath(payFilePath);
+ commonAppendixDto.setCreateBySid(dto.getStaffSid());
+ commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+ commonAppendixFeign.save(commonAppendixDto);
+ }
+ payFilePath += payFilePath + ",";
+ }
+ busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
+ for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
+ BeanUtil.copyProperties(remittanceConfirmationAppendix,commonAppendixDto);
+ remFilePath = commonAppendixDto.getFilePath();
+ if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+ remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
+ commonAppendixDto.setLinkSid(sid1);
+ commonAppendixDto.setFilePath(remFilePath);
+ commonAppendixDto.setCreateBySid(dto.getStaffSid());
+ commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+ commonAppendixFeign.save(commonAppendixDto);
+ }
+ remFilePath += remFilePath + ",";
+ }
+ busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
+ save(busCollectionConfirmation);
+ for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
+ BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
+ BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed);
+ busSelectedReceivablesDetailed.setCollSid(sid1);
+ busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
+ }
+ return rb.success().setMsg("添加成功");
+ }
+ updateBySid(dto,sid);
+ busSelectedReceivablesDetailedService.deleteByCollSid(sid);
+ for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
+ BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
+ BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed);
+ busSelectedReceivablesDetailed.setCollSid(sid);
+ busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
}
- return null;
+ return rb.success().setMsg("修改成功");
}
public ResultBean fetchByAllSid(String sid) {
ResultBean rb = ResultBean.fireFail();
- return null;
+ BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo();
+ BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid);
+ BeanUtil.copyProperties(busCollectionConfirmation,busCollectionConfirmationDetailsVo);
+ List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid);
+ busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos);
+ return rb.success().setData(busCollectionConfirmationDetailsVo);
+ }
+
+ public ResultBean delAllBySids(String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ delBySids(sids);
+ for (String sid : sids) {
+ busSelectedReceivablesDetailedService.deleteByCollSid(sid);
+ }
+ return rb.success().setMsg("删除成功");
}
}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
index 3dda5b98c0..fe7174f927 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,10 @@ public interface BusSelectedReceivablesDetailedMapper extends BaseMapper selectListVo();
+
+ @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}")
+ void deleteByCollSid(String sid);
+
+ @Select("select * from bus_selected_receivables_detailed where collSid = #{sid}")
+ List fetchByCillSid(String sid);
}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
index 378cc57127..1c2125fd61 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java
@@ -161,4 +161,12 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService fetchByCillSid(String sid) {
+ return baseMapper.fetchByCillSid(sid);
+ }
}
\ No newline at end of file