更改

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java

@@ -107,4 +107,6 @@ public class FinPaymentapplyDetailsVo implements Vo {
 
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("分公司sid")
+    private String orgSidPath;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java

@@ -117,4 +117,6 @@ public class FinPaymentrecord extends BaseEntity {
     private String busRemarks;
     @ApiModelProperty(value = "付款手续费")
     private BigDecimal paymentCharges;
+    @ApiModelProperty("是否推送回款返利，0不推送，1推送")
+    private Integer isPushHkfl;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@@ -82,6 +82,10 @@ public class FinPaymentrecordDto implements Dto {
     private String busSid;
     @ApiModelProperty(value = "付款备注")
     private String payRemark;
+    @ApiModelProperty("付款方式Key，支票/转账")
+    private String payWayKey;
+    @ApiModelProperty("付款方式Value")
+    private String payWayValue;
 
     @ApiModelProperty("供应商编码")
     private String payCode;
@@ -99,4 +103,6 @@ public class FinPaymentrecordDto implements Dto {
 
     @ApiModelProperty("付款时备注内容")
     private String busRemarks;
+    @ApiModelProperty("是否推送回款返利，0不推送，1推送")
+    private Integer isPushHkfl;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java

@@ -54,5 +54,6 @@ public class FinPaymentrecordUpdateDto implements Dto {
     private String accountsReceive;
     @ApiModelProperty(value = "付款手续费")
     private String paymentCharges;
-
+    @ApiModelProperty("是否推送回款返利，0不推送，1推送")
+    private Integer isPushHkfl;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java

@@ -51,6 +51,7 @@ import java.util.List;
 public class FinPaymentrecordVo implements Vo {
 
     private static final long serialVersionUID = 6164912180325777872L;
+    private String id;
     private String sid;
     @ApiModelProperty("付款银行")
     private String payBank;
@@ -90,5 +91,6 @@ public class FinPaymentrecordVo implements Vo {
     private String payCode;
     @ApiModelProperty("付款时备注")
     private String busRemarks;
-
+    @ApiModelProperty("付款方式Value")
+    private String payWayValue;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml

@@ -103,7 +103,8 @@
                fp.carBrandName,
                fp.isSales,
                fp.isSettle,
-               fp.useOrgSid
+               fp.useOrgSid,
+               fp.orgSidPath
         from fin_paymentapply fp
         where fp.sid = #{sid}
     </select>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -67,6 +67,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign;
@@ -126,6 +127,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     private FinPaymentrecordService finPaymentrecordService;
     @Autowired
     private SysStaffPostFeign sysStaffPostFeign;
+    @Autowired
+    private SysParameterFeign sysParameterFeign;
 
     @Autowired
     private FinPaymentapplyDetailsService finPaymentapplyDetailsService;
@@ -554,15 +557,29 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
                 //使用组织
                 finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
-                //款项类别
-                finPaymentrecordDto.setCostTypeKey(finPaymentapply.getCostTypeKey());
-                finPaymentrecordDto.setCostTypeValue(finPaymentapply.getCostTypeValue());
                 //备注
                 finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                 List<FinPaymentapplyDetailVo> detailVoList = vo.getDetailsList();
                 detailVoList.removeAll(Collections.singleton(null));
                 if (!detailVoList.isEmpty()) {
                     for (FinPaymentapplyDetailVo finPaymentapplyDetailVo : detailVoList) {
+                        //款项名称
+                        finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailVo.getCostTitleKey());
+                        finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailVo.getCostTitleValue());
+                        //款项详情
+                        finPaymentrecordDto.setCostTitleKey(finPaymentapplyDetailVo.getCostTitleKey());
+                        finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailVo.getCostTitleValue());
+                        //付款方式
+                        finPaymentrecordDto.setPayWayKey(finPaymentapplyDetailVo.getPaymentTypeKey());
+                        finPaymentrecordDto.setPayWayValue(finPaymentapplyDetailVo.getPaymentType());
+                        //是否推送回款返利
+                        //Integer isPushHkfl = sysParameterFeign.fetchCountByParNoAndParValueAndUseOrgSid("YW_BTHKFL", finPaymentapplyDetailVo.getCostTitleKey() + finPaymentapplyDetailVo.getCostTitleValue() + "," + finPaymentapplyDetailVo.getPaymentTypeKey() + finPaymentapplyDetailVo.getPaymentType() + "," + finPaymentapplyDetailVo.getActualPay(), finPaymentapply.getUseOrgSid()).getData();
+                        /*if (isPushHkfl > 0) {
+                            finPaymentrecordDto.setIsPushHkfl(0);
+                        } else {
+                            finPaymentrecordDto.setIsPushHkfl(1);
+                        }*/
+                        finPaymentrecordDto.setIsPushHkfl(1);
                         finPaymentrecordDto.setBusSid(finPaymentapplyDetailVo.getSid());
                         //收款银行账号
                         finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailVo.getReceivingAccount());
@@ -573,6 +590,30 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                             finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailVo.getPayAccount());
                         }
                         finPaymentrecordService.saveDto(finPaymentrecordDto);
+                        List<FinPaymentapplyDetailsBelowDetailsVo> finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid());
+                        for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) {
+                            //款项名称
+                            finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailsBelowDetailsVo.getCostTitleKey());
+                            finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowDetailsVo.getCostTitleValue());
+                            //款项详情
+                            finPaymentrecordDto.setCostTitleKey(finPaymentapplyDetailsBelowDetailsVo.getCostTitleKey());
+                            finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailsBelowDetailsVo.getCostTitleValue());
+                            //付款方式
+                            finPaymentrecordDto.setPayWayKey(finPaymentapplyDetailsBelowDetailsVo.getPaymentTypeKey());
+                            finPaymentrecordDto.setPayWayValue(finPaymentapplyDetailsBelowDetailsVo.getPaymentType());
+                            //是否推送回款返利
+                            finPaymentrecordDto.setIsPushHkfl(0);
+                            finPaymentrecordDto.setBusSid(finPaymentapplyDetailsBelowDetailsVo.getSid());
+                            //收款银行账号
+                            finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailsBelowDetailsVo.getReceivingAccount());
+                            finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailsBelowDetailsVo.getBank());
+                            //金额
+                            if (finPaymentapplyDetailsBelowDetailsVo.getPayAccount() != null) {
+                                finPaymentrecordDto.setCost(finPaymentapplyDetailsBelowDetailsVo.getPayAccount().toString());
+                                finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailsBelowDetailsVo.getPayAccount().toString());
+                            }
+                            finPaymentrecordService.saveDto(finPaymentrecordDto);
+                        }
                     }
                 }
             } else {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml

@@ -4,7 +4,8 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordVo">
-        SELECT fp.sid,
+        SELECT fp.id,
+               fp.sid,
                fp.payBank,
                fp.payBankAccount,
                fp.name,
@@ -24,7 +25,8 @@
                fp.cost,
                fp.payFile,
                fp.payCode,
-        fp.busRemarks
+               fp.busRemarks,
+               fp.payWayValue
         FROM fin_paymentrecord fp
         LEFT JOIN anrui_portal.sys_organization so ON fp.createOrgSid = so.sid
         <where>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -385,7 +385,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
             //到回款返利申请
-            if (finPaymentrecord.getCostTypeValue().equals("厂家车款") && !dto.getPayWayValue().equals("返利抵车款")) {
+            if (finPaymentrecord.getIsPushHkfl() == 1) {
                 ScmCollectionRebateDto scmCollectionRebateDto = new ScmCollectionRebateDto();
                 List<ScmCollectionRebateVehDto> scmCollectionRebateVehDtos = new ArrayList<>();
                 FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid());
@@ -775,6 +775,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             deptName.append(pname).append("-").append(orgName).append("-").append(deptOrgName).append(" ");
         }
         //获取审批编号
+        FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid());
         BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(finPaymentrecord.getApplySid()).getData();
         BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()).getData();
         BaseVehicleActualPay baseVehicleActualPay = baseVehicleActualPayFeign.fetchBySid(finPaymentrecord.getApplySid()).getData();
