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

财务做账模板优化

master
fanzongzhe 1 year ago
parent
e82c2ea2a6
commit
c27ae7a1ca
8 changed files with 2181 additions and 7 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. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 2122
      anrui-fin/anrui-fin-biz/src/main/resources/ftl/jrskzs.ftl
  3. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryQuery.java
  4. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryVo.java
  5. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  6. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.xml
  7. 51
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java
  8. 4
      工作内容需要的文档/单据模板/财务凭证打印模板/金融收款单/金融收款单模板(针式打印机).doc

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

@ -3248,7 +3248,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//获取模板
String streamPath = "";
if (printerType.equals("针孔式打印机")) {
streamPath = "ftl/rskzhenshi.ftl";
streamPath = "ftl/jrskzs.ftl";
} else if (printerType.equals("激光打印机")) {
streamPath = "ftl/rskjiguang.ftl";
}

2122
anrui-fin/anrui-fin-biz/src/main/resources/ftl/jrskzs.ftl
View File

File diff suppressed because it is too large

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryQuery.java
View File

@ -20,4 +20,6 @@ public class LoanPushFundHistoryQuery implements Query {
private String startTimes; //计提开始时间
private String endTimes; //计提结束时间
private String orgPath;
private String menuUrl;
private String userSid;
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryVo.java
View File

@ -15,7 +15,7 @@ public class LoanPushFundHistoryVo implements Vo {
// private String bankContractNo;//资方合同号
// private String vinNo;//车架号
// private String borrowerName; //贷款人
// private String salesDept; //销售部门
private String useOrgName; //分公司
private String times; //计提时间
private String money; //本次计提金额
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
View File

@ -1378,6 +1378,12 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
if (StringUtils.isNotBlank(record.getBankBeInter())) {
map.put("beInter", record.getBankBeInter());
}
if (StringUtils.isNotBlank(record.getBankCollectionNum())) {
map.put("accNumber", record.getBankCollectionNum());
}
if (StringUtils.isNotBlank(record.getRemarks())) {
map.put("remarks", record.getRemarks());
}
if (StringUtils.isNotBlank(record.getPadMoney())) {
map.put("padMoney", record.getPadMoney());
sumMoney = sumMoney.add(new BigDecimal(record.getPadMoney()));

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.xml
View File

@ -23,7 +23,8 @@
</select>
<select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistoryVo">
SELECT SUM(fund) as money,
times
times,
(SELECT `name` FROM anrui_portal.sys_organization as s WHERE s.sid = a.useOrgSid) as useOrgName
FROM
(SELECT LEFT(createTime,16) as times,h.* FROM loan_push_fund_history as h) a
<where>

51
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java
View File

@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayVo;
import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistoryPdfVo;
import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistoryQuery;
@ -44,7 +47,8 @@ public class LoanPushFundHistoryService extends MybatisBaseService<LoanPushFundH
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private DocPdfComponent docPdfComponent;
@Autowired
private SysUserFeign sysUserFeign;
public int saveLists(List<LoanPushFundHistory> list) {
return baseMapper.saveLists(list);
}
@ -52,9 +56,48 @@ public class LoanPushFundHistoryService extends MybatisBaseService<LoanPushFundH
public PagerVo<LoanPushFundHistoryVo> listPage(PagerQuery<LoanPushFundHistoryQuery> pq) {
LoanPushFundHistoryQuery pagerQuery = pq.getParams();
QueryWrapper<LoanPushFundHistory> qw = new QueryWrapper<>();
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath());
if (orgSidByPath.getSuccess()) {
qw.eq("a.useOrgSid", orgSidByPath.getData());
if (StringUtils.isNotBlank(pagerQuery.getMenuUrl())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
privilegeQuery.setUserSid(pagerQuery.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (org.apache.commons.lang3.StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = pagerQuery.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i1);
// qw.like("lrd.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, i2);
// qw.like("lrd.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath());
if (orgSidByPath.getSuccess()) {
qw.eq("a.useOrgSid", orgSidByPath.getData());
}
// orgSidPath = orgSidPath.substring(0, i3);
// qw.like("lrd.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
// qw.like("lrd.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
// qw.eq("lrd.createBySid", pagerQuery.getUserSid());
} else {
PagerVo<LoanPushFundHistoryVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<LoanPushFundHistoryVo> p = new PagerVo<>();
return p;
}
}
String startDate = pagerQuery.getStartTimes();
String endDate = pagerQuery.getEndTimes();

4
工作内容需要的文档/单据模板/财务凭证打印模板/金融收款单/金融收款单模板(针式打印机).doc
View File

@ -1,7 +1,7 @@
|收款单 |
|收款日期：|${collDate!} |付款方： |${payee!} |单据编号： |${billNo!} |
|结算方式：|${settleType!} |备注： |${remarks!} |
|收款日期：|${collDate!} |付款方： |${payee!} |单据编号： |${billNo!} |
|结算方式：|${settleType!}|备注： |${remarks!} |
|序号 |贷款人 |
-----------------------

Write Preview
Loading…
Cancel
Save