Browse Source

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
commit
9730f349ee
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  3. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  4. 22
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/ManDateQuery.java
  5. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  6. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  7. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
  8. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
  9. 8
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/AppFinCollectionConfirmationInitRskVo.java
  10. 46
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java
  11. 15
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java
  12. 15
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java
  13. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java
  14. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  15. 27
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  16. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
  17. 106
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  18. 35
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
  19. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json
  20. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/remarks.txt
  21. 9
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java
  22. 64
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
  23. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java
  24. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java
  25. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitRskVo.java
  26. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java
  27. 14
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java
  28. 86
      doc/databases/报表中心.sql

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@ -185,4 +185,6 @@ public class BaseVehicle extends BaseEntity {
private String orgPriceDate;
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
@ApiModelProperty("厂家开票日期")
private String manDate;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@ -528,4 +528,9 @@ public interface BaseVehicleFeign {
@PostMapping("/fetchBySid")
@ResponseBody
ResultBean<BaseVehicle> fetchBySid(@RequestParam("vinSid") String vinSid);
@ApiOperation("设置厂家开票日期")
@PostMapping("/setManDate")
@ResponseBody
ResultBean setManDate(@RequestBody ManDateQuery manDateQuery);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@ -427,6 +427,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean setManDate(ManDateQuery manDateQuery) {
return null;
}
@Override
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid,List<String> list) {
return null;

22
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/ManDateQuery.java

@ -0,0 +1,22 @@
package com.yxt.anrui.base.api.basevehicle;
import com.yxt.common.core.query.Query;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/12/19
**/
@Data
public class ManDateQuery implements Query {
private static final long serialVersionUID = 5859730786367349160L;
private List<String> vinSids = new ArrayList<>();
private String manDate;
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@ -1501,6 +1501,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setData(baseVehicle);
}
@Override
public ResultBean setManDate(ManDateQuery manDateQuery) {
return baseVehicleService.setManDate(manDateQuery);
}
@Override
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

17
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -4369,4 +4369,21 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
}
return rb.success();
}
public ResultBean setManDate(ManDateQuery manDateQuery) {
ResultBean rb = ResultBean.fireFail();
List<String> vinSids = manDateQuery.getVinSids();
vinSids.removeAll(Collections.singleton(null));
if(vinSids.isEmpty()){
return rb.setMsg("请选择车辆");
}
for (int i = 0; i < vinSids.size(); i++) {
BaseVehicle baseVehicle = fetchBySid(vinSids.get(i));
if(baseVehicle != null){
baseVehicle.setManDate(manDateQuery.getManDate());
baseMapper.updateById(baseVehicle);
}
}
return rb.success();
}
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@ -222,4 +222,8 @@ public interface FinCollectionConfirmationFeign {
@ApiOperation("手机端—提交款项确认申请")
@PostMapping("/submitRskCollectionConfirm")
ResultBean submitRskCollectionConfirm(@RequestBody AppFinCollectionConfirmationRskDto appFinCollectionConfirmationDto);
@ApiOperation("手机端—初始化收款确认申请")
@GetMapping("/getRskCollectionConfirmDetail")
ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@ -238,4 +238,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
public ResultBean submitRskCollectionConfirm(AppFinCollectionConfirmationRskDto appFinCollectionConfirmationDto) {
return null;
}
@Override
public ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery) {
return null;
}
}

8
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/AppFinCollectionConfirmationInitRskVo.java

