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

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 years ago
parent
cae54d925a e6a2a81658
commit
a27a5248eb
11 changed files with 211 additions and 85 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. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java
  3. 37
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java
  4. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java
  5. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java
  6. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java
  7. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  8. 190
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  9. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  10. 20
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  11. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java
View File

@ -145,4 +145,9 @@ public interface CommonAppendixFeign {
@ApiOperation("根据文件相对路径查询文件名称")
@PostMapping("/fetchByFilePath")
ResultBean<CommonAppendixVo> fetchByFilePath(@RequestParam(value = "s") String s);
@ApiOperation(value = "根据业务sid和附件类型批量删除")
@PostMapping("/delFilesByLinkSidAndAttachType")
ResultBean delFilesByLinkSidAndAttachType(@RequestParam(value = "linkSid") String linkSid,@RequestParam(value = "attachType") String attachType);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java
View File

@ -167,4 +167,9 @@ public class CommonAppendixFeignFallback implements CommonAppendixFeign {
public ResultBean<CommonAppendixVo> fetchByFilePath(String s) {
return null;
}
@Override
public ResultBean delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
return null;
}
}

37
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixMapper.java
View File

@ -30,23 +30,23 @@ import java.util.List;
@Mapper
public interface CommonAppendixMapper extends BaseMapper<CommonAppendix> {
//@Update("update common_appendix set name=#{msg} where id=#{id}")
//IPage<CommonAppendixVo> voPage(IPage<CommonAppendix> page, @Param(Constants.WRAPPER) QueryWrapper<CommonAppendix> qw);
IPage<CommonAppendixVo> selectPageVo(IPage<CommonAppendix> page, @Param(Constants.WRAPPER) Wrapper<CommonAppendix> qw);
List<CommonAppendixVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CommonAppendix> qw);
@Select("select * from common_appendix")
List<CommonAppendixVo> selectListVo();
//@Update("update common_appendix set name=#{msg} where id=#{id}")
//IPage<CommonAppendixVo> voPage(IPage<CommonAppendix> page, @Param(Constants.WRAPPER) QueryWrapper<CommonAppendix> qw);
List<CommonAppendixVo> selectByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
IPage<CommonAppendixVo> selectPageVo(IPage<CommonAppendix> page, @Param(Constants.WRAPPER) Wrapper<CommonAppendix> qw);
int deleteByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
List<CommonAppendixVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CommonAppendix> qw);
int selectPath(String path);
@Select("select * from common_appendix")
List<CommonAppendixVo> selectListVo();
int deletePath(String path);
List<CommonAppendixVo> selectByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
int deleteByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
int selectPath(String path);
int deletePath(String path);
List<CommonAppendixVo> getPcAppendix(@Param("type") String type, @Param("linkSid") String linkSid, @Param("path") String path);
@ -60,10 +60,13 @@ public interface CommonAppendixMapper extends BaseMapper<CommonAppendix> {
List<CommonAppendixVo> selectPathByLinkSId(String linkSid);
List<CommonAppendixVo> selectGroupByLinkSidAndAttachType(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
List<CommonAppendixVo> selectGroupByLinkSidAndAttachType(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
@Select("SELECT * FROM common_appendix WHERE filePath =#{s}")
CommonAppendixVo fetchByFilePath(String s);
@Select("SELECT * FROM common_appendix WHERE filePath =#{s}")
CommonAppendixVo fetchByFilePath(String s);
List<PrintConfirmVo> selectByType(@Param("sid") String sid, @Param("attachType") String attachType, @Param("path") String path);
List<PrintConfirmVo> selectByType(@Param("sid") String sid, @Param("attachType") String attachType,@Param("path") String path);
@Delete("delete from common_appendix where linkSid = #{linkSid} and attachType = #{attachType} ")
int delFilesByLinkSidAndAttachType(@Param("linkSid") String linkSid, @Param("attachType") String attachType);
}

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java
View File

@ -247,4 +247,11 @@ public class CommonAppendixRest implements CommonAppendixFeign {
public ResultBean<CommonAppendixVo> fetchByFilePath(String s) {
return commonAppendixService.fetchByFilePath(s);
}
@Override
public ResultBean delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
ResultBean rb = ResultBean.fireFail();
int i = commonAppendixService.delFilesByLinkSidAndAttachType(linkSid,attachType);
return rb.success().setMsg("删除成功");
}
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java
View File

@ -489,4 +489,9 @@ public class CommonAppendixService extends MybatisBaseService<CommonAppendixMapp
public List<PrintConfirmVo> selectByType(String sid, String attachType,String path) {
return baseMapper.selectByType(sid,attachType,path);
}
public int delFilesByLinkSidAndAttachType(String linkSid, String attachType) {
return baseMapper.delFilesByLinkSidAndAttachType(linkSid,attachType);
}
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java
View File

@ -57,7 +57,7 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
private List<String> payFiles = new ArrayList<>();
@ApiModelProperty("款项明细")
private List<AppFinSelectedReceivablesDetailedDto> contractList = new ArrayList<>();
private List<AppFinSelectedReceivablesPaymentDetailsVo> contractList = new ArrayList<>();
@ApiModelProperty("余额")
private String balance;

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
View File

@ -40,13 +40,16 @@
</select>
<select id="initCollectionConfirm"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationInitVo">
SELECT sid AS collectionBillSid,
collectionBankNum AS collectionNum,
SELECT sid AS collectionBillSid,
collectionBankNumKey AS collectionNumKey,
collectionBankNum AS collectionNum,
collectionBank,
collectionTypeValue AS collectionType,
collectionBankKey,
collectionTypeValue AS collectionType,
collectionTypeKey AS collectionTypeKey,
collectionDate,
payerName AS paymentName,
collectionMoney,
payerName AS paymentName,
collectionMoney AS paymentMoney,
remarks,
balance
FROM fin_collection_confirmation

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

@ -54,6 +54,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -349,12 +350,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BigDecimal balance = record.getBalance();
int i = balance.intValue();
int collectionBillState = record.getAuditState();
if (i <= 0 || collectionBillState == 1 || collectionBillState == 3) {
if (i <= 0) {
if (collectionBillState == 1 && collectionBillState == 3) {
record.setShowHandle(false);
}
record.setShowHandle(false);
} else {
record.setShowHandle(true);
}
if (collectionBillState == 3) {
record.setShowDownload(false);
}
record.setShowDownload(false);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getSid());
if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != 1) {
if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState == 1) {
record.setShowDelete(false);
} else {
record.setShowDelete(true);
}
if (collectionBillState == 3) {
record.setShowDelete(true);
} else {
record.setShowDelete(false);
}
}
@ -390,7 +405,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
BeanUtil.copyProperties(dto, finCollectionConfirmation,"sid");
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
finCollectionConfirmation.setUseOrgSid(useOrgSid);
List<String> payFiles = dto.getPayFiles();
@ -421,9 +436,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
}
finCollectionConfirmation.setBalance(totalSubscriptionMone);
finCollectionConfirmation.setBalance(subtract);
finCollectionConfirmation.setPaymentState(1);
finCollectionConfirmation.setAuditState(1);
save(finCollectionConfirmation);
return rb.success().setData(finCollectionConfirmation.getSid());
}
@ -439,6 +453,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail();
String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);
vo.setContractList(list);
List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
List<String> payFiles = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
@ -446,6 +462,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
payFiles.add(url);
}
vo.setPayFiles(payFiles);
vo.setUserSid(userSid);
return rb.success().setData(vo);
}
@ -458,6 +475,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
ResultBean<AppFinCollectionConfirmationDetailedVo> rb = ResultBean.fireFail();
AppFinCollectionConfirmationDetailedVo vo = baseMapper.getCollectionConfirmDetail(collectionBillSid);
List<AppFinSelectedReceivablesPaymentDetailsVo> list = finSelectedReceivablesDetailedService.selectByCollSid(collectionBillSid);
vo.setContractList(list);
List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
List<String> payFiles = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
@ -486,54 +505,113 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
List<AppFinSelectedReceivablesDetailedDto> paymentDetails = dto.getContractList();
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, finCollectionConfirmation);
for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin());
finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney());
finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId());
finSelectedReceivablesDetailed.setReceivablesName(paymentDetail.getProjectName());
finSelectedReceivablesDetailed.setContractSid(paymentDetail.getContractSid());
finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
finSelectedReceivablesDetailed.setCollSid(dto.getSid());
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
//已选应收款项-车架号
String vin = finSelectedReceivablesDetailed.getVIN();
//已选应收款项-应收项目名称
String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
//应收未收款项-当前应收金额
BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
//已选应收款项-认款金额
BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("认款金额超出应收金额，请重新输入");
if (StringUtils.isBlank(dto.getCollectionBillSid())) {
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, finCollectionConfirmation);
for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin());
finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney());
finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId());
finSelectedReceivablesDetailed.setReceivablesName(paymentDetail.getProjectName());
finSelectedReceivablesDetailed.setContractSid(paymentDetail.getContractSid());
finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
finSelectedReceivablesDetailed.setCollSid(dto.getCollectionBillSid());
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
//已选应收款项-车架号
String vin = finSelectedReceivablesDetailed.getVIN();
//已选应收款项-应收项目名称
String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
//应收未收款项-当前应收金额
BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
//已选应收款项-认款金额
BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("认款金额超出应收金额，请重新输入");
}
finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
}
finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
}
List<String> payConfirmFiles = dto.getPayConfirmFiles();
String remFilePath = "";
for (String payFilePath : payConfirmFiles) {
if (payFilePath != null) {
remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(dto.getSid());
commonAppendixDto.setFilePath(payFilePath);
commonAppendixDto.setCreateBySid(staffSid);
commonAppendixDto.setFileName("汇款确认");
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
List<String> payConfirmFiles = dto.getPayConfirmFiles();
String remFilePath = "";
for (String payFilePath : payConfirmFiles) {
if (payFilePath != null) {
remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(dto.getSid());
commonAppendixDto.setFilePath(payFilePath);
commonAppendixDto.setCreateBySid(staffSid);
commonAppendixDto.setFileName("汇款确认");
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
remFilePath += remFilePath + ",";
}
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
finCollectionConfirmation.setAuditState(1);
save(finCollectionConfirmation);
} else {
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(dto.getCollectionBillSid());
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
finSelectedReceivablesDetailedService.deleteByCollSid(dto.getCollectionBillSid());
for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin());
finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney());
finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId());
finSelectedReceivablesDetailed.setReceivablesName(paymentDetail.getProjectName());
finSelectedReceivablesDetailed.setContractSid(paymentDetail.getContractSid());
finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName());
finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile());
finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate());
finSelectedReceivablesDetailed.setCollSid(dto.getCollectionBillSid());
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
//已选应收款项-车架号
String vin = finSelectedReceivablesDetailed.getVIN();
//已选应收款项-应收项目名称
String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
//应收未收款项-当前应收金额
BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
//已选应收款项-认款金额
BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney();
BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("认款金额超出应收金额，请重新输入");
}
finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
}
remFilePath += remFilePath + ",";
commonAppendixFeign.delFilesByLinkSidAndAttachType(dto.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
List<String> payConfirmFiles = dto.getPayConfirmFiles();
String remFilePath = "";
for (String payFilePath : payConfirmFiles) {
if (payFilePath != null) {
remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(dto.getSid());
commonAppendixDto.setFilePath(payFilePath);
commonAppendixDto.setCreateBySid(staffSid);
commonAppendixDto.setFileName("汇款确认");
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
remFilePath += remFilePath + ",";
}
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
finCollectionConfirmation.setAuditState(1);
updateById(finCollectionConfirmation);
}
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
return rb.success();
}
@ -566,8 +644,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
List<String> sidList = pagerQuery.getParams().getSidList();
IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw);
IPage<AppFinUncollectedReceivablesDetailedVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw);
List<AppFinUncollectedReceivablesDetailedVo> records = collectionConfirmList.getRecords();
for (AppFinUncollectedReceivablesDetailedVo record : records) {
record.setReceivable(record.getConfirmMoney());
@ -586,10 +663,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {
qw.like("customerName", pagerQuery.getName());
qw.like("furd.customerName", pagerQuery.getName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrgSid())) {
qw.eq("useOrgSid", pagerQuery.getUseOrgSid());
qw.eq("furd.useOrgSid", pagerQuery.getUseOrgSid());
}
if (pagerQuery.getSidList().size() > 0) {
qw.notIn("furd.contractSid", pagerQuery.getSidList());
}
}
return qw;

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
View File

