修改还款计划下载pdf接口

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@@ -87,9 +87,7 @@ public interface LoanRepaymentScheduleFeign {
     @ApiOperation(value = "导入贷后历史数据")
     @PostMapping("/importHistoryData")
     public ResultBean importHistoryData(
-            @RequestParam(value = "file") MultipartFile file,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException;
+            @RequestParam(value = "file") MultipartFile file, @RequestParam(value = "request") HttpServletRequest request, @RequestParam(value = "response") HttpServletResponse response) throws IOException;
 
     //-------------------------app接口--------------------
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -2666,6 +2666,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndXdConSid(salesOrderSid, loanContractSid).getData();
         String isOtherPolicy = schedule.getIsOtherPolicy();
         String sameBank = schedule.getSameBank();
+        String isDifferent = schedule.getIsDifferent(); // 是否有单独车辆不同
         String mainOrOther = "";
         if (null != salesOrder) {
             if (!vehicles.isEmpty()) {
@@ -2920,6 +2921,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 }
             }
         }
+        System.out.println("------------------------");
+        System.out.println(pdfs);
+        System.out.println("------------------------");
         return pdfs;
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/vouchers/returnMoney3.ftl

@@ -7574,7 +7574,7 @@
                                     <w:u w:val="none"/>
                                     <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
                                 </w:rPr>
-                                <w:t>${fMoney2!}</w:t>
+                                <w:t>${fMoney3!}</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -8226,4 +8226,4 @@
                 <w:docGrid w:type="lines" w:line-pitch="312"/>
             </w:sectPr>
         </wx:sect>
-    </w:body></w:wordDocument>
+    </w:body></w:wordDocument>

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java

@@ -19,6 +19,8 @@ public class BaseGoodsDetailsDto implements Dto {
     private String userSid;
     private String orgPath;
 
+    private String createOrgSid;
+    private String useOrgSid;
     private String goodsName;//商品名称
     private String goodsCode;//图号
     private String goodsPY;//拼音缩写

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java

@@ -17,7 +17,8 @@ public class BaseGoodsDetailsVo implements Vo {
     private String sid;
     private String userSid;
     private String orgPath;
-
+    private String createOrgSid;
+    private String useOrgSid;
     private String goodsName;//商品名称
     private String goodsCode;//图号
     private String goodsPY;//拼音缩写

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@@ -282,10 +282,6 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
     public ResultBean<String> saveOrUpdateGoods(BaseGoodsDetailsDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = "";
-        String orgPath = "";
-        if (StringUtils.isNotBlank(dto.getOrgPath())) {
-            orgPath = dto.getOrgPath();
-        }
         BaseGoodsSpu spun = baseMapper.selectOne(new QueryWrapper<BaseGoodsSpu>().eq("sid", dto.getSid()));
         if (spun != null) {
             sid = dto.getSid();
@@ -415,34 +411,10 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
             sid = wmsGoods.getSid();
             BeanUtil.copyProperties(dto, wmsGoods, "id", "sid");
             wmsGoods.setCreateBySid(dto.getUserSid());
-            String deptName = "";
-            String deptSid = "";
-            String createOrgSid = "";
-            if (StringUtils.isNotBlank(orgPath)) {
-                List<String> split = Arrays.asList(orgPath.split("/"));
-                if (split.size() > 1) {
-                    //获取本级sid获取本级部门信息
-                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
-                    SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-                    deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
-                    deptName = sysOrganization1.getName();
-                    deptSid = sysOrganization1.getSid();
-                } else {
-                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-                    deptName = sysOrganization.getName();
-                    deptName = sysOrganization.getName();
-                    deptSid = sysOrganization.getSid();
-                }
-                wmsGoods.setUseOrgSid(deptSid);
-                createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-                //创建组织使用组织
-                ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
-                if (organizationResultBean.getData() != null) {
-                    wmsGoods.setCreateOrgSid(createOrgSid);
-                }
-            }
+            wmsGoods.setUseOrgSid(dto.getUseOrgSid());
+            wmsGoods.setCreateOrgSid(dto.getCreateOrgSid());
             wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));
-            BaseGoodsSpu spu = baseMapper.checkForInsert(dto.getGoodsCode(), deptSid);
+            BaseGoodsSpu spu = baseMapper.checkForInsert(dto.getGoodsCode(), dto.getUseOrgSid());
             if (spu != null) {
                 return rb.setMsg("商品编码重复");
             }

工作内容需要的文档/单据模板/财务凭证打印模板/还款计划/还款计划3.docx

@@ -186,7 +186,7 @@ ${dueDate3!}
 
 
                                                                 首期月还：
-${fMoney2!}
+${fMoney3!}
                                                                 期间月还：
 ${mMoney3!}
 末期月还：
@@ -206,3 +206,4 @@ ${lMoney3!}
 
 
 
+