Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -73,7 +73,7 @@
     <select id="selectUserDistributionAgency" resultType="com.epmet.evaluationindex.screen.dto.result.UserDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
-            sca.center_mark AS centerMark,
+            IFNULL(sca.center_mark,'') AS centerMark,
             sutd.user_total AS totalNum,
             sca.area_marks AS areaMarks,
             sca.agency_name AS subName,

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -23,7 +23,7 @@
         SELECT
             scg.grid_id AS gridId,
             scg.grid_name AS gridName,
-            scg.party_mark AS partyMark
+            IFNULL(scg.party_mark,'') AS partyMark
         FROM
             screen_customer_grid scg
             LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = scg.PARENT_AGENCY_ID AND sca.IS_DISPLAY = 1
@@ -37,7 +37,7 @@
     <select id="selectUserDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.UserDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
-            scg.center_mark AS centerMark,
+            IFNULL(scg.center_mark,'') AS centerMark,
             sutd.user_total AS totalNum,
             scg.area_marks AS areaMarks,
             scg.grid_name AS subName,

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@@ -12,7 +12,7 @@
             ROUND(diff.EVENT_COST_TIME/60,0) AS totalHours,
             diff.EVENT_SOURCE AS gridName,
             diff.EVENT_IMG_URL AS imgUrl,
-            diff.EVENT_CATEGORY_NAME AS categoryName,
+            IFNULL(diff.EVENT_CATEGORY_NAME,'') AS categoryName,
             diff.EVENT_RE_ORG AS handleDepts,
             diff.EVENT_RE_ORG AS handleCount
         FROM

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

@@ -69,12 +69,11 @@ public interface ScreenCpcBaseDataDao extends BaseDao<ScreenCpcBaseDataEntity> {
     /**
      * @Description  删除旧的党员基本信息
      * @param customerId
-     * @param dateId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
-    Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("dateId") String dateId,@Param("orgIds")List<String> orgIds);
+    Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("orgIds")List<String> orgIds);
 
     /**
      * @Description  查询党员信息【根据agencyId来查】

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java

@@ -319,7 +319,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
         }
         Integer delNum;
         do {
-            delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, dateId, orgIds);
+            delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, orgIds);
         }while (delNum > NumConstant.ZERO);
         List<List<PartyBaseInfoFormDTO>> partition = ListUtils.partition(finalResult, NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {

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

@@ -43,12 +43,11 @@ public interface ScreenCpcBaseDataService extends BaseService<ScreenCpcBaseDataE
     /**
      * @Description  删除旧的党员基本信息
      * @param customerId
-     * @param dateId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
-    Integer deleteOldPartyBaseInfo(String customerId, String dateId, List<String> orgIds);
+    Integer deleteOldPartyBaseInfo(String customerId, List<String> orgIds);
 
     /**
      * @Description  查询党员信息【根据agencyId来查】

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

@@ -51,14 +51,13 @@ public class ScreenCpcBaseDataServiceImpl extends BaseServiceImpl<ScreenCpcBaseD
     /**
      * @Description  删除旧的党员基本信息
      * @param customerId
-     * @param dateId
      * @param orgIds
      * @author zxc
      * @date 2020/9/22 3:28 下午
      */
     @Override
-    public Integer deleteOldPartyBaseInfo(String customerId, String dateId, List<String> orgIds) {
-        return baseDao.deleteOldPartyBaseInfo(customerId, dateId,orgIds);
+    public Integer deleteOldPartyBaseInfo(String customerId, List<String> orgIds) {
+        return baseDao.deleteOldPartyBaseInfo(customerId,orgIds);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml

@@ -187,7 +187,6 @@
     <delete id="deleteOldPartyBaseInfo">
         delete from screen_cpc_base_data
         where CUSTOMER_ID = #{customerId}
-        and DATA_END_TIME = #{dateId}
         and
             (
                 <foreach collection="orgIds" item="orgId" separator=" OR ">