资产实收款统计修改&个贷模版修改

dao/src/main/resources/mapper/DyoaRecordMapper.xml

@@ -84,7 +84,7 @@
     </select>
 
     <select id="findAssetsProduction" resultType="com.dayou.dto.history.HisPersonalProduction">
-        select id,bgInTime as bgInRepoTime,bgOutTime as bgOutRepoTime  from dy_assets
+        select id,bgInTime as bgInRepoTime,bgOutTime as bgOutRepoTime,confirmTime  from dy_assets
         where
             deleted = 0
     </select>

dao/src/main/resources/mapper/FinanceClaimMapper.xml

@@ -102,7 +102,7 @@
         FROM
         post
         WHERE
-        id IN ( SELECT post_id FROM user_post WHERE user_id = u.id ))) AS marketDepartment
+        id IN ( SELECT post_id FROM user_post WHERE user_id = u.id and deleted = 0 ))) AS marketDepartment
         FROM
         (select * from finance_claim where deleted = 0 and production_fund_id is not null
         AND claim_datetime >= #{majorStat.startDate}
@@ -231,7 +231,8 @@
         ELSE '其他'
         END
         ) AS productionType,
-        prod.if_save_file AS ifSaveFile
+        prod.if_save_file AS ifSaveFile,
+        assets.members
         FROM
         finance_claim AS claim
         LEFT JOIN finance_real_fund AS realFund ON realFund.id = claim.real_fund_id

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -511,7 +511,7 @@
         FROM
         post
         WHERE
-        id IN ( SELECT post_id FROM user_post WHERE user_id = m.client_manager_id ))) AS marketDepartmentName,
+        id IN ( SELECT post_id FROM user_post WHERE user_id = m.client_manager_id and deleted = 0 ))) AS marketDepartmentName,
         frf.pay_datetime
         FROM
         (
@@ -1752,6 +1752,7 @@
         <result property="id" column="id" />
         <result property="claimAmount" column="claim_amount" />
         <result property="orderId" column="order_id" />
+        <result property="projectName" column="name" />
         <result property="productionNo" column="production_no" />
         <result property="claimDate" column="claimDate" />
         <result property="saveFileDate" column="save_file_date" />
@@ -1767,6 +1768,7 @@
         <result property="evaluateDepartmentName" column="evaluateDepartmentName" />
         <result property="marketDepartmentName" column="marketDepartmentName" />
         <result property="payDateTime" column="pay_datetime" />
+        <result property="members" column="members" />
         <collection property="invoices" ofType="com.dayou.vo.SettleProInvoiceVo">
             <result property="invoiceDate" column="invoiceDate" />
             <result property="invoiceUser" column="invoiceUser" />
@@ -1781,22 +1783,24 @@
         fc.claim_amount,
         a.order_id,
         ap.production_no,
-        fc.claim_datetime as claimDate,
+        fc.claim_datetime AS claimDate,
         ap.delivery_date AS deliveryDate,
         ap.save_file_date,
         IF
         ( fc.claim_datetime > ap.delivery_date, fc.claim_datetime, ap.delivery_date ) AS settleDate,
         ap.assets_name AS projectName,
         a.bailor,
+        a.name,
+        a.members,
         ap.evaluate_amount,
-        u.name AS principal,
-        u1.name AS clientManager,
-        cc.name AS clientName,
-        cc1.name AS clientSubName,
-        d.name AS evaluateDepartmentName,
+        u.NAME AS principal,
+        u1.NAME AS clientManager,
+        cc.NAME AS clientName,
+        cc1.NAME AS clientSubName,
+        d.NAME AS evaluateDepartmentName,
         (
         SELECT
-        GROUP_CONCAT( department.name )
+        GROUP_CONCAT( department.NAME )
         FROM
         department
         WHERE
@@ -1807,14 +1811,14 @@
         post
         WHERE
         id IN ( SELECT post_id FROM user_post WHERE user_id = a.client_manager_id ))) AS marketDepartmentName,