@@ -782,6 +783,54 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         if (baseVehicleActualPay != null) {
             baseVehicleActualSalesDetailsVo = baseVehicleActualSalesFeign.details(baseVehicleActualPay.getVehicleActualSid()).getData();
         }
+        if (finPaymentapply != null) {
+            if (StringUtils.isNotBlank(finPaymentapply.getSid())) {
+                dataMap.put("applyCode", finPaymentapply.getBillNo());
+                //获取审批记录
+                List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeign.flowRecordAndComment(finPaymentapply.getProcInstId(), "1").getData();
+                List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
+                for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
+                    if (flowTask.getFlowableRecordVo() != null) {
+                        Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
+                        FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
+                        List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
+                        Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment");
+                        String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
+                        String comment1 = (String) comment.get("comment");
+                        finPaymentrecordSourceLCVo.setName(assigneeName);
+                        finPaymentrecordSourceLCVo.setComment(comment1);
+                        finPaymentrecordSourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString());
+                        finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
+                    } else {
+                        Map<String, Object> processCommentVo = flowTask.getProcessCommentVo();
+                        FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
+                        finPaymentrecordSourceLCVo.setName(processCommentVo.get("title").toString());
+                        finPaymentrecordSourceLCVo.setComment(processCommentVo.get("content").toString());
+                        finPaymentrecordSourceLCVo.setSpsj(processCommentVo.get("time").toString());
+                        finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
+                    }
+                }
+                List<Message> messages = messageFeign.selectByBusinessSid(finPaymentapply.getSid()).getData();
+                if (messages.size() > 0) {
+                    for (Message message : messages) {
+                        FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo();
+                        String receiverNames = "";
+                        List<MessageList> messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData();
+                        if (messageLists.size() > 0) {
+                            for (MessageList messageList : messageLists) {
+                                receiverNames = receiverNames + messageList.getReceiverName() + "，";
+                            }
+                        }
+                        finPaymentrecordSourceLCVo.setName("系统");
+                        finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，")));
+                        finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+                        finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo);
+                    }
+                }
+                finPaymentrecordSourceLCVos.sort(comparing(FinPaymentrecordSourceLCVo::getSpsj));
+                dataMap.put("lcList", finPaymentrecordSourceLCVos);
+            }
+        }
         if (baseOutsourcingApplicationDetailsVo != null) {
             if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) {
                 dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode());
