update

src/main/java/com/gogirl/shared/admin/AchievementsPersonaResult.java

@@ -53,7 +53,7 @@ public class AchievementsPersonaResult implements Serializable {
     private BigDecimal old_belt_new_proportion;//0.0000;
     private BigDecimal month_score;//52.5087;
     private BigDecimal time_weight_month_proportion;//0.5000;
-    private BigDecimal quarter_score;//52.5087;
+    private BigDecimal quarter_score;//52.5087; i
     private BigDecimal time_weight_quarter_proportion;//0.4000;
     private BigDecimal year_score;//65.6661;
     private BigDecimal time_weight_year_proportion;//0.1000;

src/main/java/com/gogirl/shared/store/training/QueryPageStartClassLogRequest.java

@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
 @Data
 public class QueryPageStartClassLogRequest extends PageRequest {
 
-    @ApiModelProperty("状态")
+    @ApiModelProperty("状态 1-培训任务， 2-培训记录")
     private Integer status;
 
 

src/main/resources/mapper/TrainingStartClassLogTechnicianMapper.xml

@@ -6,8 +6,13 @@
             resultType="com.gogirl.domain.store.training.TrainingStartClassLogTechnician">
         select *
         from training_start_class_log_technician t1
-                 left join training_start_class t2 on t1.training_start_class_id = t2.id
+        left join training_start_class t2 on t1.training_start_class_id = t2.id
         where t1.technician_id = #{request.technicianId}
-          and t2.status = #{request.status}
+        <if test="request.status!=null and request.status = 1">
+            and t2.status in (1,2)
+        </if>
+        <if test="request.status!=null and request.status = 2">
+            and t2.status = 3
+        </if>
     </select>
 </mapper>