Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java

@@ -3,7 +3,6 @@ package com.epmet.project.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -32,10 +31,4 @@ public class DifficultyRankFormDTO implements Serializable {
      * 获取数据个数 默认前10
      */
     private Integer topNum = 10;
-    /**
-     * 查询的组织类型 网格：grid ； 组织：agency
-     */
-    @NotBlank(message = "查询的组织类型不能为空",groups = {DifficultyRankInternalGroup.class})
-    private String orgType;
-
-}
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java

@@ -93,10 +93,10 @@ public class ProjectController {
     }
 
     /**
-     * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
-     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
      * @param param
      * @return
+     * @Description 难点赌点-耗时最长|涉及部门最多|处理次数 返回该组织下所有的难点堵点的 数据
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
      * @author jiangyy
      * @date 2020.10.19 16:38
      **/

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -250,10 +250,9 @@
         WHERE
             diff.DEL_FLAG = '0'
             AND diff.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
-              <if test="status!= null">
+              <if test="status!= null and status != ''">
                   AND diff.EVENT_STATUS_CODE = #{status}
               </if>
-            AND diff.ORG_TYPE = #{orgType}
          ORDER BY
          CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME
                        WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT

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

@@ -917,6 +917,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public void sendMessage(String customerId) {
 		List<CustomerProjectParameterDTO> paramList =  parameterService.getParameterByCustomer(customerId);
+		List<CustomerProjectParameterDTO> defaultList =  parameterService.getParameterByCustomer("default");
 		//可滞留天数
 		int detentionDays = 5;
 		//计算方式
@@ -938,6 +939,18 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 				}
 			}
 
+		} else {
+			for (CustomerProjectParameterDTO dto : defaultList) {
+				if (ParameterKeyConstant.DETENTION_DAYS.equals(dto.getParameterKey())) {
+					detentionDays = Integer.parseInt(dto.getParameterValue());
+				} else if (ParameterKeyConstant.CALCULATION.equals(dto.getParameterKey())) {
+					calculation = dto.getParameterValue();
+				} else if (ParameterKeyConstant.REMIND_TIME.equals(dto.getParameterKey())) {
+					remindTime = Integer.parseInt(dto.getParameterValue());
+				} else if (ParameterKeyConstant.PUSH_TIME.equals(dto.getParameterKey())) {
+					pushTime = dto.getParameterValue();
+				}
+			}
 		}
 		//获取工作人员未处理的节点
 		List<StaffUnHandledDTO> unHandledList = projectStaffService.getStaffUnHandledList(customerId);

epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.3__default.sql

@@ -0,0 +1,6 @@
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000', 'default', 'detention_days', '可滞留天数', '5', '默5天', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1001', 'default', 'calculation', '计算方式', 'work', '计算方式 工作日work  日历天calendar', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1002', 'default', 'remind_time', '即将超期提醒时间', '0', '默认 当天', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1003', 'default', 'push_time', '推送时间', '08:00', '默认 上午8点', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1004', 'default', 'start_time', '设定核算单位天开始时间', '00:00:00', '默认 00:00:00', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');
+INSERT INTO customer_project_parameter(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1005', 'default', 'end_time', '设定核算单位天结束时间', '23:59:00', '默认 23:59:00', '0', 1, '1', '2020-10-26 10:57:41', '1', '2020-10-26 10:57:45');