@@ -933,6 +982,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             finPaymentrecordSourceLCVos.sort(comparing(FinPaymentrecordSourceLCVo::getSpsj));
             dataMap.put("lcList", finPaymentrecordSourceLCVos);
         }
+        dataMap.put("payCode", finPaymentrecord.getId());
         dataMap.put("createTime", DateUtil.format(finPaymentrecord.getCreateTime(), "yyyy-MM-dd"));
         dataMap.put("createByName", createByName);
         dataMap.put("createByDeptName", deptName);
@@ -961,6 +1011,17 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 vinRemark = vinNo;
             }
             dataMap.put("payRemark", vinRemark);
+        } else if (finPaymentapply != null) {
+            dataMap.put("remarks", finPaymentapply.getCostTypeValue() + "，" + finPaymentrecord.getCostTitleValue() + "，" + finPaymentapply.getRemarks());
+            FinPaymentapplyDetails finPaymentapplyDetails = finPaymentapplyDetailsService.fetchBySid(finPaymentrecord.getApplySid());
+            if ("1".equals(finPaymentapply.getIsVeh())){
+                List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid());
+                String payRemark = "";
+                for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) {
+                    payRemark = payRemark + finPaymentapplyVehicleVo.getVinNo() + "(" + finPaymentapplyVehicleVo.getMoney() + "元)，" + finPaymentapplyDetails.getActualPay() + "，" + finPaymentapplyDetails.getRemarks() + "：";
+                }
+                dataMap.put("payRemark", payRemark);
+            }
         } else {
             dataMap.put("remarks", finPaymentrecord.getRemarks());
             dataMap.put("payRemark", finPaymentrecord.getPayRemark());
@@ -974,6 +1035,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         //获取图片路径
         List<String> photoList = new ArrayList<>();
         dataMap.put("photoPath64", photoList);
+        //下载人
+        dataMap.put("downName", userName);
+        //下载时间
+        dataMap.put("downTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
         //获取模板
         //模板路径
         String sourcePath = "D:\\anrui\\upload\\template\\";
@@ -1169,6 +1234,44 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 baseManufUpdateDto.setState("2");
                 ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto);
             }
