bug修复

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/QuarterlyTaskVo.java

@@ -3,6 +3,8 @@ package org.dromara.customer.domain.vo;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 
 import java.math.BigDecimal;
 import java.io.Serializable;
@@ -46,6 +48,7 @@ public class QuarterlyTaskVo implements Serializable {
      * 部门名称
      */
     @ExcelProperty(value = "部门")
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId")
     private String deptName;
 
     /**
@@ -63,6 +66,7 @@ public class QuarterlyTaskVo implements Serializable {
      * 业务人员名称
      */
     @ExcelProperty(value = "业务人员")
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "salesUserId")
     private String salesUserName;
 
     /**
@@ -74,6 +78,7 @@ public class QuarterlyTaskVo implements Serializable {
      * 客服人员名称
      */
     @ExcelProperty(value = "客服人员")
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "serviceUserId")
     private String serviceUserName;
 
     /**
@@ -98,6 +103,12 @@ public class QuarterlyTaskVo implements Serializable {
     @ExcelProperty(value = "季度目标任务(元)")
     private BigDecimal targetTask;
 
+    /**
+     * 季度冲刺任务(元)
+     */
+    @ExcelProperty(value = "季度冲刺任务(元)")
+    private BigDecimal sprintTask;
+
     /**
      * 季度总实绩(元)
      */

ruoyi-modules/ruoyi-customer/src/main/resources/mapper/customer/QuarterlyTaskMapper.xml

@@ -9,16 +9,14 @@
         <result property="year"               column="year"/>
         <result property="quarter"            column="quarter"/>
         <result property="deptId"             column="dept_id"/>
-        <result property="deptName"           column="dept_name"/>
         <result property="industryLine"       column="industry_line"/>
         <result property="salesUserId"        column="sales_user_id"/>
-        <result property="salesUserName"      column="sales_user_name"/>
         <result property="serviceUserId"      column="service_user_id"/>
-        <result property="serviceUserName"    column="service_user_name"/>
         <result property="annualTargetTask"   column="annual_target_task"/>
         <result property="annualSprintTask"   column="annual_sprint_task"/>
         <result property="targetPercentage"   column="target_percentage"/>
         <result property="targetTask"         column="target_task"/>
+        <result property="sprintTask"         column="sprint_task"/>
         <result property="actualAchievement"  column="actual_achievement"/>
         <result property="month1Actual"       column="month1_actual"/>
         <result property="month2Actual"       column="month2_actual"/>
@@ -31,23 +29,21 @@
         <result property="remark"             column="remark"/>
     </resultMap>
 
-    <!-- 查询季度任务列表 (独立表，含部门名、人员名、达成比) -->
+    <!-- 查询季度任务列表 (独立表) -->
     <select id="selectQuarterlyTaskPage" resultMap="QuarterlyTaskVoResult">
         SELECT
             qt.id,
             qt.year,
             qt.quarter,
             qt.dept_id,
-            d.dept_name,
             qt.industry_line,
             qt.sales_user_id,
-            su.nick_name       AS sales_user_name,
             qt.service_user_id,
-            svc.nick_name      AS service_user_name,
             qt.annual_target_task,
             qt.annual_sprint_task,
             qt.target_percentage,
             qt.target_task,
+            qt.sprint_task,
             qt.actual_achievement,
             qt.month1_actual,
             qt.month2_actual,
@@ -64,16 +60,10 @@
                 ELSE 0
             END AS achievement_rate
         FROM crm_quarterly_task qt
-        LEFT JOIN sys_dept  d   ON qt.dept_id         = d.dept_id
-        LEFT JOIN sys_user  su  ON qt.sales_user_id   = su.user_id
-        LEFT JOIN sys_user  svc ON qt.service_user_id = svc.user_id
         <where>
             <if test="bo.year != null">                                   AND qt.year          = #{bo.year}    </if>
             <if test="bo.quarter != null">                                AND qt.quarter       = #{bo.quarter} </if>
-            <if test="bo.deptName != null and bo.deptName != ''">         AND d.dept_name  LIKE CONCAT('%', #{bo.deptName},    '%') </if>
             <if test="bo.industryLine != null and bo.industryLine != ''"> AND qt.industry_line = #{bo.industryLine} </if>
-            <if test="bo.salesName != null and bo.salesName != ''">       AND su.nick_name  LIKE CONCAT('%', #{bo.salesName},  '%') </if>
-            <if test="bo.csName != null and bo.csName != ''">             AND svc.nick_name LIKE CONCAT('%', #{bo.csName},     '%') </if>
         </where>
         ORDER BY qt.id DESC
     </select>