-        invoice.name AS invoiceUser,
+        invoice.NAME AS invoiceUser,
         invoice.real_make_date AS invoiceDate,
         invoice.tax_no AS invoiceNo,
         frf.pay_datetime
         FROM
         (
         SELECT
-            id,
+        id,
         claim_amount,
         order_fund_id,
         production_fund_id,
@@ -1825,12 +1829,6 @@
         WHERE
         deleted = 0
         AND production_fund_id IS NOT NULL
-        AND claim_datetime &gt;= #{settleVO.startDate}
-        AND claim_datetime &lt;= #{settleVO.endDate} UNION ALL
-        SELECT id,allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime,real_fund_id FROM
-        order_fund_allot WHERE deleted = 0
-        AND created &gt;= #{settleVO.startDate}
-        AND created &lt;= #{settleVO.endDate}
         ) fc
         inner join (
         select id,pay_datetime from finance_real_fund
@@ -1859,9 +1857,11 @@
             FROM finance_invoice, user
             WHERE maker_id = user.id
             AND finance_invoice.deleted = 0
-            AND state = '已开票'
+            AND state = '已开票' order by user.created desc limit 1
         ) AS invoice ON IF(invoice.production_fund_id IS NOT NULL ,invoice.order_fund_id = pf.order_fund_id AND invoice.production_fund_id = pf.id,invoice.order_fund_id = pf.order_fund_id)
         <where>
+            IF( fc.claim_datetime > ap.delivery_date, fc.claim_datetime, ap.delivery_date ) &gt;= #{settleVO.startDate}
+            AND IF( fc.claim_datetime > ap.delivery_date, fc.claim_datetime, ap.delivery_date ) &lt;= #{settleVO.endDate}
             <if test="keyword!=null and keyword!='' ">
                 and (
                 a.order_id = #{keyword}
@@ -1896,6 +1896,7 @@
         IF( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) AS settleDate,
         IF(ap.assets_name IS NOT NULL, ap.assets_name, a.name ) AS projectName,
         a.bailor,
+        a.members,
         ap.evaluate_amount,
         u.name AS principal,
         u1.name AS clientManager,
@@ -1933,11 +1934,7 @@
         WHERE
         deleted = 0
         AND production_fund_id IS NOT NULL
-        AND claim_datetime &gt;= #{settleVO.startDate}
-        AND claim_datetime  &lt;= #{settleVO.endDate} UNION ALL
-        SELECT id, allot_amount AS claim_amount, order_fund_id, production_fund_id, created AS claim_datetime ,real_fund_id FROM order_fund_allot WHERE deleted = 0
-        AND created  &gt;= #{settleVO.startDate}
-        AND created &lt;= #{settleVO.endDate}
+
         ) fc
 
         inner join (
@@ -1963,9 +1960,11 @@
             FROM finance_invoice, user
             WHERE maker_id = user.id
             AND finance_invoice.deleted = 0
-            AND state = '已开票'
+            AND state = '已开票' order by user.created desc limit 1
         ) AS invoice ON IF(invoice.production_fund_id IS NOT NULL ,invoice.order_fund_id = pf.order_fund_id AND invoice.production_fund_id = pf.id,invoice.order_fund_id = pf.order_fund_id)
         <where>
