diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgress.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgress.java index 4912be5a..2f7c6736 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgress.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgress.java @@ -128,4 +128,7 @@ public class BsSgcJsjdBuiProgress extends BaseEntity @TableField(exist = false) private String projectType; + @TableField(exist = false) + private String isMajor; + } diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml index 700d9122..26b25fc3 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml @@ -9,7 +9,8 @@ pi.PROJECT_NAME, pp.project_type, bp.YEARLY_CUMULATIVE_WORKLOAD, - bp.UPDATE_TIME + bp.UPDATE_TIME, + pi.is_major FROM `bs_sgc_jsjd_bui_progress` bp JOIN ( SELECT *, max( create_time ) FROM `bs_sgc_jsjd_bui_progress` GROUP BY PRO_CODE, PRO_NO ) t ON t.id = bp.id @@ -23,9 +24,10 @@ + - WHERE