Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentFeign.java

@@ -34,6 +34,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 @Api(tags = "付款信息管理")
 @FeignClient(
@@ -71,4 +72,9 @@ public interface FinPaymentFeign {
     @PostMapping("/updateOpenDate")
     @ResponseBody
     public ResultBean updateOpenDate(@RequestParam("sid") String sid, @RequestParam("openDate") String openDate);
+
+    @ApiOperation("选择平仓款名称")
+    @PostMapping("/selClosFundName")
+    @ResponseBody
+    public ResultBean<List<Map<String,String>>> selClosFundName(@RequestParam("useOrgSid") String useOrgSid);
 }

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

@@ -34,23 +34,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
-
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: anrui-fin(财务) <br/>
- * File: FinPaymentapplyFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign <br/>
- * Description: fin_paymentapply. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "付款申请")
 @FeignClient(
         contextId = "anrui-fin-FinPaymentapply",

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEve.java

@@ -47,8 +47,6 @@ public class FinPaymentapplyDetailsBelowEve extends BaseEntity {
     private String costTypeValue;
     @ApiModelProperty("付款申请明细的明细sid")
     private String detailSid; // 付款申请明细的明细sid
-    @ApiModelProperty("融资付款开通日期")
-    private String openDate; // 融资付款开通日期
     @ApiModelProperty("期数")
     private String period; // 期数
     @ApiModelProperty("付款单位sid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDetailsVo.java

@@ -63,8 +63,6 @@ public class FinPaymentapplyDetailsBelowEveDetailsVo implements Vo {
     private String costTypeValue;
     @ApiModelProperty("付款申请明细的明细sid")
     private String detailSid; // 付款申请明细的明细sid
-    @ApiModelProperty("融资付款开通日期")
-    private String openDate; // 融资付款开通日期
     @ApiModelProperty("期数")
     private String period; // 期数
     @ApiModelProperty("付款单位sid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveDto.java

@@ -65,8 +65,6 @@ public class FinPaymentapplyDetailsBelowEveDto implements Dto {
     private String costTypeValue;
     @ApiModelProperty("付款申请明细的明细sid")
     private String detailSid; // 付款申请明细的明细sid
-    @ApiModelProperty("融资付款开通日期")
-    private String openDate; // 融资付款开通日期
     @ApiModelProperty("期数")
     private String period; // 期数
     @ApiModelProperty("付款单位sid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveVo.java

@@ -75,4 +75,6 @@ public class FinPaymentapplyDetailsBelowEveVo implements Vo {
     private BigDecimal exePayPrice;
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("上级sid")
+    private String detailSid;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpayment;
 
+import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -34,6 +35,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
+import java.util.Map;
+
 import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
@@ -49,6 +52,8 @@ public class FinPaymentRest implements FinPaymentFeign {
     private FinPaymentService finPaymentService;
     @Autowired
     private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
+    @Autowired
+    private FinPaymentapplyDetailsBelowService finPaymentapplyDetailsBelowService;
 
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
@@ -94,7 +99,14 @@ public class FinPaymentRest implements FinPaymentFeign {
     @Override
     public ResultBean updateOpenDate(String sid, String openDate) {
         ResultBean rb = ResultBean.fireFail();
-        finPaymentapplyDetailsBelowEveService.updateOpenDate(sid,openDate);
+        finPaymentapplyDetailsBelowService.updateOpenDate(sid,openDate);
         return rb.success();
     }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> selClosFundName(String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> maps = finPaymentapplyDetailsBelowService.selClosFundName(useOrgSid);
+        return rb.success().setData(maps);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java

@@ -116,8 +116,8 @@ public class FinPaymentService extends MybatisBaseService<FinPaymentMapper, FinP
         if (StringUtils.isNotBlank(query.getReceivingAccount())) {
             qw.like("receivingAccount", query.getReceivingAccount());
         }
-        if (StringUtils.isNotBlank(query.getBusinessTypeValue())) {
-            qw.like("businessTypeValue", query.getBusinessTypeValue());
+        if (StringUtils.isNotBlank(query.getBank())) {
+            qw.like("bank", query.getBank());
         }
         IPage<FinPayment> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentVo> pagging = baseMapper.selectPageVo(page, qw);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java

@@ -56,6 +56,8 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService<FinPayment
             for (FinPaymentapplyDetailsBelowDto finPaymentapplyDetailsBelowDto : finPaymentapplyDetailsBelowList) {
                 finPaymentapplyDetailsBelowDto.setDetailSid(finPaymentapplyDetails.getSid());
                 finPaymentapplyDetailsBelowDto.setClosFundName(DateUtil.formatDate(new Date()) + dto.getPaymentType() + finPaymentapplyDetailsBelowDto.getBankShortName() + new BigDecimal(dto.getPayAccount()).divide(new BigDecimal(10000)) + "万元");
+                finPaymentapplyDetailsBelowDto.setPayCompanySid(finPaymentapply.getPayCompanySid());
+                finPaymentapplyDetailsBelowDto.setPayCompany(finPaymentapply.getPayCompany());
                 String belowSid = finPaymentapplyDetailsBelowService.insertByDto(finPaymentapplyDetailsBelowDto);
                 List<FinPaymentapplyDetailsBelowEveDto> finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowDto.getFinPaymentapplyDetailsBelowEveList();
                 for (FinPaymentapplyDetailsBelowEveDto finPaymentapplyDetailsBelowEveDto : finPaymentapplyDetailsBelowEveList) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java

@@ -25,34 +25,25 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
-/**
- * Project: anrui-fin(付款明细) <br/>
- * File: FinPaymentapplyDetailsBelowMapper.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowMapper <br/>
- * Description: 付款申请明细-明细. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-12 16:08:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper<FinPaymentapplyDetailsBelow> {
 
     @Select("select * from fin_paymentapply_details_below where detailSid = #{mainSid}")
     List<FinPaymentapplyDetailsBelowDetailsVo> selByMainSid(String mainSid);
+
+    List<Map<String, String>> selClosFundName(String useOrgSid);
+
+    @Update("update fin_paymentapply_details_below set openDate = #{openDate} where sid = #{sid}")
+    void updateOpenDate(@Param("sid") String sid, @Param("openDate") String openDate);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.xml

@@ -3,4 +3,24 @@
 <mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
+
+    <select id="selClosFundName" resultType="java.util.Map">
+        SELECT
+            db.sid AS detailSid,
+            db.closFundName,
+            db.payCompanySid,
+            db.payCompany,
+            db.receiveCompanySid,
+            db.receiveCompany,
+            db.bank,
+            db.receivingAccount
+        FROM
+            fin_paymentapply_details_below  db
+                LEFT JOIN fin_paymentapply_details d
+                          ON db.detailSid = d.sid
+                LEFT JOIN fin_paymentapply a
+                          ON d.applySid = a.sid
+        WHERE db.costTitleKey = '015'
+          AND a.useOrgSid = #{useOrgSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java

@@ -26,34 +26,14 @@
 package com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto;
-
 import org.springframework.stereotype.Service;
-
 import java.util.List;
+import java.util.Map;
 
-/**
- * Project: anrui-fin(付款明细) <br/>
- * File: FinPaymentapplyDetailsBelowService.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService <br/>
- * Description: 付款申请明细-明细 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-12 16:08:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class FinPaymentapplyDetailsBelowService extends MybatisBaseService<FinPaymentapplyDetailsBelowMapper, FinPaymentapplyDetailsBelow> {
 
@@ -67,4 +47,12 @@ public class FinPaymentapplyDetailsBelowService extends MybatisBaseService<FinPa
     public List<FinPaymentapplyDetailsBelowDetailsVo> selByMainSid(String mainSid) {
         return baseMapper.selByMainSid(mainSid);
     }
+
+    public List<Map<String, String>> selClosFundName(String useOrgSid) {
+        return baseMapper.selClosFundName(useOrgSid);
+    }
+
+    public void updateOpenDate(String sid, String openDate) {
+        baseMapper.updateOpenDate(sid, openDate);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java

@@ -35,7 +35,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
-import org.apache.ibatis.annotations.Update;
 import java.util.List;
 
 @Mapper
@@ -45,7 +44,4 @@ public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper<FinPaym
 
     @Select("select * from fin_paymentapply_details_below_eve where detailSid = #{mainSid}")
     List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid);
-
-    @Update("update fin_paymentapply_details_below_eve set openDate = #{openDate} where sid = #{sid}")
-    void updateOpenDate(@Param("sid") String sid,@Param("openDate") String openDate);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml

@@ -4,8 +4,15 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo">
-		SELECT * FROM fin_paymentapply_details_below_eve fe
-		LEFT JOIN anrui_portal.sys_organization as s ON fe.useOrgSid = s.sid
+		SELECT
+		fe.*,
+		fb.openDate
+		FROM
+		fin_paymentapply_details_below_eve fe
+		LEFT JOIN fin_paymentapply_details_below fb
+		ON fe.detailSid = fb.sid
+		LEFT JOIN anrui_portal.sys_organization AS s
+		ON fe.useOrgSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveRest.java

@@ -32,29 +32,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveQuery;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign;
 
-/**
- * Project: anrui-fin(平仓) <br/>
- * File: FinPaymentapplyDetailsBelowEveFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveRest <br/>
- * Description: 付款申请明细-明细-平仓. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 10:03:07 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "付款申请明细-明细-平仓")
 @RestController
 @RequestMapping("v1/finpaymentapplydetailsbeloweve")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java

@@ -28,8 +28,6 @@ package com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo;
-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 org.apache.commons.lang3.StringUtils;
@@ -43,33 +41,15 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 
-/**
- * Project: anrui-fin(平仓) <br/>
- * File: FinPaymentapplyDetailsBelowEveService.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService <br/>
- * Description: 付款申请明细-明细-平仓 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-13 10:03:07 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<FinPaymentapplyDetailsBelowEveMapper, FinPaymentapplyDetailsBelowEve> {
 
     @Autowired
     private SysUserFeign sysUserFeign;
-    @Autowired
-    private SysStaffOrgFeign sysStaffOrgFeign;
 
     public PagerVo<FinPaymentapplyDetailsBelowEveVo> listPageVo(PagerQuery<FinPaymentapplyDetailsBelowEveQuery> pq) {
         FinPaymentapplyDetailsBelowEveQuery query = pq.getParams();
@@ -135,8 +115,8 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<Fi
             qw.eq("fe.state", query.getState());
         }
         //融资付款开通日期
-        qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fe.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fe.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotBlank(query.getOpenStartDate()), "date_format (fb.openDate,'%Y-%m-%d') >= date_format('" + query.getOpenStartDate() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getOpenEndDate()), "date_format (fb.openDate,'%Y-%m-%d') <= date_format('" + query.getOpenEndDate() + "','%Y-%m-%d')"
                 );
         //平仓付款日期
         qw.apply(StringUtils.isNotBlank(query.getExePayStartDate()), "date_format (fe.exePayDate,'%Y-%m-%d') >= date_format('" + query.getExePayStartDate() + "','%Y-%m-%d')").
@@ -224,8 +204,4 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService<Fi
     public List<FinPaymentapplyDetailsBelowEveDetailsVo> selByMainSid(String mainSid) {
         return baseMapper.selByMainSid(mainSid);
     }
-
-    public void updateOpenDate(String sid, String openDate) {
-        baseMapper.updateOpenDate(sid, openDate);
-    }
 }

yxt-as-ui/src/views/storage/upShelf/index.vue

@@ -138,6 +138,10 @@ export default {
         {
           name: '已完成',
           sid: '1'
+        },
+        {
+          name: '部分上架',
+          sid: '2'
         }
       ]
     }