Ver código fonte

人员项目评分表修改

anderx 1 ano atrás
pai
commit
3131af950d

+ 1 - 1
src/main/java/com/goafanti/common/dao/AdminProjectStatisticsMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  * 管理员用户项目评分表(AdminProjectStatistics)表数据库访问层
  *
  * @author makejava
- * @since 2024-09-29 13:56:50
+ * @since 2024-10-14 16:42:08
  */
 public interface AdminProjectStatisticsMapper {
 

+ 39 - 12
src/main/java/com/goafanti/common/mapper/AdminProjectStatisticsMapper.xml

@@ -6,16 +6,18 @@
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="aid" column="aid" jdbcType="VARCHAR"/>
         <result property="htSatCount" column="ht_sat_count" jdbcType="INTEGER"/>
+        <result property="htSatNotScoreCount" column="ht_sat_not_score_count" jdbcType="INTEGER"/>
         <result property="htSatScoreCount" column="ht_sat_score_count" jdbcType="INTEGER"/>
         <result property="htSatScoreAverage" column="ht_sat_score_average" jdbcType="NUMERIC"/>
         <result property="memberCount" column="member_count" jdbcType="INTEGER"/>
+        <result property="memberNotScoreCount" column="member_not_score_count" jdbcType="INTEGER"/>
         <result property="memberScoreCount" column="member_score_count" jdbcType="INTEGER"/>
         <result property="memberScoreAverage" column="member_score_average" jdbcType="NUMERIC"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="AdminProjectStatisticsAllSql">
-        id, aid, ht_sat_count, ht_sat_score_count, ht_sat_score_average, member_count, member_score_count, member_score_average, create_time
+        id, aid, ht_sat_count, ht_sat_not_score_count, ht_sat_score_count, ht_sat_score_average, member_count, member_not_score_count, member_score_count, member_score_average, create_time
     </sql>
 
     <!--查询单个-->
@@ -42,6 +44,9 @@
             <if test="htSatCount != null">
                 and ht_sat_count = #{htSatCount}
             </if>
+            <if test="htSatNotScoreCount != null">
+                and ht_sat_not_score_count = #{htSatNotScoreCount}
+            </if>
             <if test="htSatScoreCount != null">
                 and ht_sat_score_count = #{htSatScoreCount}
             </if>
@@ -51,6 +56,9 @@
             <if test="memberCount != null">
                 and member_count = #{memberCount}
             </if>
+            <if test="memberNotScoreCount != null">
+                and member_not_score_count = #{memberNotScoreCount}
+            </if>
             <if test="memberScoreCount != null">
                 and member_score_count = #{memberScoreCount}
             </if>
@@ -80,6 +88,9 @@
             <if test="htSatCount != null">
                 and ht_sat_count = #{htSatCount}
             </if>
+            <if test="htSatNotScoreCount != null">
+                and ht_sat_not_score_count = #{htSatNotScoreCount}
+            </if>
             <if test="htSatScoreCount != null">
                 and ht_sat_score_count = #{htSatScoreCount}
             </if>
@@ -89,6 +100,9 @@
             <if test="memberCount != null">
                 and member_count = #{memberCount}
             </if>
+            <if test="memberNotScoreCount != null">
+                and member_not_score_count = #{memberNotScoreCount}
+            </if>
             <if test="memberScoreCount != null">
                 and member_score_count = #{memberScoreCount}
             </if>
@@ -103,36 +117,43 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_score_count, ht_sat_score_average, member_count,
+        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_not_score_count, ht_sat_score_count,
+                                             ht_sat_score_average, member_count, member_not_score_count,
                                              member_score_count, member_score_average, create_time)