@ -15,9 +15,12 @@ import java.util.List;
*/
@Data
public class AppFinCollectionConfirmationInitRskVo implements Vo {
private String publishInfo;
@ApiModelProperty("款项确认sid")
private String sid;
@ApiModelProperty("汇款确认")
private List<String> images = new ArrayList<>();
@ApiModelProperty("收款银行")
private String collectionBank;
@ -89,7 +92,8 @@ public class AppFinCollectionConfirmationInitRskVo implements Vo {
@ApiModelProperty("单据编号")
private String billNo;
private String reason;
private String cotlectionBitiStateValue;
@ApiModelProperty("采购系统sid")
private String purchaseSystemSid;

46
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java

@ -0,0 +1,46 @@
package com.yxt.anrui.fin.api.kingdee.voucher;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author Fan
* @description
* @date 2023/12/19 11:18
*/
@Data
@ApiModel(value = "收款凭证 数据传输对象", description = "收款凭证 数据传输对象")
public class CollectionVoucher {
@ApiModelProperty("分公司编码")
public String useOrgCode;
@ApiModelProperty("收款方式编码")
public String payTypeCode;
@ApiModelProperty("银行账号")
public String bankAccount;
@ApiModelProperty("凭证明细")
public List<CollectionVoucher.CollectionVoucherDetail> voucherDetails;
@Data
public static class CollectionVoucherDetail {
@ApiModelProperty("场景编码")
public String sceneCode;
@ApiModelProperty("数据日期")
public Date dataTime;
@ApiModelProperty("部门编码")
public String deptCode;
@ApiModelProperty("部门名称")
public String deptName;
@ApiModelProperty("客户编码")
public String customerCode;
@ApiModelProperty("客户名称")
public String customerName;
@ApiModelProperty("备注")
public String remarks;
}
}

15
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java

@ -0,0 +1,15 @@
package com.yxt.anrui.fin.api.kingdee.voucher;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2023/12/19 11:16
*/
@Data
@ApiModel(value = "一般凭证 数据传输对象", description = "一般凭证 数据传输对象")
public class GeneralVoucher {
}

15
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java

@ -0,0 +1,15 @@
package com.yxt.anrui.fin.api.kingdee.voucher;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2023/12/19 11:18
*/
@Data
@ApiModel(value = "一般凭证 数据传输对象", description = "一般凭证 数据传输对象")
public class PaymentVoucher {
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java

@ -30,7 +30,7 @@ public class Voucher {
@ApiModelProperty("摘要")
public String remark;
public String summary;
@ApiModelProperty("科目编码")
public String subjectNo;
@ApiModelProperty("核算维度部门")

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@ -162,4 +162,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
IPage<AppFinCollectionConfirmationPageVo> getRskCollectionConfirmList(IPage<AppFinCollectionConfirmationQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinCollectionConfirmationPageVo> qw, @Param("name") String name);
AppFinCollectionConfirmationInitRskVo initRskCollectionConfirm(@Param("collectionBillSid")String collectionBillSid,@Param("useOrgSid") String useOrgSid);
AppFinCollectionConfirmationInitRskVo getRskCollectionConfirmDetail(@Param("collectionBillSid") String collectionBillSid);
}

27
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@ -386,4 +386,31 @@
WHERE sid = #{collectionBillSid}
AND useOrgSid = #{useOrgSid}
</select>
<select id="getRskCollectionConfirmDetail"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.AppFinCollectionConfirmationInitRskVo">
SELECT sid AS collectionBillSid,
collectionBankNumKey AS collectionNumKey,
collectionBankNum AS collectionNum,
collectionBank,
collectionBankKey,
collectionTypeValue AS collectionType,
collectionTypeKey AS collectionTypeKey,
collectionDate,
payerName AS paymentName,
collectionMoney AS paymentMoney,
remarks,
balance,
createDept,
createDate,
receivingName,
payAccount,
payBank,
accountSid,
createByName,
billNo,
purchaseSystemName,
purchaseSystemSid
FROM fin_collection_confirmation
WHERE sid = #{collectionBillSid}
</select>
</mapper>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@ -329,4 +329,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
public ResultBean submitRskCollectionConfirm(AppFinCollectionConfirmationRskDto appFinCollectionConfirmationDto) {
return finCollectionConfirmationService.submitRskCollectionConfirm(appFinCollectionConfirmationDto);
}
@Override
public ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery) {
return finCollectionConfirmationService.getRskCollectionConfirmDetail(appFinCollectionConfirmationOrgPathQuery);
}
}

106
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -3981,6 +3981,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
);
}
}
qw.eq("1", "1");
qw.orderBy(true, true, "t.loanContractNo")
.orderBy(true, true, "t.vin")
.orderBy(true, true, "t.period")
@ -4003,6 +4004,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
AppFinCollectionConfirmationInitRskVo vo = baseMapper.initRskCollectionConfirm(collectionBillSid, useOrgSid);
List<AppFinUncollectedReceivablesDetailedRskVo> rskList = new ArrayList<>();
if (null != vo) {
if (StringUtils.isNotBlank(vo.getCreateByName()) && StringUtils.isNotBlank(vo.getCreateDept())) {
String createByName = vo.getCreateByName();
String createDept = vo.getCreateDept();
String createDate = vo.getCreateDate();
vo.setPublishInfo(createByName + "(" + createDept + ")" + createDate + "申请");
}
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(collectionBillSid);
if (!finSelectedReceivablesDetailedVos.isEmpty()) {
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
@ -4179,4 +4186,103 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
return rb.success();
}
public ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery query) {
ResultBean<AppFinCollectionConfirmationInitRskVo> rb = ResultBean.fireFail();
String orgPath = query.getOrgPath();
String collectionBillSid = query.getCollectionBillSid();
// String useOrgSid = "";
// if (StringUtils.isNotBlank(orgPath)) {
// useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
// } else {
// useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
// }
AppFinCollectionConfirmationInitRskVo vo = baseMapper.getRskCollectionConfirmDetail(collectionBillSid);
List<AppFinUncollectedReceivablesDetailedRskVo> rskList = new ArrayList<>();
List<CommonAppendixVo> commonAppendixVoList1 = commonAppendixFeign.getAppAppendixList(collectionBillSid, CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()).getData();
List<String> images = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : commonAppendixVoList1) {
String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath();
images.add(url);
}
vo.setImages(images);
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(query.getCollectionBillSid());
if (null != finCollectionConfirmation) {
if (null != finCollectionConfirmation.getAuditState()) {
if (finCollectionConfirmation.getAuditState() == 2) {
vo.setCotlectionBitiStateValue("驳回");
vo.setReason(finCollectionConfirmation.getReason());
} else if (finCollectionConfirmation.getAuditState() == 3) {
vo.setCotlectionBitiStateValue("确认");
}
}
}
if (null != vo) {
if (StringUtils.isNotBlank(vo.getCreateByName()) && StringUtils.isNotBlank(vo.getCreateDept())) {
String createByName = vo.getCreateByName();
String createDept = vo.getCreateDept();
String createDate = vo.getCreateDate();
vo.setPublishInfo(createByName + "(" + createDept + ")" + createDate + "申请");
}
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(collectionBillSid);
if (!finSelectedReceivablesDetailedVos.isEmpty()) {
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
AppFinUncollectedReceivablesDetailedRskVo rsk = new AppFinUncollectedReceivablesDetailedRskVo();
String receivablesSid = v.getReceivablesSid();
if (v.getReceivablesName().equals("月还")) {
LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(receivablesSid).getData();
if (null != data) {
BeanUtil.copyProperties(data, rsk, "sid");
if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
rsk.setVin(data.getVinNo() + "/" + data.getVehMark());
}
String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyRsk(receivablesSid);
if (StringUtils.isNotBlank(noReturnMoney)) {
rsk.setNoReceivable(new BigDecimal(noReturnMoney));
}
}
} else {
FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(receivablesSid);
if (jr != null) {
String busSid = jr.getBusSid();
LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(busSid).getData();
if (null != data) {
BeanUtil.copyProperties(data, rsk, "sid");
if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
rsk.setVin(data.getVinNo() + "/" + data.getVehMark());
}
String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid);
if (StringUtils.isNotBlank(noReturnMoney)) {
rsk.setNoReceivable(new BigDecimal(noReturnMoney));
}
}
}
}
if (StringUtils.isNotBlank(v.getSubscriptionDate())) {
rsk.setConfirmDate(v.getSubscriptionDate());
}
if (null != v.getAuditState()) {
rsk.setState(String.valueOf(v.getAuditState()));
}
rsk.setProjectName(v.getReceivablesName());
// rsk.setSid(v.getSid());
rsk.setConfirmMoney(v.getSubscriptionMoney());
rsk.setReceivablesSid(v.getReceivablesSid());
rskList.add(rsk);
});
}
}
vo.setContractList(rskList);
List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
List<String> payFiles = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath();
payFiles.add(url);
}
vo.setPayFiles(payFiles);
vo.setUserSid(query.getUserSid());
String fils = fileUploadComponent.getUrlPrefix() + "confirm.docx";
vo.setDownLoadUrl(fils);
return rb.success().setData(vo);
}
}

