财务做账模板优化

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

@@ -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";
             }

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

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

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

@@ -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; //本次计提金额
 }

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

@@ -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()));

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

@@ -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>

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

@@ -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,10 +56,49 @@ public class LoanPushFundHistoryService extends MybatisBaseService<LoanPushFundH
     public PagerVo<LoanPushFundHistoryVo> listPage(PagerQuery<LoanPushFundHistoryQuery> pq) {
         LoanPushFundHistoryQuery pagerQuery = pq.getParams();
         QueryWrapper<LoanPushFundHistory> qw = new QueryWrapper<>();
+        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();
         qw.apply(StringUtils.isNotEmpty(startDate), "date_format(a.times,'%Y-%m-%d %H:%I') >= date_format('" + startDate + "','%Y-%m-%d %H:%I')").