-        values (#{aid}, #{htSatCount}, #{htSatScoreCount}, #{htSatScoreAverage}, #{memberCount}, #{memberScoreCount},
-                #{memberScoreAverage}, #{createTime})
+        values (#{aid}, #{htSatCount}, #{htSatNotScoreCount}, #{htSatScoreCount}, #{htSatScoreAverage}, #{memberCount},
+                #{memberNotScoreCount}, #{memberScoreCount}, #{memberScoreAverage}, #{createTime})
     </insert>
 
     <insert id="insertBatch">
-        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_score_count, ht_sat_score_average, member_count,
-        member_score_count, member_score_average, create_time)
+        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_not_score_count, ht_sat_score_count,
+        ht_sat_score_average, member_count, member_not_score_count, member_score_count, member_score_average,
+        create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.aid}, #{entity.htSatCount}, #{entity.htSatScoreCount}, #{entity.htSatScoreAverage},
-            #{entity.memberCount}, #{entity.memberScoreCount}, #{entity.memberScoreAverage}, #{entity.createTime})
+            (#{entity.aid}, #{entity.htSatCount}, #{entity.htSatNotScoreCount}, #{entity.htSatScoreCount},
+            #{entity.htSatScoreAverage}, #{entity.memberCount}, #{entity.memberNotScoreCount},
+            #{entity.memberScoreCount}, #{entity.memberScoreAverage}, #{entity.createTime})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_score_count, ht_sat_score_average, member_count,
-        member_score_count, member_score_average, create_time)
+        insert into admin_project_statistics(aid, ht_sat_count, ht_sat_not_score_count, ht_sat_score_count,
+        ht_sat_score_average, member_count, member_not_score_count, member_score_count, member_score_average,
+        create_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.aid}, #{entity.htSatCount}, #{entity.htSatScoreCount}, #{entity.htSatScoreAverage},
-            #{entity.memberCount}, #{entity.memberScoreCount}, #{entity.memberScoreAverage}, #{entity.createTime})
+            (#{entity.aid}, #{entity.htSatCount}, #{entity.htSatNotScoreCount}, #{entity.htSatScoreCount},
+            #{entity.htSatScoreAverage}, #{entity.memberCount}, #{entity.memberNotScoreCount},
+            #{entity.memberScoreCount}, #{entity.memberScoreAverage}, #{entity.createTime})
         </foreach>
         on duplicate key update
         aid = values(aid),
         ht_sat_count = values(ht_sat_count),
+        ht_sat_not_score_count = values(ht_sat_not_score_count),
         ht_sat_score_count = values(ht_sat_score_count),
         ht_sat_score_average = values(ht_sat_score_average),
         member_count = values(member_count),
+        member_not_score_count = values(member_not_score_count),
         member_score_count = values(member_score_count),
         member_score_average = values(member_score_average),
         create_time = values(create_time)
@@ -148,6 +169,9 @@
             <if test="htSatCount != null">
                 ht_sat_count = #{htSatCount},
             </if>
+            <if test="htSatNotScoreCount != null">
+                ht_sat_not_score_count = #{htSatNotScoreCount},
+            </if>
             <if test="htSatScoreCount != null">
                 ht_sat_score_count = #{htSatScoreCount},
             </if>
@@ -157,6 +181,9 @@
             <if test="memberCount != null">
                 member_count = #{memberCount},
             </if>
+            <if test="memberNotScoreCount != null">
+                member_not_score_count = #{memberNotScoreCount},
+            </if>
             <if test="memberScoreCount != null">
                 member_score_count = #{memberScoreCount},
             </if>

+ 26 - 2
src/main/java/com/goafanti/common/model/AdminProjectStatistics.java

@@ -8,10 +8,10 @@ import java.util.Date;
  * 管理员用户项目评分表(AdminProjectStatistics)实体类
  *
  * @author makejava
- * @since 2024-09-29 14:26:44
+ * @since 2024-10-14 16:42:08
  */
 public class AdminProjectStatistics implements Serializable {
-    private static final long serialVersionUID = 609725425891537422L;
+    private static final long serialVersionUID = 188207842687952556L;
     /**
      * id
      */
@@ -27,6 +27,10 @@ public class AdminProjectStatistics implements Serializable {
     /**
      * 高新&科技评分数
      */
+    private Integer htSatNotScoreCount;
+    /**
+     * 高新&科技评分数
+     */
     private Integer htSatScoreCount;
     /**
      * 高新&科技平均分
@@ -39,6 +43,10 @@ public class AdminProjectStatistics implements Serializable {
     /**
      * 会员评分数
      */
+    private Integer memberNotScoreCount;
+    /**
+     * 会员评分数
+     */
     private Integer memberScoreCount;
     /**
      * 会员平均分
@@ -74,6 +82,14 @@ public class AdminProjectStatistics implements Serializable {
         this.htSatCount = htSatCount;
     }
 
+    public Integer getHtSatNotScoreCount() {
+        return htSatNotScoreCount;
+    }
+
+    public void setHtSatNotScoreCount(Integer htSatNotScoreCount) {
+        this.htSatNotScoreCount = htSatNotScoreCount;
+    }
+
     public Integer getHtSatScoreCount() {
         return htSatScoreCount;
     }
@@ -98,6 +114,14 @@ public class AdminProjectStatistics implements Serializable {
         this.memberCount = memberCount;
     }
 
+    public Integer getMemberNotScoreCount() {
+        return memberNotScoreCount;
+    }
+
+    public void setMemberNotScoreCount(Integer memberNotScoreCount) {
+        this.memberNotScoreCount = memberNotScoreCount;
+    }
+
     public Integer getMemberScoreCount() {
         return memberScoreCount;
     }

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/TaskScoreServiceImpl.java

@@ -120,9 +120,11 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
         aps.setAid(aid);
         aps.setHtSatCount(htSatCount);
         aps.setHtSatScoreAverage(htSatScoreAverage.doubleValue());
+        aps.setHtSatNotScoreCount(htSatNotScoreCount);
         aps.setHtSatScoreCount(htSatScoreCount);
         aps.setMemberScoreAverage(memberScoreAverage.doubleValue());
         aps.setMemberScoreCount(memberScoreCount);
+        aps.setMemberNotScoreCount(memberNotScoreCount);
         aps.setMemberCount(memberCount);
         if (adminProjectStatistics==null){
             adminProjectStatisticsMapper.insert(aps);