+            AND IF( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) &gt;= #{settleVO.startDate}
+            AND IF( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date )  &lt;= #{settleVO.endDate}
             <if test="keyword!=null and keyword!='' ">
                 and (
                 a.order_id = #{keyword}

domain/src/main/java/com/dayou/dto/history/HisPersonalProduction.java

@@ -13,4 +13,6 @@ public class HisPersonalProduction {
 
     private Date  bgOutRepoTime;
 
+    private Date confirmTime;
+
 }

domain/src/main/java/com/dayou/vo/RealFundAssetsStatVO.java

@@ -59,6 +59,9 @@ public class RealFundAssetsStatVO extends BaseEntity {
     @Excel(name = "项目负责人")
     private String principalName;
 
+    @Excel(name = "参与人")
+    private String joiner;
+
     /**
      * 付款方
      */
@@ -136,4 +139,8 @@ public class RealFundAssetsStatVO extends BaseEntity {
      */
     @Excel(name = "产品类型", readConverterExp = "REPORT=报告,STATEMENT=意见书,LETTER=复评函")
     private String productionType;
+
+    private String members;
+
+
 }

domain/src/main/java/com/dayou/vo/SettleAssetsProductionVO.java

@@ -57,6 +57,9 @@ public class SettleAssetsProductionVO {
     @Excel(name = "负责人")
     private String principal;
 
+    @Excel(name = "参与人")
+    private String joiner;
+
     @Excel(name = "结算金额(元)")
     private BigDecimal claimAmount;
 
@@ -76,4 +79,6 @@ public class SettleAssetsProductionVO {
 
     private String payEndDate;
 
+    private String members;
+
 }

service/src/main/java/com/dayou/dyoa/DyoaHistoryServiceImpl.java

@@ -1895,7 +1895,7 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
         for (HisPersonalProduction hisPersonalProduction : assetsProduction){
             Long assetsId = dyoaRecordService.getMbsIdByDyOAIdForAssets(hisPersonalProduction.getId());
             if (assetsId != null && hisPersonalProduction.getBgOutRepoTime()!=null){
-                AssetsProduction ap = assetsProductionService.getOne(new LambdaQueryWrapper<AssetsProduction>().eq(AssetsProduction::getBusinessId, assetsId).eq(AssetsProduction::getProductionType,"REPORT"));
+                AssetsProduction ap = assetsProductionService.getOne(new LambdaQueryWrapper<AssetsProduction>().eq(AssetsProduction::getBusinessId, assetsId).ne(AssetsProduction::getProductionType,"STATEMENT"));
                 if (ap!=null && ap.getRepertoryState()==null){
                         ap.setRepertoryState(true);
                         ap.setRepertoryOutTime(DateUtils.parseLocalDateTime(DateUtils.dateTime(hisPersonalProduction.getBgOutRepoTime())));
@@ -1903,6 +1903,14 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
                     assetsProductionService.update(ap);
                 }
             }
+            if (assetsId!=null && hisPersonalProduction.getConfirmTime()!=null){
+                AssetsProduction ap = assetsProductionService.getOne(new LambdaQueryWrapper<AssetsProduction>().eq(AssetsProduction::getBusinessId, assetsId).ne(AssetsProduction::getProductionType,"STATEMENT"));
+                if (ap!=null && ap.getDeliveryDate()==null){
+                    ap.setDelivery(true);
+                    ap.setDeliveryDate(DateUtils.parseLocalDateTime(DateUtils.dateTime(hisPersonalProduction.getConfirmTime())));
+                    assetsProductionService.update(ap);
+                }
+            }
         }
         return null;
     }

service/src/main/java/com/dayou/service/impl/FinanceClaimServiceImpl.java

@@ -2,6 +2,7 @@ package com.dayou.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -15,6 +16,7 @@ import com.dayou.enums.MainBusinessEnum;
 import com.dayou.exception.ErrorCode;
 import com.dayou.mapper.FinanceClaimMapper;
 import com.dayou.mapper.OrderFundMapper;
+import com.dayou.mapper.UserMapper;
 import com.dayou.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.utils.ExcelUtil;
@@ -73,6 +75,8 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
 
     @Autowired
     private IOrderFundAllotService orderFundAllotService;
+    @Autowired
+    private UserMapper userMapper;
 
     @Override
     @SuppressWarnings("unchecked")
@@ -218,7 +222,17 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
      */
     @Override
     public Page<RealFundAssetsStatVO> assetsSate(Page page, RealFundAssetsStatDTO dto,String keyword) {
-        return financeClaimMapper.assetsSate(page, dto,keyword);
+        Page<RealFundAssetsStatVO> realFundAssetsStatVOPage = financeClaimMapper.assetsSate(page, dto, keyword);
+        List<RealFundAssetsStatVO> records = realFundAssetsStatVOPage.getRecords();
+        for (RealFundAssetsStatVO record : records){
+            List<Long> users = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(users)){
+                List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getId, users).select(User::getName).ne(BaseEntity::getId, 1L));
+                List<String> names = userList.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
+        return realFundAssetsStatVOPage;
     }
 
     /**
@@ -228,7 +242,16 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
      */
     @Override
     public List<RealFundAssetsStatVO> assetsSateExport(RealFundAssetsStatDTO dto,String keyword) {
-        return financeClaimMapper.assetsSateExport(dto,keyword);
+        List<RealFundAssetsStatVO> realFundAssetsStatVOS = financeClaimMapper.assetsSateExport(dto, keyword);
+        for (RealFundAssetsStatVO record : realFundAssetsStatVOS){
+            List<Long> users = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(users)){
+                List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getId, users).select(User::getName).ne(BaseEntity::getId, 1L));
+                List<String> names = userList.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
+        return realFundAssetsStatVOS;
     }
 
     @Override