@ -79,7 +79,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
* @param qw
* @return
*/
IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw);
IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw);
@Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}")
@ -94,4 +94,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
@Update("update fin_selected_receivables_detailed set auditDate = NOW() where sid = #{sid1}")
void updateAuditDateBySid(String sid1);
List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(@Param("collectionBillSid") String collectionBillSid);
}

20
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -28,16 +28,13 @@
customerPhone AS mobile,
customerName AS `name`,
currentReceivableMoney AS receivable,
contractSid AS contractSid,
contractSid,
currentReceivableMoney AS confirmMoney,
VIN AS vin
FROM
fin_uncollected_receivables_detailed furd
<where>
${ew.sqlSegment}
<foreach collection="sidList" item="sids" index="index" separator="," open="(" close=")">
#{sids}
</foreach>
</where>
</select>
@ -62,4 +59,19 @@
receivablesName
ORDER BY auditDate
</select>
<select id="selectByCollSid"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo">
SELECT contractNo as contractId,
receivablesName as projectName,
customerPhone as mobile,
customerName as `name`,
currentReceivableMoney as receivable,
contractSid,
subscriptionMoney as confirmMoney,
VIN as vin,
subscriptionDate as confirmDate,
auditState as `state`
FROM fin_selected_receivables_detailed
WHERE collSid = #{collectionBillSid}
</select>
</mapper>

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
View File

@ -179,8 +179,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
* @param qw
* @return
*/
public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw) {
return baseMapper.getPaymentDetailsList(sidList, page, qw);
public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw) {
return baseMapper.getPaymentDetailsList(page, qw);
}
public List<FinSelectedReceivablesDetailedVo> fetchByAuditState(String sid,Integer auditState) {
@ -202,4 +202,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
public void updateAuditDateBySid(String sid1) {
baseMapper.updateAuditDateBySid(sid1);
}
public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) {
return baseMapper.selectByCollSid(collectionBillSid);
}
}
Write Preview
Loading…
Cancel
Save