fix:结算单管理修改

src/main/java/com/sunxung/factoring/service/project/impl/BusinessProcessingTaskServiceImpl.java

@@ -353,7 +353,9 @@ public class BusinessProcessingTaskServiceImpl implements BusinessProcessingTask
                             taskVo.setAssigneeName(taskVo.getAssignee().getName());
                         } else {
                             Long userId = assigneeService.getIdByBusiness(processingLog.getBusnessKey(), ConstantUtil.BILL_BASIC_INFORMATION, ConstantUtil.ASSIGNEE_PROJECT_MANAGER);
-                            taskVo.setAssigneeName(userService.get(userId).getName());
+                            if(userId != null){
+                                taskVo.setAssigneeName(userService.get(userId).getName());
+                            }
                         }
                     }
                 }

src/main/resources/mapper/settlement/SettlementBasicInfoMapper.xml

@@ -92,7 +92,7 @@
         LEFT JOIN c_enterprise t5 ON t2.enterprise_customer_info_id = t5.id
         LEFT JOIN t_dictionary t6 ON t2.settlement_status = t6.id
         <where>
-            t1.business_type = "BillBasicInformation"
+            (t1.business_type = "BillBasicInformation" or t1.business_type = "BillUnitPriceAdjust")
             AND t1.end_time IS NOT NULL
             <if test="userId != null">
                 AND t1.assignee_id = #{userId}
@@ -132,7 +132,7 @@
         left join trading_platform t9 on t2.trading_platform_id = t9.id
         LEFT JOIN c_sys_user t10 ON t10.id = t7.sys_user_id
         <where>
-            t1.business_type = "BillBasicInformation"
+            (t1.business_type = "BillBasicInformation" or t1.business_type = "BillUnitPriceAdjust")
             <if test="userIds != null and userIds.size()>0">
                 AND t10.project_manager in
                 <foreach collection="userIds" index="index" item="item"  open="(" separator="," close=")">
@@ -182,7 +182,7 @@
         LEFT JOIN c_enterprise t5 ON t2.enterprise_customer_info_id = t5.id
         LEFT JOIN t_dictionary t6 ON t2.settlement_status = t6.id
         <where>
-            t1.business_type = "BillBasicInformation"
+            (t1.business_type = "BillBasicInformation" or t1.business_type = "BillUnitPriceAdjust")
             and t2.supplier_id = #{supplierId}
             <if test="startDate != null">
                 <![CDATA[ AND DATE_FORMAT(t2.settlement_date, '%Y-%m-%d')>=  DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]>