1.修复资产业务-提成申报-市场人员查询列表报错assetsMarketDeclarePage

2.优化资产业务相关
3.修复查看资产提成申报被拒绝流程详情时，分配人员信息为空的BUG
3.updateAssetsCommissionDeclare修改资产绩效申报与提成比例下限新增校验
4.getOrderFundInvoiceById订单款项信息接口新增对多条开票信息的处理

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

@@ -673,16 +673,8 @@
         SELECT order_fund.id,
                business_id,
                should_amount,
-               order_fund.real_amount,
-               title,
-               type,
-               tax_no,
-               bank_name,
-               bank_account,
-               bank_address,
-               bank_tel
+               order_fund.real_amount
         FROM order_fund
-                 LEFT JOIN finance_invoice ON finance_invoice.order_fund_id = order_fund.id
         WHERE order_fund.business_id = #{id}
           AND order_fund.deleted = 0
           AND business_type = 'ASSET_BUSINESS'

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

@@ -29,7 +29,7 @@
         FROM business_performance_distribution, user
         WHERE declare_id = #{declareId}
         AND member_id = user.id
-        AND business_performance_distribution.deleted = 0
+#         AND business_performance_distribution.deleted = 0
     </select>
 
 </mapper>

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

@@ -364,16 +364,16 @@
         assets.id AS businessId,
         ap.id AS productionId,
         ifnull( ap.id, assets.id ) AS aId,
-        assets.NAME AS orderName,
+        assets.name AS orderName,
         assets.order_id,
         assets.bailor_contact_name,
         assets.bailor_contact_tel,
         assets.bailor,
         assets.created AS orderCreated,
-        u.NAME AS clientManager,
-        u1.NAME AS principal,
-        cc1.NAME AS clienteleName,
-        cc2.NAME AS clienteleSubName,
+        u.name AS clientManager,
+        u1.name AS principal,
+        cc1.name AS clienteleName,
+        cc2.name AS clienteleSubName,
         ap.production_no AS reportNo,
         ap.created
         FROM
@@ -439,13 +439,13 @@
     <select id="assetsMarketDeclarePage" resultType="com.dayou.vo.CommissionDeclareVO">
         SELECT
         bus.*,
-        dd.NAME AS commissionType
+        dd.name AS commissionType
         FROM
         (
         SELECT
         IFNULL( cd.id,( SELECT id FROM commission_declare WHERE deleted = 0 AND business_id = assets.businessId AND
-        production_id IS NULL and declare_user_id =#{marketUserId}) AND business_type
-        ='COMMISSION_DECLARE_ASSET_MARKET') id,
+        production_id IS NULL AND declare_user_id =#{marketUserId} AND business_type
+        ='COMMISSION_DECLARE_ASSET_MARKET') ) id,
         IFNULL( cd.commission_rate_id,( SELECT commission_rate_id FROM commission_declare WHERE deleted = 0 AND
         business_id = assets.businessId AND production_id IS NULL and declare_user_id =#{marketUserId} AND business_type
         ='COMMISSION_DECLARE_ASSET_MARKET') ) commission_rate_id,
@@ -459,16 +459,16 @@
         assets.id AS businessId,
         ap.id AS productionId,
         ifnull( ap.id, assets.id ) AS aId,
-        assets.NAME AS orderName,
+        assets.name AS orderName,
         assets.order_id,
         assets.bailor_contact_name,
         assets.bailor_contact_tel,
         assets.bailor,
         assets.created AS orderCreated,
-        u.NAME AS clientManager,
-        u1.NAME AS principal,
-        cc1.NAME AS clienteleName,
-        cc2.NAME AS clienteleSubName,
+        u.name AS clientManager,
+        u1.name AS principal,
+        cc1.name AS clienteleName,
+        cc2.name AS clienteleSubName,
         ap.production_no AS reportNo,
         ap.created
         FROM
@@ -559,9 +559,9 @@
     <sql id="getAssetsTodoCheck">
         SELECT
             t.*,
-            u.NAME AS handler,
-            u1.NAME AS declareUser,
-            dd.NAME AS businessCate,
+            u.name AS handler,
+            u1.name AS declareUser,
+            dd.name AS businessCate,
             ( CASE bcr.user_type WHEN 'MARKETER' THEN '市场人员' WHEN 'EVALUATOR' THEN '评估人员' ELSE '--' END ) AS userType,
             bcr.min_ratio AS ratio
         FROM
@@ -572,7 +572,7 @@
                     wfni.id AS currentNodeId,
                     wfni.business_id,
                     wfni.business_type,
-                    wfni.NAME AS nodeName,
+                    wfni.name AS nodeName,
                     wfni.CODE AS nodeCode,
                     cd.assetsId,
                     cd.production_id as prodId,
