Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectCategoryDTO.java

@@ -69,11 +69,6 @@ public class ProjectCategoryDTO implements Serializable {
      */
     private String categoryCode;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0未删除、1已删除
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectTagsDTO.java

@@ -58,11 +58,6 @@ public class ProjectTagsDTO implements Serializable {
      */
 	private String tagName;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0.未删除 1.已删除
      */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/ProjectCategoryDTO.java

@@ -69,11 +69,6 @@ public class ProjectCategoryDTO implements Serializable {
      */
     private String categoryCode;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0未删除、1已删除
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java

@@ -43,4 +43,12 @@ public interface CustomerRelationDao extends BaseDao<CustomerRelationEntity> {
     CustomerSubInfoDTO selectCustomerSubInfo(@Param("customerId")String customerId);
 
     List<CustomerRelationEntity> selectListByPids(String customerId);
+
+    /**
+     * @Description  查询子级客户
+     * @Param customerId
+     * @author zxc
+     * @date 2021/3/23 上午10:21
+     */
+    List<CustomerRelationEntity> selectSubCustomer(@Param("customerId") String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/CustomerRelationService.java

@@ -22,6 +22,8 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.indexcal.CustomerSubInfoDTO;
 import com.epmet.entity.crm.CustomerRelationEntity;
 
+import java.util.List;
+
 /**
  * 客户关系表(01.14 add)
  *
@@ -40,4 +42,12 @@ public interface CustomerRelationService extends BaseService<CustomerRelationEnt
     CustomerSubInfoDTO getCustomerSubInfo(String customerId);
 
     boolean haveSubCustomer(String customerId);
+
+    /**
+     * @Description  查询子级客户
+     * @Param customerId
+     * @author zxc
+     * @date 2021/3/23 上午10:21
+     */
+    List<CustomerRelationEntity> selectSubCustomer(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java

@@ -27,9 +27,11 @@ import com.epmet.entity.crm.CustomerRelationEntity;
 import com.epmet.service.crm.CustomerRelationService;
 import com.epmet.service.stats.DimCustomerService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -70,4 +72,18 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         }
         return true;
     }
+
+    /**
+     * @Description  查询子级客户
+     * @Param customerId
+     * @author zxc
+     * @date 2021/3/23 上午10:21
+     */
+    @Override
+    public List<CustomerRelationEntity> selectSubCustomer(String customerId) {
+        if (StringUtils.isEmpty(customerId)){
+            return new ArrayList<>();
+        }
+        return baseDao.selectSubCustomer(customerId);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryOrgDailyService.java

@@ -102,4 +102,13 @@ public interface ScreenProjectCategoryOrgDailyService extends BaseService<Screen
      * @return void
      */
     void collect(ScreenCollFormDTO<ScreenProjectCategoryOrgDailyDTO> param);
+
+    /**
+     * @Description  按组织计算分类统计项目数量
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/23 上午10:07
+     */
+    void extractProjectCategoryOrgData(String customerId, String dateId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java

@@ -29,14 +29,19 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao;
 import com.epmet.dto.screen.ScreenProjectCategoryOrgDailyDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
+import com.epmet.entity.crm.CustomerRelationEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectCategoryOrgDailyEntity;
+import com.epmet.service.crm.CustomerRelationService;
 import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryOrgDailyService;
 import com.google.common.collect.Lists;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -51,6 +56,8 @@ import java.util.Map;
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<ScreenProjectCategoryOrgDailyDao, ScreenProjectCategoryOrgDailyEntity> implements ScreenProjectCategoryOrgDailyService {
 
+    @Autowired
+    private CustomerRelationService relationService;
 
     @Override
     public PageData<ScreenProjectCategoryOrgDailyDTO> page(Map<String, Object> params) {
@@ -131,4 +138,71 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         }
     }
 
+    /**
+     * @Description  按组织计算分类统计项目数量
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/23 上午10:07
+     */
+    @Override
+    public void extractProjectCategoryOrgData(String customerId, String dateId) {
+        List<ScreenProjectCategoryOrgDailyEntity> needInsert = new ArrayList<>();
+        // 先查询有无子客户
+        List<CustomerRelationEntity> relationInfo = relationService.selectSubCustomer(customerId);
+        if (CollectionUtils.isEmpty(relationInfo)){
+            needInsert = disposeOneCustomer(customerId, dateId);
+        }else {
+            needInsert = disposeMoreCustomer(customerId,dateId,relationInfo);
+        }
+        deleteAndInsert(customerId,dateId,needInsert);
+    }
+
+    /**
+     * @Description  单客户处理
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/23 上午10:40
+     */
+    private List<ScreenProjectCategoryOrgDailyEntity> disposeOneCustomer(String customerId, String dateId){
+
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  多客户处理
+     * @Param customerId
+     * @Param dateId
+     * @Param relationInfo 子级客户信息
+     * @author zxc
+     * @date 2021/3/23 上午10:40
+     */
+    private List<ScreenProjectCategoryOrgDailyEntity> disposeMoreCustomer(String customerId, String dateId,List<CustomerRelationEntity> relationInfo){
+
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  删除和新增
+     * @Param customerId
+     * @Param dateId
+     * @author zxc
+     * @date 2021/3/23 上午10:52
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteAndInsert(String customerId, String dateId, List<ScreenProjectCategoryOrgDailyEntity> needInsert){
+        if (CollectionUtils.isEmpty(needInsert)){
+            return;
+        }
+        Integer row = NumConstant.ZERO;
+        do {
+            row = baseDao.deleteByDateIdAndCustomerId(customerId, dateId);
+        }while (row > NumConstant.ZERO && row == NumConstant.ONE_THOUSAND);
+        List<List<ScreenProjectCategoryOrgDailyEntity>> partition = ListUtils.partition(needInsert, NumConstant.ONE_HUNDRED);
+        partition.forEach(p -> {
+            insertBatch(p);
+        });
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml

@@ -34,4 +34,9 @@
             #{customerId},
             '%')
     </select>
+
+    <!-- 查询子级客户 -->
+    <select id="selectSubCustomer" resultType="com.epmet.entity.crm.CustomerRelationEntity">
+        SELECT * FROM customer_relation WHERE DEL_FLAG = 0 AND PARENT_CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueCategoryDTO.java

@@ -68,11 +68,6 @@ public class IssueCategoryDTO implements Serializable {
      */
     private String categoryCode;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0未删除、1已删除
      */

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueTagsDTO.java

@@ -63,11 +63,6 @@ public class IssueTagsDTO implements Serializable {
      */
 	private String tagName;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0.未删除 1.已删除
      */

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagsFormDTO.java

@@ -43,11 +43,6 @@ public class IssueTagsFormDTO implements Serializable {
      */
     private String name;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0.未删除 1.已删除
      */

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueCategoryEntity.java

@@ -68,9 +68,4 @@ public class IssueCategoryEntity extends BaseEpmetEntity {
 	 */
 	private String categoryCode;
 
-	/**
-	 * 是否禁用(enable:启用 disable:禁用)
-	 */
-	private String isDisable;
-
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueTagsEntity.java

@@ -63,9 +63,4 @@ public class IssueTagsEntity extends BaseEpmetEntity {
      */
 	private String tagName;
 
-	/**
-	 * 是否禁用(enable:启用 disable:禁用)
-	 */
-	private String isDisable;
-
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java

@@ -209,7 +209,6 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
                 if (ca.getId().equals(cl.getId())) {
                     entity.setCategoryPids(cl.getPids());
                     entity.setCategoryCode(cl.getCategoryCode());
-                    entity.setIsDisable(cl.getIsDisable());
                 }
             });
             entityList.add(entity);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java

@@ -235,7 +235,6 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                 n.setCustomerId(customerId);
                 n.setGridId(issueEntity.getGridId());
                 n.setIssueId(form.getIssueId());
-                n.setIsDisable(ModuleConstants.ID_ENABLE);
             });
             baseDao.insertNewTags(needInsert);
         }

epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.12__del_category_tag_field.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `issue_category` DROP COLUMN `IS_DISABLE`;
+
+ALTER TABLE `issue_tags` DROP COLUMN `IS_DISABLE`;
+

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml

@@ -70,7 +70,7 @@
 
     <!-- 插入新的标签 -->
     <insert id="insertNewTags">
-        INSERT INTO issue_tags ( ID, CUSTOMER_ID, GRID_ID, ISSUE_ID, TAG_ID, TAG_NAME, IS_DISABLE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO issue_tags ( ID, CUSTOMER_ID, GRID_ID, ISSUE_ID, TAG_ID, TAG_NAME, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
             <foreach collection="tags" item="l" separator=",">
                 (
@@ -80,7 +80,6 @@
                 #{l.issueId},
                 #{l.tagId},
                 #{l.name},
-                #{l.isDisable},
                 #{l.delFlag},
                 #{l.revision},
                 #{l.createdBy},

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectCategoryDTO.java

@@ -68,11 +68,6 @@ public class ProjectCategoryDTO implements Serializable {
      */
     private String categoryCode;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0未删除、1已删除
      */

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectTagsDTO.java

@@ -58,11 +58,6 @@ public class ProjectTagsDTO implements Serializable {
      */
 	private String tagName;
 
-    /**
-     * 是否禁用(enable:启用 disable:禁用)
-     */
-    private String isDisable;
-
     /**
      * 删除标识 0.未删除 1.已删除
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectCategoryEntity.java

@@ -68,9 +68,4 @@ public class ProjectCategoryEntity extends BaseEpmetEntity {
 	 */
 	private String categoryCode;
 
-	/**
-	 * 是否禁用(enable:启用 disable:禁用)
-	 */
-	private String isDisable;
-
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectTagsEntity.java

@@ -58,9 +58,4 @@ public class ProjectTagsEntity extends BaseEpmetEntity {
      */
 	private String tagName;
 
-	/**
-	 * 是否禁用(enable:启用 disable:禁用)
-	 */
-	private String isDisable;
-
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java

@@ -177,7 +177,6 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
                 if (ca.getId().equals(cl.getId())) {
                     entity.setCategoryPids(cl.getPids());
                     entity.setCategoryCode(cl.getCategoryCode());
-                    entity.setIsDisable(cl.getIsDisable());
                 }
             });
             entityList.add(entity);

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__del_category_tag_field.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `project_category` DROP COLUMN `IS_DISABLE`;
+
+ALTER TABLE `project_tags` DROP COLUMN `IS_DISABLE`;
+