健康度得分BUG修复

jjt-biz/src/main/java/com/jjt/hl/domain/HlClassScore.java

@@ -27,7 +27,9 @@ public class HlClassScore extends BaseEntity {
     @ApiModelProperty("健康度分类ID")
     @TableId
     private Long scoreClassId;
-
+    
+    @ApiModelProperty("old分类ID")
+    private Long hlClassId;
     /**
      * 健康度分数记录ID
      */

jjt-biz/src/main/java/com/jjt/hl/domain/HlScore.java

@@ -1,15 +1,15 @@
 package com.jjt.hl.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jjt.common.annotation.Excel;
 import com.jjt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 健康度分数记录对象 hl_score
@@ -18,95 +18,43 @@ import com.jjt.common.core.domain.BaseEntity;
  * @date 2024-09-05
  */
 @ApiModel(value = "HlScore", description = "健康度分数记录")
-public class HlScore extends BaseEntity
-{
+@Data
+public class HlScore extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 健康度分数记录ID; */
+    /**
+     * 健康度分数记录ID;
+     */
     @ApiModelProperty("健康度分数记录ID;")
     @TableId
     private Long hlScoreId;
 
-    /** 模型ID */
+    /**
+     * 模型ID
+     */
     @ApiModelProperty("模型ID")
     @Excel(name = "模型ID")
     private Long modelId;
 
-    /** 健康度分值 */
+    /**
+     * 健康度分值
+     */
     @ApiModelProperty("健康度分值")
     @Excel(name = "健康度分值")
     private BigDecimal hlScore;
 
-    /** 类型 */
+    /**
+     * 类型
+     */
     @ApiModelProperty("类型")
     @Excel(name = "类型")
     private String hlType;
 
-    /** 日期 */
+    /**
+     * 日期
+     */
     @ApiModelProperty("日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date hlDate;
-
-    public void setHlScoreId(Long hlScoreId)
-    {
-        this.hlScoreId = hlScoreId;
-    }
-
-    public Long getHlScoreId()
-    {
-        return hlScoreId;
-    }
-    public void setModelId(Long modelId)
-    {
-        this.modelId = modelId;
-    }
-
-    public Long getModelId()
-    {
-        return modelId;
-    }
-    public void setHlScore(BigDecimal hlScore)
-    {
-        this.hlScore = hlScore;
-    }
-
-    public BigDecimal getHlScore()
-    {
-        return hlScore;
-    }
-    public void setHlType(String hlType)
-    {
-        this.hlType = hlType;
-    }
-
-    public String getHlType()
-    {
-        return hlType;
-    }
-    public void setHlDate(Date hlDate)
-    {
-        this.hlDate = hlDate;
-    }
-
-    public Date getHlDate()
-    {
-        return hlDate;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("hlScoreId", getHlScoreId())
-            .append("modelId", getModelId())
-            .append("hlScore", getHlScore())
-            .append("hlType", getHlType())
-            .append("hlDate", getHlDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

jjt-biz/src/main/resources/mapper/hl/HlClassScoreMapper.xml

@@ -42,15 +42,16 @@
                      A.CREATE_TIME,
                      A.UPDATE_BY,
                      A.UPDATE_TIME,
-                     A.REMARK
+                     A.REMARK,
                      b.hl_obj_id,
                      b.OBJ_ID,
                      b.OBJ_NAME
-              from hl_class a
+              from hl_class_score a
                        left JOIN (SELECT a.*, b.OBJ_NAME, b.OBJ_TYPE
                                   FROM hl_obj a,
                                        biz_obj b
-                                  WHERE a.obj_id = b.obj_id) b ON a.hl_class_id = b.hl_class_id and a.obj_type=b.obj_type) t
+                                  WHERE a.obj_id = b.obj_id) b
+                                 ON a.hl_class_id = b.hl_class_id and a.obj_type = b.obj_type) t
     </sql>
 
     <select id="selectHlClassScoreList" parameterType="HlClassScore" resultMap="HlClassScoreResult">
@@ -107,6 +108,8 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="hlScoreId != null">HL_SCORE_ID,
             </if>
+            <if test="hlClassId != null">HL_CLASS_ID,
+            </if>
             <if test="modelId != null">MODEL_ID,
             </if>
             <if test="objType != null">OBJ_TYPE,
@@ -133,6 +136,8 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="hlScoreId != null">#{hlScoreId},
             </if>
+            <if test="hlClassId != null">#{hlClassId},
+            </if>
             <if test="modelId != null">#{modelId},
             </if>
             <if test="objType != null">#{objType},
@@ -164,6 +169,8 @@
             <if test="hlScoreId != null">HL_SCORE_ID =
                 #{hlScoreId},
             </if>
+            <if test="hlClassId != null">HL_CLASS_ID = #{hlClassId},
+            </if>
             <if test="modelId != null">MODEL_ID =
                 #{modelId},
             </if>