同步实收款认领数据调整&推荐认领实收款bug修改

dao/src/main/java/com/dayou/mapper/DyoaRecordMapper.java

@@ -28,4 +28,6 @@ public interface DyoaRecordMapper extends CustomBaseMapper<DyoaRecord> {
     List<DyoaRecord> selectOrderFundIdByDyoaOrderId();
 
     Date getMaxFinanceInvoiceCreatedTime();
+
+
 }

dao/src/main/java/com/dayou/mapper/FinanceRealFundMapper.java

@@ -22,7 +22,7 @@ public interface FinanceRealFundMapper extends CustomBaseMapper<FinanceRealFund>
 
     Page<FinanceRealFundVO> getPage(Page page, @Param("vo") FinanceRealFund vo,@Param("keyword") String keyword);
 
-    Page<FinanceRealFundVO> claimPage(Page page, @Param("vo") FinanceRealFund vo,@Param("keyword")  String keyword);
+    Page<FinanceRealFundVO> claimPage(Page page, @Param("vo") FinanceRealFund vo,@Param("keyword")  String keyword ,@Param("userId") Long userId);
 
     BigDecimal getNotClaimAmount(@Param("realFundId") Long realFundId);
 

dao/src/main/java/com/dayou/mapper/ProductionFundMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +27,8 @@ public interface ProductionFundMapper extends CustomBaseMapper<ProductionFund> {
     void updateRealAmount(@Param("id") Long id, @Param("thisTimeAmount") BigDecimal thisTimeAmount);
 
     void updateProductionRealAmount(@Param("productionFundId") Long productionFundId, @Param("rollbackAmount") BigDecimal rollbackAmount);
+
+    List<ProductionFund> selectProductionFundIdByDyoaReportNo();
+
+    List<ProductionFund> getProductionFundIdByOrderFundId();
 }

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

@@ -264,7 +264,11 @@
         <if test="apFundSelectDTO.mDeclareResult != null and apFundSelectDTO.mDeclareResult != ''">
             AND mDeclare.declare_result = #{apFundSelectDTO.mDeclareResult}
         </if>
-        ORDER BY assets.created DESC
+        ORDER BY
+        <if test="apFundSelectDTO!=null and apFundSelectDTO.invoiceAmount!=null">
+            fi.invoiceAmount=${apFundSelectDTO.invoiceAmount} desc,
+        </if>
+            assets.created DESC
     </select>
 
     <!--查找实收款认领订单列表-->

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

@@ -380,7 +380,10 @@
             description,
             invoiceEmp,
             ticketNo,
-            orderType
+            orderType,
+            orderReportNO,
+            createdDatetime,
+            creatorName
             from dy_finance_invoice
         where id = #{id}
     </select>

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

@@ -60,4 +60,5 @@
     <select id="getMaxFinanceInvoiceCreatedTime" resultType="java.util.Date">
         select max(order_datetime) from dyoa_record where mbs_type = 'FINANCE_INVOICE'
     </select>
+
 </mapper>

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

