街道相关

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

@@ -84,6 +84,11 @@ public class AgencyScoreDTO implements Serializable {
      */
 	private String indexCode;
 
+    /**
+     *  数据类型 district  ：全区；street：街道
+     */
+    private String dataType;
+
     /**
      * 
      */

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

@@ -84,6 +84,11 @@ public class DeptScoreDTO implements Serializable {
      */
 	private String indexCode;
 
+    /**
+     *
+     */
+    private Integer delFlag;
+
     /**
      * 乐观锁
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/AgencyScoreDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/AgencyScoreDao.java

@@ -15,11 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.indexcoll;
+package com.epmet.dao.indexscore;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
 import com.epmet.entity.indexcoll.AgencyScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 区/街道相关分数表 
@@ -29,5 +33,24 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
-	
+
+    /**
+     * @Description 【街道】中间表插入
+     * @param lists
+     * @author zxc
+     * @date 2020/8/27 5:05 下午
+     */
+    void insertStreetRecord(@Param("lists") List<FactIndexCommunityScoreDTO> lists);
+
+    /**
+     * @Description  删除旧记录
+     * @param customerId
+     * @param monthId
+     * @param indexCode
+     * @author zxc
+     * @date 2020/9/2 15:47
+     */
+    void deleteOldRecord(@Param("customerId") String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
+
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/DeptScoreDao.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexscore/DeptScoreDao.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.indexcoll;
+package com.epmet.dao.indexscore;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.indexcoll.DeptScoreEntity;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/FactIndexCommunityScoreDao.java

@@ -35,7 +35,7 @@ import java.util.List;
 public interface FactIndexCommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity> {
 
     /**
-     * @Description  党建能力【社区】中间表插入
+     * @Description 【社区】中间表插入
      * @param lists
      * @author zxc
      * @date 2020/8/27 5:05 下午

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/AgencyScoreEntity.java

@@ -84,4 +84,9 @@ public class AgencyScoreEntity extends BaseEpmetEntity {
      */
 	private String indexCode;
 
+	/**
+	 *  数据类型 district  ：全区；street：街道
+	 */
+	private String dataType;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/AgencyScoreServiceImpl.java

@@ -23,7 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.dao.indexcoll.AgencyScoreDao;
+import com.epmet.dao.indexscore.AgencyScoreDao;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.entity.indexcoll.AgencyScoreEntity;
 import com.epmet.service.indexcal.AgencyScoreService;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/DeptScoreServiceImpl.java

@@ -23,7 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.dao.indexcoll.DeptScoreDao;
+import com.epmet.dao.indexscore.DeptScoreDao;
 import com.epmet.dto.indexcal.DeptScoreDTO;
 import com.epmet.entity.indexcoll.DeptScoreEntity;
 import com.epmet.service.indexcal.DeptScoreService;

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

@@ -1,6 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.indexcoll.AgencyScoreDao">
+<mapper namespace="com.epmet.dao.indexscore.AgencyScoreDao">
 
+    <!-- 【街道】中间表插入 -->
+    <insert id="insertStreetRecord">
+        INSERT INTO fact_index_agency_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, IS_TOTAL, SCORE, INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        VALUES
+        <foreach collection="lists" item="item" separator=",">
+        (
+            REPLACE ( UUID(), '-', '' ),
+            #{item.customerId},
+            #{item.agencyId},
+            #{item.parentAgencyId},
+            #{item.yearId},
+            #{item.quarterId},
+            #{item.monthId},
+            #{item.dataType},
+            #{item.isTotal},
+            #{item.score},
+            #{item.indexCode},
+            #{item.delFlag},
+            #{item.revision},
+            #{item.createdBy},
+            NOW(),
+            #{item.updatedBy},
+            NOW()
+        )
+        </foreach>
+    </insert>
+
+    <!-- 删除旧记录 -->
+    <delete id="deleteOldRecord">
+        DELETE
+        FROM
+            fact_index_agency_score
+        WHERE
+            del_flag = '0'
+          AND customer_id = #{customerId}
+          AND month_id = #{monthId}
+          AND index_code = #{indexCode}
+          AND data_type = #{dateType}
+    </delete>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/DeptScoreDao.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.indexcoll.DeptScoreDao">
+<mapper namespace="com.epmet.dao.indexscore.DeptScoreDao">
 
 </mapper>