+            ScmCollectionRebateDto scmCollectionRebateDto = new ScmCollectionRebateDto();
+            List<ScmCollectionRebateVehDto> scmCollectionRebateVehDtos = new ArrayList<>();
+            FinPaymentapplyDetails finPaymentapplyDetails = finPaymentapplyDetailsService.fetchBySid(finPaymentrecord.getBusSid());
+            List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid());
+            scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid());
+            scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
+            scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey());
+            scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue());
+            scmCollectionRebateDto.setManufaSaleChannel("");
+            scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay());
+            scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost());
+            scmCollectionRebateDto.setCollectionDate(DateUtil.formatDate(finPaymentrecord.getPayDate()));
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid()).getData();
+            scmCollectionRebateDto.setCreateOrgSid(finPaymentrecord.getCreateOrgSid());
+            scmCollectionRebateDto.setCreateOrgName(sysOrganizationVo.getName());
+            scmCollectionRebateDto.setUseOrgSid(finPaymentrecord.getUseOrgSid());
+            scmCollectionRebateDto.setUseOrgName(sysOrganizationVo.getName());
+            scmCollectionRebateDto.setOrgPath(finPaymentapply.getOrgSidPath());
+            scmCollectionRebateDto.setCreateBySid(finPaymentrecord.getCreateBySid());
+            if (vehicleList != null && vehicleList.size() > 0) {
+                for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) {
+                    ScmCollectionRebateVehDto scmCollectionRebateVehDto = new ScmCollectionRebateVehDto();
+                    BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(finPaymentapplyVehicleVo.getVehiSid()).getData();
+                    scmCollectionRebateVehDto.setCarModelSid(finPaymentapplyVehicleVo.getModelSid());
+                    scmCollectionRebateVehDto.setCarModelName(finPaymentapplyVehicleVo.getModelName());
+                    scmCollectionRebateVehDto.setPriceDate(DateUtil.format(baseVehicleSelectVo.getPriceDate(), "yyyy-MM-dd"));
+                    if (baseVehicleSelectVo.getSalesDate() != null) {
+                        scmCollectionRebateVehDto.setSalesDate(DateUtil.format(baseVehicleSelectVo.getSalesDate(), "yyyy-MM-dd"));
+                    }
+                    scmCollectionRebateVehDto.setVehSid(finPaymentapplyVehicleVo.getVehiSid());
+                    scmCollectionRebateVehDto.setVinNo(finPaymentapplyVehicleVo.getVinNo());
+                    scmCollectionRebateVehDto.setCostPrice(finPaymentapplyVehicleVo.getMoney());
+                    scmCollectionRebateVehDtos.add(scmCollectionRebateVehDto);
+                }
+            }
+            scmCollectionRebateDto.setScmCollectionRebateVehs(scmCollectionRebateVehDtos);
+            scmCollectionRebateDto.setIsEnable(1);
+            scmCollectionRebateFeign.save(scmCollectionRebateDto);
         }
         return rb.success();
     }

anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl

@@ -93,7 +93,7 @@
                             <w:rPr>
                                 <w:rFonts w:hint="eastAsia"/>
                             </w:rPr>
-                            <w:t xml:space="preserve">河北安瑞汽车租赁集团有限公司 </w:t>
+                            <w:t xml:space="preserve">${createOrgName!} </w:t>
                         </w:r>
                         <w:r>
                             <w:rPr>
@@ -193,6 +193,37 @@
                                     </w:r>
                                 </w:p>
                             </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="1070" w:type="pct"/>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="center"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="eastAsia"/>
+                                        </w:rPr>
+                                        <w:t>付款编号</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="3929" w:type="pct"/>
+                                    <w:gridSpan w:val="2"/>
+                                    <w:noWrap w:val="0"/>
+                                    <w:vAlign w:val="center"/>
+                                </w:tcPr>
+                                <w:p>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="eastAsia"/>
+                                        </w:rPr>
+                                        <w:t>${payCode!}</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
                         </w:tr>
                         <w:tr>
                             <w:tblPrEx>
@@ -887,7 +918,126 @@
                         </w:tr>
                         </#if>
                         </#list>
-
+                        <w:tr>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="1509" w:type="dxa"/>
+                                    <w:gridSpan w:val="4"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                                </w:tcPr>
+                                <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                                    <w:pPr>
+                                        <w:jc w:val="right"/>
+                                        <w:rPr>
+                                            <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                            <wx:font wx:val="宋体"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                            <wx:font wx:val="宋体"/>
+                                        </w:rPr>
+                                        <w:t>下载人：</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="2753" w:type="dxa"/>
+                                    <w:gridSpan w:val="4"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                                </w:tcPr>
+                                <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                                    <w:pPr>
+                                        <w:jc w:val="left"/>
+                                        <w:rPr>
+                                            <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                            <wx:font wx:val="宋体"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                            <wx:font wx:val="宋体"/>
+                                            <w:sz-cs w:val="21"/>
+                                        </w:rPr>
+                                        <w:t>${downName!}</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="2263" w:type="dxa"/>
+                                    <w:gridSpan w:val="5"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                                </w:tcPr>
+                                <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                                    <w:pPr>
+                                        <w:jc w:val="right"/>
+                                        <w:rPr>
+                                            <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                            <wx:font wx:val="宋体"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                            <wx:font wx:val="宋体"/>
+                                        </w:rPr>
+                                        <w:t>下载时间：</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                            <w:tc>
+                                <w:tcPr>
+                                    <w:tcW w:w="2918" w:type="dxa"/>
+                                    <w:gridSpan w:val="6"/>
+                                    <w:tcBorders>
+                                        <w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+                                        <w:left w:val="nil"/>
+                                        <w:bottom w:val="nil"/>
+                                        <w:right w:val="nil"/>
+                                    </w:tcBorders>
+                                    <w:shd w:val="clear" w:color="auto" w:fill="auto"/>
+                                </w:tcPr>
+                                <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                                    <w:pPr>
+                                        <w:jc w:val="left"/>
+                                        <w:rPr>
+                                            <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                            <wx:font wx:val="宋体"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r>
+                                        <w:rPr>
+                                            <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                            <wx:font wx:val="宋体"/>
+                                            <w:sz-cs w:val="21"/>
+                                        </w:rPr>
+                                        <w:t>${downTime!}</w:t>
+                                    </w:r>
+                                </w:p>
+                            </w:tc>
+                        </w:tr>
                     </w:tbl>
                     <w:p/>
                     <w:p/>

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterFeign.java