35
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java

@ -9,10 +9,8 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
public class VoucherService extends FinKingDeeService {
@ -29,24 +27,25 @@ public class VoucherService extends FinKingDeeService {
Map<String, String> map_fEntityModel_ = new HashMap<>();
//物料的数组集合
//账簿
if (StringUtils.isBlank(voucher.getAccountBook())) {
return rb.setMsg("账簿不能为空");
}
// if (StringUtils.isBlank(voucher.getAccountBook())) {
// return rb.setMsg("账簿不能为空");
// }
map_fEntityModel_.put("FAccountBookID", voucher.getAccountBook());
//业务日期
if (StringUtils.isBlank(voucher.getBussDate())) {
return rb.setMsg("业务日期不能为空");
}
map_fEntityModel_.put("FDate", voucher.getBussDate());
// if (StringUtils.isBlank(voucher.getBussDate())) {
// return rb.setMsg("业务日期不能为空");
// }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
map_fEntityModel_.put("FDate", sdf.format(new Date()));
//凭证字
if (StringUtils.isBlank(voucher.getVoucherWord())) {
return rb.setMsg("凭证字不能为空");
}
// if (StringUtils.isBlank(voucher.getVoucherWord())) {
// return rb.setMsg("凭证字不能为空");
// }
map_fEntityModel_.put("FVOUCHERGROUPID", voucher.getVoucherWord());
//凭证号
if (StringUtils.isBlank(voucher.getVoucherNo())) {
return rb.setMsg("凭证号不能为空");
}
// if (StringUtils.isBlank(voucher.getVoucherNo())) {
// return rb.setMsg("凭证号不能为空");
// }
map_fEntityModel_.put("FVOUCHERGROUPNO", voucher.getVoucherNo());
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = voucher.getResultDetails() == null ? new ArrayList<>() : voucher.getResultDetails();
@ -85,7 +84,7 @@ public class VoucherService extends FinKingDeeService {
if (StringUtils.isBlank(c.getSubjectNo())) {
return rb.setMsg("科目编码不能为空");
}
m.put("FEXPLANATION", c.getRemark());
m.put("FEXPLANATION", c.getSummary());
m.put("FACCOUNTID", c.getSubjectNo());
m.put("FFLEX5", c.getDimensionDept());
m.put("FFLEX6", c.getDimensionCustom());

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json

@ -9,6 +9,9 @@
},
"FDETAILID__FFLEX6": {
"FNumber": "@KD_FFLEX6"
},
"FDETAILID__FF100002": {
"FNumber": "@KD_FF100002"
}
},
"FCURRENCYID": {

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/remarks.txt

@ -78,4 +78,8 @@
取消复核操(作辅助):FCancleRecheck
来源系统:FSystemID
是否调整期凭证:FISADJUSTVOUCHER
出纳复核操作(辅助):FCashierRecheck
出纳复核操作(辅助):FCashierRecheck
维度:
FDETAILID__FF100002 银行账号
FDETAILID__FFLEX5 部门编号
FDETAILID__FFLEX6 客户编码

9
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportAppVo.java

@ -127,4 +127,13 @@ public class DailyReportAppVo {
private boolean rightBtn2;
private boolean rightBtn3;*/
private ParameterVo row101;
private ParameterVo row102;
private ParameterVo row103;
private ParameterVo row104;
private ParameterVo row105;
private ParameterVo row106;
private ParameterVo row107;
}

64
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

@ -576,7 +576,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
public ResultBean<DailyReportAppVo> list2(String date) {
ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
dailyReportAppVo.setTitle("集团(事业部)"+date+"日报");
dailyReportAppVo.setTitle("集团(事业部)" + date + "日报");
List<BrandVo> rows1 = baseMapper.list2(date);
rows1.removeAll(Collections.singleton(null));
dailyReportAppVo.setRow1(rows1);
@ -819,7 +819,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
List<BrandVo> rows1 = baseMapper.list3(date, busOrgSid);
dailyReportAppVo.setTitle("事业部(分公司)"+date+"日报");
dailyReportAppVo.setTitle("事业部(分公司)" + date + "日报");
rows1.removeAll(Collections.singleton(null));
dailyReportAppVo.setRow1(rows1);
List<DailyReportVo> dailyReportVoList = baseMapper.selectReport3(date, busOrgSid);
@ -1060,11 +1060,15 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
public ResultBean<DailyReportAppVo> list4(String date, String useOrgSid) {
ResultBean<DailyReportAppVo> rb = ResultBean.fireFail();
DailyReportAppVo dailyReportAppVo = new DailyReportAppVo();
dailyReportAppVo.setTitle("分公司"+date+"日报");
dailyReportAppVo.setTitle("分公司" + date + "日报");
List<BrandVo> rows1 = baseMapper.selectByBrand2(useOrgSid, date);
rows1.removeAll(Collections.singleton(null));
dailyReportAppVo.setRow1(rows1);
List<String> brandList = rows1.stream().map(v -> v.getLinkSid()).collect(Collectors.toList());
brandList.removeAll(Collections.singleton(null));
if(brandList.isEmpty()){
return rb.success();
}
List<DailyReportVo> dailyReportVoList = baseMapper.selectReport4(brandList, useOrgSid, date);
//燃料
List<String> row2 = dailyReportVoList.stream().map(v -> v.getFuelTypeValue()).collect(Collectors.toList());
@ -1314,7 +1318,7 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
ParameterVo parameterVo = new ParameterVo();
parameterVo.setName(dailyParameterVo.getColText());
List<String> columnNames = dailyReportVoList.stream().map(v-> {
List<String> columnNames = dailyReportVoList.stream().map(v -> {
String columnName = "";
try {
Field field = v.getClass().getDeclaredField(dailyParameterVo.getColName());
@ -1323,9 +1327,9 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
} catch (NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
}
if(StringUtils.isBlank(columnName)){
if (StringUtils.isBlank(columnName)) {
return "-";
}else{
} else {
return columnName;
}
}).collect(Collectors.toList());
@ -1334,6 +1338,54 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
dynamicRows.add(parameterVo);
}
dailyReportAppVo.setDynamicRows(dynamicRows);
if (!dynamicRows.isEmpty()) {
for (int i = 0; i < dynamicRows.size(); i++) {
if (i > 6) {
break;
} else {
ParameterVo parameterVo = dynamicRows.get(i);
switch (i) {
case 0:
if (parameterVo != null) {
dailyReportAppVo.setRow101(parameterVo);
}
break;
case 1:
if (parameterVo != null) {
dailyReportAppVo.setRow102(parameterVo);
}
break;
case 2:
if (parameterVo != null) {
dailyReportAppVo.setRow103(parameterVo);
}
break;
case 3:
if (parameterVo != null) {
dailyReportAppVo.setRow104(parameterVo);
}
break;
case 4:
if (parameterVo != null) {
dailyReportAppVo.setRow105(parameterVo);
}
break;
case 5:
if (parameterVo != null) {
dailyReportAppVo.setRow106(parameterVo);
}
break;
case 6:
if (parameterVo != null) {
dailyReportAppVo.setRow107(parameterVo);
}
break;
default:
break;
}
}
}
}
return rb.success().setData(dailyReportAppVo);
}
}

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@ -125,4 +125,8 @@ public interface AppFinCollectionConfirmationFeign {
@PostMapping("/submitRskCollectionConfirm")
public ResultBean submitRskCollectionConfirm(@RequestBody ConfirmationRskDto dto);
@ApiOperation("手机端—款项确认申请详情")
@GetMapping("/getRskCollectionConfirmDetail")
public ResultBean<ConfirmationInitRskVo> getRskCollectionConfirmDetail(@SpringQueryMap CollectionConfirmationOrgPathQuery query);
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@ -131,4 +131,9 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
public ResultBean submitRskCollectionConfirm(ConfirmationRskDto dto) {
return null;
}
@Override
public ResultBean<ConfirmationInitRskVo> getRskCollectionConfirmDetail(CollectionConfirmationOrgPathQuery query) {
return null;
}
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitRskVo.java

@ -16,6 +16,9 @@ import java.util.List;
@Data
public class ConfirmationInitRskVo implements Vo {
private String publishInfo;
private String reason;
private String cotlectionBitiStateValue;
@ApiModelProperty("款项确认sid")
private String sid;
@ -64,6 +67,9 @@ public class ConfirmationInitRskVo implements Vo {
@ApiModelProperty("款项明细")
private List<UncollectedReceivablesDetailedRskVo> contractList = new ArrayList<>();
@ApiModelProperty("汇款确认")
private List<String> images = new ArrayList<>();
@ApiModelProperty("余额")
private String balance;

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@ -181,4 +181,9 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
public ResultBean submitRskCollectionConfirm(ConfirmationRskDto dto) {
return appfinCollectionConfirmationService.submitRskCollectionConfirm(dto);
}
@Override
public ResultBean<ConfirmationInitRskVo> getRskCollectionConfirmDetail(CollectionConfirmationOrgPathQuery query) {
return appfinCollectionConfirmationService.getRskCollectionConfirmDetail(query);
}
}

14
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@ -295,4 +295,18 @@ public class AppFinCollectionConfirmationService {
ResultBean resultBean = finCollectionConfirmationFeign.submitRskCollectionConfirm(appFinCollectionConfirmationDto);
return resultBean;
}
public ResultBean<ConfirmationInitRskVo> getRskCollectionConfirmDetail(CollectionConfirmationOrgPathQuery query) {
ResultBean<ConfirmationInitRskVo> rb = ResultBean.fireFail();
ConfirmationInitRskVo vo = new ConfirmationInitRskVo();
AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery = new AppFinCollectionConfirmationOrgPathQuery();
BeanUtil.copyProperties(query, appFinCollectionConfirmationOrgPathQuery);
ResultBean<AppFinCollectionConfirmationInitRskVo> resultBean = finCollectionConfirmationFeign.getRskCollectionConfirmDetail(appFinCollectionConfirmationOrgPathQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
AppFinCollectionConfirmationInitRskVo data = resultBean.getData();
BeanUtil.copyProperties(data, vo);
return rb.success().setData(vo);
}
}

86
doc/databases/报表中心.sql

@ -544,7 +544,7 @@ where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-- ==============================================
-- 欠款出库数量、欠款出库金额万元、金融未放款数量、金融未放款金额(万元)
-- 欠款出库数量--截止当日欠款出库申请通过且未回清款的台数
update daily_report r inner join (
select count(bdad.id) as scount, ba.useOrgSid, bm.modelConfigSid as vehMConfigSid, bm.modelSid as vehModelSid
from anrui_buscenter.bus_delivered_apply_details bdad
@ -552,9 +552,12 @@ update daily_report r inner join (
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.sid
left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid
left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bdad.busVinSid
left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid
where ba.nodeState = '已办结'
and typeState = 1
group by ba.useOrgSid, bm.modelSid, bm.modelConfigSid) s
and ba.typeState = 1
group by bdad.busVinSid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid
having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)) s
on r.useOrgSid = s.useOrgSid
and r.vehModelSid = s.vehModelSid
and r.vehMConfigSid = s.vehMConfigSid
@ -562,6 +565,83 @@ set arrears_carry_veh_count = s.scount
where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-- 欠款出库金融--截止当日欠款出库申请通过且未回清款的台数欠款总额
update daily_report r inner join (
select (sum(fd.reveivableMoney) - sum(fs.subscriptionMoney)) as scount,
ba.useOrgSid,
bm.modelConfigSid as vehMConfigSid,
bm.modelSid as vehModelSid
from anrui_buscenter.bus_delivered_apply_details bdad
left join anrui_buscenter.bus_delivered_apply ba on ba.sid = bdad.applySid
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.sid
left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid
left join anrui_base.base_vehicle_state bs on bs.busSid = bdad.busVinSid
left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bdad.busVinSid
left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid
where ba.nodeState = '已办结'
and ba.typeState = 1
group by bdad.busVinSid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid
having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)
) s
on r.useOrgSid = s.useOrgSid
and r.vehModelSid = s.vehModelSid
and r.vehMConfigSid = s.vehMConfigSid
set arrears_carry_veh_amount = s.scount
where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-- 金融未放款数量--- 截止当日贷款业务已出库且融资放款未认款的台数
update daily_report r inner join (
select count(bv.id) as scount, bo.useOrgSid, bm.modelSid, bm.modelConfigSid, fd.reveivableMoney
from anrui_buscenter.bus_sales_order_vehicle bv
left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bv.salesOrderSid
left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bv.sid
left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid
where bo.payTypeKey = 2
and fd.receivablesName = '融资放款'
and bbv.vehicleState = '0002'
group by bv.sid, bo.useOrgSid, bm.modelSid, bm.modelConfigSid
having fd.reveivableMoney > ifnull(sum(fs.subscriptionMoney), 0)) as s on
r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid
SET r.`loan_not_count`=s.scount
WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
;
-- 金融未放款金额-- 截止当日贷款业务已出库且融资放款未认款的台数融资放款金额之和
update daily_report r inner join (
select sum(fd.reveivableMoney) as scount, bo.useOrgSid, bm.modelSid, bm.modelConfigSid, fd.reveivableMoney
from anrui_buscenter.bus_sales_order_vehicle bv
left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid
left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bv.salesOrderSid
left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bv.sid
left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid
where bo.payTypeKey = 2
and fd.receivablesName = '融资放款'
and bbv.vehicleState = '0002'
group by bv.sid, bo.useOrgSid, bm.modelSid, bm.modelConfigSid
having fd.reveivableMoney > ifnull(sum(fs.subscriptionMoney), 0)) as s on
r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid
SET r.`loan_not_amount`=s.scount
WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-- 全年厂家开票数
UPDATE daily_report r INNER JOIN (SELECT COUNT(id) AS scount, `useOrgSid`, `modelSid`, `modelConfigSid`
FROM anrui_base.`base_vehicle`
WHERE manDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
GROUP BY `useOrgSid`, `modelSid`, `modelConfigSid`) AS s ON
r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid
SET r.`manufacturer_invoicing_year`=s.scount
WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();

Loading…
Cancel
Save