@@ -585,7 +585,7 @@
                     work_task_record wtr
                         INNER JOIN (
                         SELECT
-                            wn.NAME,
+                            wn.name,
                             wn.CODE,
                             wfni.id,
                             wfni.business_id,
@@ -619,7 +619,7 @@
         <if test="assetsId!=null and prodId!=null">
             SELECT
             assets.id as assetsId,
-            assets.NAME AS orderName,
+            assets.name AS orderName,
             assets.order_id as orderId,
             ap.production_no as reportNo,
             ap.id as prodId
@@ -632,7 +632,7 @@
         <if test="assetsId!=null and prodId==null">
             SELECT
             assets.id as assetsId,
-            assets.NAME AS orderName,
+            assets.name AS orderName,
             assets.order_id as orderId
             FROM
             assets

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

@@ -46,4 +46,9 @@ public class CommissionDeclareDTO {
      */
     private AssetsPerformanceDistributionAddDTO distributionDto;
 
+    /**
+     * 任务记录id
+     */
+    private Long recordId;
+
 }

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

@@ -1,9 +1,11 @@
 package com.dayou.vo;
 
 import com.dayou.common.BaseEntity;
+import com.dayou.entity.FinanceInvoice;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class AssetsOrderFundInvoiceVO extends BaseEntity {
@@ -24,37 +26,7 @@ public class AssetsOrderFundInvoiceVO extends BaseEntity {
     private BigDecimal realAmount;
 
     /**
-     * 发票抬头
+     * 开票信息
      */
-    private String title;
-
-    /**
-     * 发票类型
-     */
-    private String type;
-
-    /**
-     * 税号
-     */
-    private String taxNo;
-
-    /**
-     * 开户银行
-     */
-    private String bankName;
-
-    /**
-     * 银行账号
-     */
-    private String bankAccount;
-
-    /**
-     * 银行地址
-     */
-    private String bankAddress;
-
-    /**
-     * 银行电话
-     */
-    private String bankTel;
+    List<FinanceInvoice> financeInvoiceVoList;
 }

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

@@ -84,6 +84,9 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
     @Autowired
     private OrderFundMapper orderFundMapper;
 
+    @Autowired
+    private IFinanceInvoiceService financeInvoiceService;
+
     /**
      * 条件查询资产任务列表
      *
@@ -232,7 +235,11 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
      */
     @Override
     public AssetsOrderFundInvoiceVO getOrderFundInvoiceById(Long id) {
-        return assetsMapper.getOrderFundInvoiceById(id);
+        AssetsOrderFundInvoiceVO assetsOrderFundInvoiceVO = assetsMapper.getOrderFundInvoiceById(id);
+        assetsOrderFundInvoiceVO.setFinanceInvoiceVoList(financeInvoiceService.list(new LambdaQueryWrapper<FinanceInvoice>()
+                .eq(FinanceInvoice::getOrderFundId, assetsOrderFundInvoiceVO.getId())
+                .eq(BaseEntity::getDeleted, 0)));
+        return assetsOrderFundInvoiceVO;
     }
 
     @Override

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

@@ -10,12 +10,14 @@ import com.dayou.entity.*;
 import com.dayou.enums.FinanceInvoiceState;
 import com.dayou.enums.MainBusinessEnum;
 import com.dayou.enums.UserTypeEnum;
+import com.dayou.exception.ErrorCode;
 import com.dayou.mapper.CommissionDeclareMapper;
 import com.dayou.message.annotation.SendMessage;
 import com.dayou.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.service.workflow.IWorkFlowNodeInstanceService;
 import com.dayou.service.workflow.IWorkFlowService;
+import com.dayou.service.workflow.IWorkTaskRecordService;
 import com.dayou.utils.LoginContext;
 import com.dayou.vo.CommissionDeclareDetailVO;
 import com.dayou.vo.CommissionDeclareTodoCheckVO;
@@ -76,6 +78,9 @@ public class CommissionDeclareServiceImpl extends ServiceImpl<CommissionDeclareM
     @Autowired
     private IBusinessPerformanceDistributionService iBusinessPerformanceDistributionService;
 
+    @Autowired
+    private IWorkTaskRecordService workTaskRecordService;
+
 
 
     @Override
@@ -288,7 +293,12 @@ public class CommissionDeclareServiceImpl extends ServiceImpl<CommissionDeclareM
      */
     @Override
     public Boolean updateAssetsCommissionDeclare(CommissionDeclareDTO declareDTO) {
-        return commissionDeclareMapper.updateAssetsCommissionDeclare(declareDTO);
+        if (workTaskRecordService.detail(declareDTO.getRecordId()).getHandlerId().equals(LoginContext.getCurrentUserId())){
+            return commissionDeclareMapper.updateAssetsCommissionDeclare(declareDTO);
+        }else{
+             ErrorCode.throwBusinessException("只有节点任务处理人可修改提成比例与下限！","500");
+        }
+        return null;
     }
 
     /**