街道相关

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java

@@ -23,6 +23,8 @@ public interface IndexCalConstant {
 
     String COMMUNITY_LEVEL = "community";
 
+    String STREET_LEVEL = "street";
+
     String COMMUNITY_RELATE = "shequxiangguan";
 
 

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyScoreDTO.java

@@ -19,6 +19,9 @@ package com.epmet.dto.indexcal;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.IndexCalConstant;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -119,4 +122,14 @@ public class AgencyScoreDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    public AgencyScoreDTO() {
+        this.isTotal = NumConstant.ZERO_STR;
+        this.score = new BigDecimal(NumConstant.ZERO);
+        this.indexCode = "";
+        this.dataType = IndexCalConstant.STREET_LEVEL;
+        this.delFlag = 0;
+        this.revision = 0;
+        this.createdBy = "APP_USER";
+        this.updatedBy = "APP_USER";
+    }
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/SubCommunityPartyAvgResultDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.dto.indexcal;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/2 4:28 下午
+ */
+@Data
+public class SubCommunityPartyAvgResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6439835738195045820L;
+
+    /**
+     * 机关ID
+     */
+    private String agencyId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 上级组织ID
+     */
+    private String parentId;
+
+    /**
+     * 月度ID
+     */
+    private String monthId;
+
+    /**
+     * 季度ID
+     */
+    private String quarterId;
+
+    /**
+     * 年度ID
+     */
+    private String yearId;
+
+    /**
+     * 分数
+     */
+    private BigDecimal score;
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcal/AgencyScoreDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
 import com.epmet.entity.indexcal.AgencyScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -40,7 +41,7 @@ public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
      * @author zxc
      * @date 2020/8/27 5:05 下午
      */
-    void insertStreetRecord(@Param("lists") List<FactIndexCommunityScoreDTO> lists);
+    void insertStreetRecord(@Param("lists") List<AgencyScoreDTO> lists);
 
     /**
      * @Description  删除旧记录
@@ -50,7 +51,7 @@ public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
      * @author zxc
      * @date 2020/9/2 15:47
      */
-    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
+    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("dataType")String dataType);
 
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcal/AgencyScoreDao.xml

@@ -40,6 +40,6 @@
           AND customer_id = #{customerId}
           AND month_id = #{monthId}
           AND index_code = #{indexCode}
-          AND data_type = #{dateType}
+          AND data_type = #{dataType}
     </delete>
 </mapper>