فهرست منبع

部门绩效允许传空,空值直接显示不处理

yzc 1 سال پیش
والد
کامیت
3783c5ef50

+ 6 - 0
hx-sale/pom.xml

@@ -37,6 +37,12 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-purchase</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.5.3.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

+ 14 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/dept/po/DeptPerf.java

@@ -1,5 +1,7 @@
 package com.fjhx.sale.entity.dept.po;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
@@ -38,61 +40,73 @@ public class DeptPerf extends BasePo {
     /**
      * 一月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal january;
 
     /**
      * 二月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal february;
 
     /**
      * 三月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal march;
 
     /**
      * 四月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal april;
 
     /**
      * 五月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal may;
 
     /**
      * 六月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal june;
 
     /**
      * 七月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal july;
 
     /**
      * 八月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal august;
 
     /**
      * 九月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal september;
 
     /**
      * 十月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal october;
 
     /**
      * 十一月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal november;
 
     /**
      * 十二月
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal december;
 
 }

+ 12 - 12
hx-sale/src/main/resources/mapper/dept/DeptPerfMapper.xml

@@ -8,18 +8,18 @@
                gr.dept_id                      AS groupId,
                gr.dept_name                    AS groupName,
                IFNULL(dep.years, #{dto.years}) AS years,
-               IFNULL(dep.january, 0)          AS january,
-               IFNULL(dep.february, 0)         AS february,
-               IFNULL(dep.march, 0)            AS march,
-               IFNULL(dep.april, 0)            AS april,
-               IFNULL(dep.may, 0)              AS may,
-               IFNULL(dep.june, 0)             AS june,
-               IFNULL(dep.july, 0)             AS july,
-               IFNULL(dep.august, 0)           AS august,
-               IFNULL(dep.september, 0)        AS september,
-               IFNULL(dep.october, 0)          AS october,
-               IFNULL(dep.november, 0)         AS november,
-               IFNULL(dep.december, 0)         AS december
+               dep.january,
+               dep.february,
+               dep.march,
+               dep.april,
+               dep.may,
+               dep.june,
+               dep.july,
+               dep.august,
+               dep.september,
+               dep.october,
+               dep.november,
+               dep.december
         FROM sys_dept gr
                  LEFT JOIN sys_dept de ON gr.parent_id = de.dept_id
                  LEFT JOIN dept_perf dep ON dep.group_id = gr.dept_id AND dep.years = #{dto.years}