@@ -57,6 +57,11 @@ public interface SysParameterFeign {
     @ResponseBody
     ResultBean<SysParameter> fetchOneByParNo(@RequestParam("parNo") String parNo);
 
+    @ApiOperation("根据参数编码、参数值、分公司查询是否存在该参数")
+    @PostMapping("/fetchCountByParNoAndParValueAndUseOrgSid")
+    @ResponseBody
+    ResultBean<Integer> fetchCountByParNoAndParValueAndUseOrgSid(@RequestParam("parNo") String parNo, @RequestParam("parameterValue") String parameterValue, @RequestParam("useOrgSid") String useOrgSid);
+
     /**
      * 根据条件分页查询数据的列表（已测试）
      *

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysparameter/SysParameterFeignFallback.java

@@ -43,6 +43,11 @@ public class SysParameterFeignFallback implements SysParameterFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<Integer> fetchCountByParNoAndParValueAndUseOrgSid(String parNo, String parameterValue, String useOrgSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<SysParameterVo>> finListPage(PagerQuery<SysParameterQuery> pq) {
         return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterMapper.java

@@ -32,4 +32,6 @@ public interface SysParameterMapper extends BaseMapper<SysParameter> {
     int selectParameterByNo(String pNo);
 
     int selectAllByIdAndpNo(@Param("pNo") String pNo, @Param("sid") String sid);
+
+    Integer fetchCountByParNoAndParValueAndUseOrgSid(@Param("parNo") String parNo,@Param("parValue") String parValue,@Param("useOrgSid") String useOrgSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterMapper.xml

@@ -32,4 +32,13 @@
           and parameterNo = #{pNo}
           and isDelete != 1
     </select>
+
+    <select id="fetchCountByParNoAndParValueAndUseOrgSid" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM sys_parameter
+        WHERE state = 2
+          AND parameterNo LIKE CONCAT('%', #{parNo}, '%')
+          AND parValue LIKE CONCAT('%', #{parValue}, '%')
+          AND useOrgSid LIKE CONCAT('%',#{useOrgSid},'%')
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterRest.java

@@ -55,6 +55,11 @@ public class SysParameterRest implements SysParameterFeign {
         return parameterService.fetchOneByParNo(parNo);
     }
 
+    @Override
+    public ResultBean<Integer> fetchCountByParNoAndParValueAndUseOrgSid(String parNo, String parameterValue, String useOrgSid) {
+        return parameterService.fetchCountByParNoAndParValueAndUseOrgSid(parNo,parameterValue,useOrgSid);
+    }
+
     @Override
     public ResultBean<PagerVo<SysParameterVo>> finListPage(PagerQuery<SysParameterQuery> pq) {
         ResultBean<PagerVo<SysParameterVo>> rb = ResultBean.fireFail();

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysparameter/SysParameterService.java

@@ -307,4 +307,16 @@ public class SysParameterService extends MybatisBaseService<SysParameterMapper,
         }
         return rb.success().setData(vo);
     }
+
+    public ResultBean<Integer> fetchCountByParNoAndParValueAndUseOrgSid(String parNo, String parameterValue, String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String[] parValues = parameterValue.split(",");
+        for (String parValue : parValues) {
+            Integer count = baseMapper.fetchCountByParNoAndParValueAndUseOrgSid(parNo, parValue, useOrgSid);
+            if (count > 0){
+                return rb.success().setData(count);
+            }
+        }
+        return rb.success().setData(0);
+    }
 }