service/src/main/java/com/dayou/service/impl/FinanceRealFundServiceImpl.java

@@ -391,7 +391,17 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      */
     @Override
     public Page<SettleAssetsProductionVO> assetsMarketSettleProd(SettleAssetsProductionVO settleVO, Page page,String keyword) {
-        return financeRealFundMapper.assetsMarketSettleProd(settleVO, page,keyword);
+        Page<SettleAssetsProductionVO> settleAssetsProductionVOPage = financeRealFundMapper.assetsMarketSettleProd(settleVO, page, keyword);
+        List<SettleAssetsProductionVO> records = settleAssetsProductionVOPage.getRecords();
+        for (SettleAssetsProductionVO record : records) {
+            List<Long> userIdS = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(userIdS)){
+                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(BaseEntity::getId, userIdS).select(User::getName).ne(BaseEntity::getId,1L));
+                List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
+        return settleAssetsProductionVOPage;
     }
 
     /**
@@ -401,7 +411,16 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      */
     @Override
     public List<SettleAssetsProductionVO> assetsMarketSettleExport(SettleAssetsProductionVO settleVO,Page page,String keyword) {
-        return financeRealFundMapper.assetsMarketSettleExport(page,settleVO,keyword);
+        List<SettleAssetsProductionVO> settleAssetsProductionVOS = financeRealFundMapper.assetsMarketSettleExport(page, settleVO, keyword);
+        for (SettleAssetsProductionVO record : settleAssetsProductionVOS) {
+            List<Long> userIdS = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(userIdS)){
+                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(BaseEntity::getId, userIdS).select(User::getName).ne(BaseEntity::getId,1L));
+                List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
+        return settleAssetsProductionVOS;
     }
 
     /**
@@ -412,7 +431,17 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      */
     @Override
     public Page<SettleAssetsProductionVO> assetsEvaluatorSettleProd(SettleAssetsProductionVO settleVO, Page page,String keyword) {
-        return financeRealFundMapper.assetsEvaluatorSettleProd(settleVO, page,keyword);
+        Page<SettleAssetsProductionVO> settleAssetsProductionVOPage = financeRealFundMapper.assetsEvaluatorSettleProd(settleVO, page, keyword);
+        List<SettleAssetsProductionVO> records = settleAssetsProductionVOPage.getRecords();
+        for (SettleAssetsProductionVO record : records) {
+            List<Long> userIdS = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(userIdS)){
+                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(BaseEntity::getId, userIdS).select(User::getName).ne(BaseEntity::getId,1L));
+                List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
+        return settleAssetsProductionVOPage;
     }
 
     /**
@@ -422,7 +451,16 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      */
     @Override
     public List<SettleAssetsProductionVO> assetsEvaluatorSettleExport(SettleAssetsProductionVO settleVO,Page page,String keyword) {
-        return financeRealFundMapper.assetsEvaluatorSettleExport(page,settleVO,keyword);
+        List<SettleAssetsProductionVO> settleAssetsProductionVOS = financeRealFundMapper.assetsEvaluatorSettleExport(page, settleVO, keyword);
+        for (SettleAssetsProductionVO record : settleAssetsProductionVOS) {
+            List<Long> userIdS = JSON.parseArray(record.getMembers(), Long.class);
+            if (CollectionUtil.isNotEmpty(userIdS)){
+                List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().in(BaseEntity::getId, userIdS).select(User::getName).ne(BaseEntity::getId,1L));
+                List<String> names = users.stream().map(User::getName).collect(Collectors.toList());
+                record.setJoiner(String.join(",",names));
+            }
+        }
+        return settleAssetsProductionVOS;
     }
 
     @Override