Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescEnterpriseMapper.java

@@ -74,4 +74,11 @@ public interface TabIndexDescEnterpriseMapper {
      * @return  void

     
*/
     void deleteList(@Param("ids") List<Integer> deleteList);
+
+    /**
+     * 物理删除
+     * @param enterpriseId
+     * @return
+     */
+    int delete(@Param("enterpriseId") Integer enterpriseId);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescEnterpriseService.java

@@ -72,4 +72,11 @@ public interface IndexDescEnterpriseService {
      * @return  void

     
*/
     void insert(TabIndexDescEnterprise indexDescEnterprise);
+
+    /**
+     * 物理删除
+     * @param enterpriseId
+     * @return
+     */
+    int delete(Integer enterpriseId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescEnterpriseServiceImpl.java

@@ -72,4 +72,9 @@ public class IndexDescEnterpriseServiceImpl implements IndexDescEnterpriseServic
     public void insert(TabIndexDescEnterprise indexDescEnterprise) {
         tabIndexDescEnterpriseMapper.insertSelective(indexDescEnterprise);
     }
+
+    @Override
+    public int delete(Integer enterpriseId) {
+        return tabIndexDescEnterpriseMapper.delete(enterpriseId);
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescServiceImpl.java

@@ -100,6 +100,7 @@ public class IndexDescServiceImpl implements IndexDescService {
 
     @Override
     public void init(Integer enterpriseId) {
+        indexDescEnterpriseService.delete(enterpriseId);
         List<TabIndexDesc> indexDescDTOList = tabIndexDescMapper.listAll();
         for (TabIndexDesc indexDescDTO : indexDescDTOList) {
             TabIndexDescEnterprise indexDescEnterprise = new TabIndexDescEnterprise();

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescEnterpriseMapper.xml

@@ -147,4 +147,8 @@
         #{item}
       </foreach>
   </update>
+
+  <delete id="delete">
+    delete from tab_index_desc_enterprise where enterprise_id = #{enterpriseId}
+  </delete>
 </mapper>
\ No newline at end of file