@@ -75,6 +75,7 @@
             or fi.plan_amount like concat('%',#{keyword},'%')
             or fi.state like concat('%',#{keyword},'%')
             or fi.remark like concat('%',#{keyword},'%')
+            or pf.production_no like concat('%',#{keyword},'%')
             )
         </if>
         <if test="vo!=null and vo.pStartDate!=null and vo.pStartDate!=''">

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

@@ -78,7 +78,61 @@
         ifnull(t.ca,0) ASC ,frf.created DESC
     </sql>
 
+    <sql id="pageListSql1">
+        SELECT
+        #{userId} as userId,
+        frf.id,
+        frf.created,
+        frf.payer,
+        frf.payer_bank,
+        frf.payer_account,
+        frf.amount,
+        frf.pay_datetime,
+        frf.remark,
+        frf.creator_id,
+        u.name AS creator,
+        ifnull(t.ca,0) AS claimAmount,
+        ( frf.amount - ifnull(t.ca,0) ) AS notClaimAmount
+        FROM
+        finance_real_fund frf
+        LEFT JOIN user u ON u.id = frf.creator_id
+        LEFT JOIN ( SELECT real_fund_id, sum(ifnull(claim_amount,0)) ca FROM finance_claim WHERE deleted = 0 GROUP BY real_fund_id ) t ON t.real_fund_id = frf.id
+        WHERE
+        frf.deleted = 0
+        <if test="vo!=null and vo.notFinished">
+            and  ifnull(t.ca,0) &lt; frf.amount
+        </if>
+        <if test="vo!=null and !vo.notFinished">
+            and  ifnull(t.ca,0) &gt;= frf.amount
+        </if>
+        <if test="keyword!=null and keyword!='' ">
+            and (
+            frf.payer like concat ('%',#{keyword},'%')
+            or frf.payer_bank like concat('%',#{keyword},'%')
+            or u.name like concat('%',#{keyword},'%')
+            or frf.payer_account like concat('%',#{keyword},'%')
+            or frf.amount like concat('%',#{keyword},'%')
+            or frf.remark like concat('%',#{keyword},'%')
+            )
+        </if>
+        <if test="vo!=null and vo.startDate!=null and vo.startDate!=''">
+            and frf.pay_datetime &gt;= #{vo.startDate}
+        </if>
+        <if test="vo!=null and vo.endDate!=null and vo.endDate!=''">
+            and frf.pay_datetime &lt;= #{vo.endDate}
+        </if>
+        <if test="vo!=null and vo.xStartDate!=null and vo.xStartDate!=''">
+            and frf.created &gt;= #{vo.xStartDate}
+        </if>
+        <if test="vo!=null and vo.xEndDate!=null and vo.xEndDate!=''">
+            and frf.created &lt;= #{vo.xEndDate}
+        </if>
+        ORDER BY
+        ifnull(t.ca,0) ASC ,frf.created DESC
+    </sql>
+
     <resultMap id="realAmountClaimMap" type="com.dayou.vo.FinanceRealFundVO">
+        <result column="userId" property="userId" />
         <result column="id" property="id" />
         <result column="created" property="created" />
         <result column="payer" property="payer" />
@@ -91,18 +145,18 @@
         <result column="creator" property="creator" />
         <result column="claimAmount" property="claimAmount" />
         <result column="notClaimAmount" property="notClaimAmount" />
-        <collection property="recommends" select="findRecommends" ofType="java.lang.String" column="amount" />
+        <collection property="recommends" select="findRecommends" ofType="java.lang.String" column="{amount=amount,userId=userId}" />
      </resultMap>
 
     <select id="getPage" parameterType="com.dayou.entity.FinanceRealFund" resultType="com.dayou.vo.FinanceRealFundVO">
         <include refid="pageListSql" />
     </select>
 
-    <select id="claimPage" parameterType="com.dayou.entity.FinanceRealFund" resultMap="realAmountClaimMap">
-        <include refid="pageListSql" />
+    <select id="claimPage" resultMap="realAmountClaimMap">
+        <include refid="pageListSql1" />
     </select>
 
-    <select id="findRecommends" parameterType="java.math.BigDecimal" resultType="java.lang.String">
+    <select id="findRecommends"  resultType="java.lang.String">
         SELECT
             tt1.business_type
         FROM
@@ -121,6 +175,9 @@
                             state = '已开票'
                           AND deleted = 0
                           AND production_fund_id IS NULL
+                          <if test="userId!=null">
+                              and apply_id = #{userId}
+                          </if>
                         GROUP BY
                             order_fund_id UNION ALL
                         SELECT
@@ -132,6 +189,9 @@
                             state = '已开票'
                           AND deleted = 0
                           AND production_fund_id IS NOT NULL
+                        <if test="userId!=null">
+                            and apply_id = #{userId}
+                        </if>
                         GROUP BY
                             production_fund_id
                     ) temp

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

@@ -374,7 +374,7 @@
                 left join customer_company cc1 on cc1.id = m.clientele_sub_id
                 left join customer_linkman cl on  cl.id = m.clientele_contact_id
                 left join (select * from order_fund where business_type ='MAJOR_BUSINESS' and deleted = 0) orf on orf.business_id = m.id
-                left join (select * from production_fund where business_type = 'MAJOR_BUSINESS' and deleted = 0) pf on (pf.business_id = m.id and pf.production_no = mp.report_no)
+                left join (select * from production_fund where business_type = 'MAJOR_BUSINESS' and deleted = 0) pf on (pf.business_id = m.id and pf.production_no = mp.report_no and mp.production = pf.production_type)
                 left join (select sum(real_amount) as invoiceAmount,order_fund_id,production_fund_id from finance_invoice where state='已开票' and deleted = 0 group by production_fund_id) fi on (fi.order_fund_id = orf.id and fi.production_fund_id = pf.id)
 
     </sql>

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

@@ -383,6 +383,11 @@
         <if test="personal!=null and personal.clientSubName!=null and personal.clientSubName!=''">
             and cc2.NAME like concat('%',#{personal.clientSubName},'%')
         </if>
+        ORDER BY
+        <if test="personal!=null and personal.invoiceAmount!=null">
+            fi.invoiceAmount=${personal.invoiceAmount} desc,
+        </if>
+        p.created DESC
     </select>
     
     <select id="waitingAllotOrderPage" resultType="com.dayou.vo.PersonalVO">

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

@@ -60,4 +60,12 @@
     <update id="updateProductionRealAmount">
         update production_fund set real_amount = real_amount-#{rollbackAmount} where id = #{productionFundId} and deleted = 0
     </update>
+
+    <select id="selectProductionFundIdByDyoaReportNo" resultType="com.dayou.entity.ProductionFund">
+        select production_no,id from production_fund where deleted = 0  GROUP   BY production_no
+    </select>
+
+    <select id="getProductionFundIdByOrderFundId" resultType="com.dayou.entity.ProductionFund">
+        select order_fund_id,id from production_fund where production_type != 'STATEMENT' GROUP BY order_fund_id
+    </select>
 </mapper>

domain/src/main/java/com/dayou/dto/APFundSelectDTO.java

@@ -2,6 +2,8 @@ package com.dayou.dto;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class APFundSelectDTO {
 
@@ -30,4 +32,6 @@ public class APFundSelectDTO {
      */
     private String reportNo;
 
+    private BigDecimal invoiceAmount;
+
 }

domain/src/main/java/com/dayou/entity/FinanceRealFund.java

@@ -97,4 +97,5 @@ public class FinanceRealFund extends BaseEntity {
     @TableField(exist = false)
     private Boolean notFinished;
 
+
 }

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

@@ -23,4 +23,6 @@ public class FinanceRealFundVO extends FinanceRealFund {
     private BigDecimal notClaimAmount;
 
     private List<String> recommends;
+
+    private Long userId;
 }

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

@@ -22,6 +22,7 @@ import com.dayou.exception.ErrorCode;
 import com.dayou.mapper.DyoaHistoryMapper;
 import com.dayou.mapper.DyoaRecordMapper;
 import com.dayou.mapper.FinanceClaimMapper;
+import com.dayou.mapper.ProductionFundMapper;
 import com.dayou.service.*;
 import com.dayou.service.impl.AssetsServiceImpl;
 import com.dayou.utils.DateUtils;
@@ -71,6 +72,9 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
 
     private Map<String,Long> orderFundIds = new HashMap<>();
 
+    private Map<String,Long> productionFundIds = new HashMap<>();
+
+    private Map<Long,Long> orderFundIdProdFundIds = new HashMap<>();
 
     private static final Map<String,String> MAJOR_ORDER_COLUM = new HashMap<>();
 
@@ -90,6 +94,7 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
 
 
 
+
     @Autowired
     private IUserService userService;
 
@@ -294,6 +299,7 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
 
         //财务开票字段
         FINANCE_INVOICE_COLUM.put("orderId","orderFundId");
+        FINANCE_INVOICE_COLUM.put("creatorName","applyId");
         FINANCE_INVOICE_COLUM.put("incomeId","realFundId");
         FINANCE_INVOICE_COLUM.put("companyName","title");
         FINANCE_INVOICE_COLUM.put("companyNO","taxNo");
@@ -316,7 +322,8 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
         FINANCE_INVOICE_COLUM.put("ticketNo","ticketNo");
     }
 
-
+    @Autowired
+    private ProductionFundMapper productionFundMapper;
 
 
     @Override
@@ -644,12 +651,22 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
                         case "makerId":
                             field.set(invoice,getMbsUserId((String) columValue));
                             break;
+                        case "applyId":
+                            field.set(invoice,getMbsUserId((String) columValue));
+                            break;
                         default:
                             field.set(invoice,columValue);
                     }
 
                 }
+
             }
+
+            String orderId = (String) resultMap.get("orderId");
+            Long orderFundMbsId = findOrderFundId((String) orderId);
+            Long productionFunId = getProductionFundIdByOrderFundId(orderFundMbsId);
+            invoice.setProductionFundId(productionFunId);
+
             Date createdDatetime = (Date) resultMap.get("createdDatetime");
             invoice.setCreated(createdDatetime);
             financeInvoiceService.save(invoice);
@@ -663,6 +680,14 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
         }
     }
 
+    private Long getProductionFundIdByOrderFundId(Long orderFundMbsId) {
+        if (CollectionUtil.isEmpty(orderFundIdProdFundIds)) {
+            orderFundIdProdFundIds = productionFundService.getProductionFundIdByOrderFundId().stream().collect(Collectors.toMap(ProductionFund::getOrderFundId,BaseEntity::getId));
+        }
+        return orderFundIdProdFundIds.get(orderFundMbsId);
+    }
+
+
     @DSTransactional
     @Override
     public void fetchAssetsOrderProduction() {
@@ -1202,6 +1227,13 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
         return orderFundIds.get(columValue);
     }
 
+    private Long findProductionFundId(String columValue) {
+        if (CollectionUtil.isEmpty(productionFundIds)){
+            productionFundIds = productionFundService.selectProductionFundIdByDyoaReportNo().stream().collect(Collectors.toMap(ProductionFund::getProductionNo,ProductionFund::getId));
+        }
+        return productionFundIds.get(columValue);
+    }
+
 //    private Long getMbsWorkFlows(String flowCode){
 //        if (CollectionUtil.isEmpty(workFlows)){
 //            List<WorkFlow> list = workFlowService.list(new LambdaQueryWrapper<WorkFlow>().select(BaseEntity::getId, WorkFlow::getCode));

service/src/main/java/com/dayou/dyoa/task/FetchDyoaDataSchedule.java

@@ -20,8 +20,8 @@ public class FetchDyoaDataSchedule {
 //        log.info("同步个贷数据完成");
 //    }
 //
-//    //每天凌晨02:00触发
-//    @Scheduled(cron = "0 0 2 * * ?")
+//    //每天凌晨02:30触发
+//    @Scheduled(cron = "0 30 2 * * ?")
 //    public void syncDyoaMajorData(){
 //        dyoaHistoryService.fetchDyoaMajorOrderProduction();
 //        log.info("同步大中型数据完成");
@@ -29,29 +29,29 @@ public class FetchDyoaDataSchedule {
 //
 
 
-//    //每天凌晨02:30触发
-//    @Scheduled(cron = "0 30 2 * * ?")
+//    //每天凌晨03:30触发
+//    @Scheduled(cron = "0 30 3 * * ?")
 //    public void syncAssetsData(){
 //        dyoaHistoryService.fetchAssetsOrderProduction();
 //        log.info("同步资产数据完成");
 //    }
 
-//    //每天凌晨03:00触发
-//    @Scheduled(cron = "0 0 3 * * ?")
+//    //每天凌晨04:30触发
+//    @Scheduled(cron = "0 30 4 * * ?")
 //    public void syncRealAmountData(){
 //        dyoaHistoryService.fetchRealAmount();
 //        log.info("同步实收款数据完成");
 //    }
 //
-//    //每天凌晨03:30触发
-//    @Scheduled(cron = "0 30 3 * * ?")
+//    //每天凌晨05:00触发
+//    @Scheduled(cron = "0 0 5 * * ?")
 //    public void syncRealClaimData(){
 //        dyoaHistoryService.fetchRealAmountClaimData();
 //        log.info("同步实收款认领数据完成");
 //    }
 
-//    //每天凌晨04:00触发
-//    @Scheduled(cron = "0 0 4 * * ?")
+//    //每天凌晨06:00触发
+//    @Scheduled(cron = "0 0 6 * * ?")
 //    public void syncFinanceInvoiceData(){
 //        dyoaHistoryService.fetchFinanceInvoiceRecord();
 //        log.info("同步财务开票数据完成");

service/src/main/java/com/dayou/service/IDyoaRecordService.java

@@ -10,6 +10,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -36,5 +37,7 @@ public interface IDyoaRecordService extends IService<DyoaRecord> {
         List<DyoaRecord> selectOrderFundIdByDyoaOrderId();
 
     Date getMaxFinanceInvoiceCreatedTime();
+
+
 }
 

service/src/main/java/com/dayou/service/IProductionFundService.java

@@ -1,14 +1,12 @@
 package com.dayou.service;
-import com.dayou.entity.FinanceClaim;
 import com.dayou.entity.ProductionFund;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dayou.vo.ProductionFundVO;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,4 +37,8 @@ public interface IProductionFundService extends IService<ProductionFund> {
         BigDecimal getProductionRealAmountByProductionNo(String productionNo);
 
         void updateProductionRealAmount(Long productionFundId , BigDecimal rollbackAmount);
+
+        List<ProductionFund> selectProductionFundIdByDyoaReportNo();
+
+        List<ProductionFund> getProductionFundIdByOrderFundId();
 }

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

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -87,4 +88,6 @@ public class DyoaRecordServiceImpl extends ServiceImpl<DyoaRecordMapper, DyoaRec
         return dyoaRecordMapper.getMaxFinanceInvoiceCreatedTime();
     }
 
+
+
 }

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

@@ -65,7 +65,8 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
 
     @Override
     public Page<FinanceRealFundVO> claimPage(Page page, FinanceRealFund financeRealFund, String keyword) {
-        Page<FinanceRealFundVO> ret = financeRealFundMapper.claimPage(page,financeRealFund,keyword);
+        Long currentUserId = LoginContext.getCurrentUserId();
+        Page<FinanceRealFundVO> ret = financeRealFundMapper.claimPage(page,financeRealFund,keyword,currentUserId);
         return ret;
     }
 

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

@@ -954,11 +954,11 @@ public class PersonalProductionServiceImpl extends ServiceImpl<PersonalProductio
         int index = 6;
         if (certificateEnum.equals(IMMOVABLE_CERTIFICATE)){
             if (certificateEnum.equals(IMMOVABLE_CERTIFICATE) && (Boolean) textMap.get("haveOrigin")) {
-                ifCond = ("\n" + index++) + "．我们已对委托人提供的估价对象《不动产权证书》原件进行了审慎核对，在无理由怀疑其原件合法性、真实性、准确性和完整性的情况下，假设委托人提供的上述原件合法、真实、准确、完整。\r\n\t";
+                ifCond = ("\n" + index++) + "．我们已对委托人提供的估价对象《不动产权证书》原件进行了审慎核对，在无理由怀疑其原件合法性、真实性、准确性和完整性的情况下，假设委托人提供的上述原件合法、真实、准确、完整。\r\n";
             }
-            ifCond += ("\n" + index++) + "．我们已对房屋安全、环境污染等影响估价对象价值的重大因素给予了关注，在无理由怀疑估价对象存在安全隐患且无相应的专业机构进行鉴定、检测的情况下，假设估价对象能正常安全使用。\r\n\t";
+            ifCond += ("\n" + index++) + "．我们已对房屋安全、环境污染等影响估价对象价值的重大因素给予了关注，在无理由怀疑估价对象存在安全隐患且无相应的专业机构进行鉴定、检测的情况下，假设估价对象能正常安全使用。\r\n";
             if (certificateEnum.equals(IMMOVABLE_CERTIFICATE) && !(Boolean) textMap.get("isShare")) {
-                ifCond += ("\n" + index++) + "．由于受专业限制，我们未对估价对象房屋建筑面积及其分摊的土地使用权面积进行专业测量，本次估价假设估价对象房屋建筑面积及其分摊的土地使用权面积与《不动产权证书》记载面积一致。\r\n\t";
+                ifCond += ("\n" + index++) + "．由于受专业限制，我们未对估价对象房屋建筑面积及其分摊的土地使用权面积进行专业测量，本次估价假设估价对象房屋建筑面积及其分摊的土地使用权面积与《不动产权证书》记载面积一致。\r\n";
             } else {
                 ifCond += ("\n" + index++) + "．由于受专业限制，我们未对估价对象房屋建筑面积及其共用宗地使用权面积进行专业测量，本次估价假设估价对象房屋建筑面积及其共用宗地的使用权面积与《不动产权证书》记载面积一致。\r\n\t";
             }

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

@@ -30,8 +30,11 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Map;
+
 import org.springframework.transaction.annotation.Transactional;
 import com.dayou.enums.BatchTaskTypeEnum;
 
@@ -188,4 +191,14 @@ public class ProductionFundServiceImpl extends ServiceImpl<ProductionFundMapper,
     public void updateProductionRealAmount(Long productionFundId , BigDecimal rollbackAmount) {
         productionFundMapper.updateProductionRealAmount(productionFundId,rollbackAmount);
     }
+
+    @Override
+    public List<ProductionFund> selectProductionFundIdByDyoaReportNo() {
+        return productionFundMapper.selectProductionFundIdByDyoaReportNo();
+    }
+
+    @Override
+    public List<ProductionFund> getProductionFundIdByOrderFundId() {
+        return productionFundMapper.getProductionFundIdByOrderFundId();
+    }
 }