Merge branch 'dev' into dev_graceful_shutdown

epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java

@@ -11,8 +11,8 @@ import java.util.Set;
  * @author jianjun liu
  * @date 2020-06-04 20:39
  **/
-@RestController
+//@RestController
-@RequestMapping("opback")
+//@RequestMapping("opback")
 public class BackDoorController {
 	@Autowired
 	private CustomerAppWxServiceUtil customerAppWxServiceUtil;

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java

@@ -38,6 +38,17 @@ public class AgencyDistributionResultDTO implements Serializable {
      */
     private String type;
 
+    /**
+     * 若果是组织，对应返回screen_customer_agency的 level
+     * 机关级别
+     * 社区级：community，
+     * 乡（镇、街道）级:street,
+     * 区县级: district,
+     * 市级: city
+     * 省级:province
+     */
+    private String agencyLevel;
+
     public AgencyDistributionResultDTO() {
         this.subAreaMarks = "";
         this.subCenterMark = "";

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java

@@ -31,7 +31,10 @@ public class CompartmentResultDTO implements Serializable {
      */
     private String areaMarks = "";
 
+    @JsonIgnore
+    private String level;
     /**
+     * 当前组织的级别
      * 机关级别
      * 社区级：community，
      * 乡（镇、街道）级:street,
@@ -39,8 +42,7 @@ public class CompartmentResultDTO implements Serializable {
      * 市级: city
      * 省级:province
      */
-    @JsonIgnore
+    private String agencyLevel;
-    private String level;
 
     /**
      * 子级用户分布

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.52
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.59
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.52</version>
+    <version>0.3.59</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -195,7 +195,7 @@ public class AgencyServiceImpl implements AgencyService {
         if (null == agencyAreaInfo){
             return new CompartmentResultDTO();
         }
-        if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+        if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){
             // 当level为"community"时，查询screen_customer_grid表
             List<AgencyDistributionResultDTO> agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
             agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);
@@ -213,7 +213,7 @@ public class AgencyServiceImpl implements AgencyService {
         if (null == agencyAreaInfo){
             return new CompartmentResultDTO();
         }
-        if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+        if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){
             // 当level为"community"时，查询screen_customer_grid表
             List<AgencyDistributionResultDTO> agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
             agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.datareport.service.fact.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@@ -12,6 +13,7 @@ import com.epmet.datareport.dao.fact.*;
 import com.epmet.datareport.service.fact.FactIndexService;
 import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +31,7 @@ import java.util.regex.Pattern;
  *
  * @author sun
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class FactIndexServiceImpl implements FactIndexService {
@@ -77,12 +80,12 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //4.根据组织级别判断查询哪类数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分数据
                 list = factIndexAgencyScoreDao.selectAgencyAblityWeightScoreIndex(formDTO);
 
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
                 list = factIndexCommunityScoreDao.selectCommunityAblityWeightScore(formDTO);
             } else {
@@ -179,11 +182,11 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //3.根据组织级别判断查询哪类数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 //3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
                 resultList = factIndexAgencyScoreDao.selectAgencyWeightScoreList(formDTO);
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 //3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
                 resultList = factIndexCommunityScoreDao.selectCommunityWeightScoreList(formDTO);
             } else {
@@ -221,22 +224,25 @@ public class FactIndexServiceImpl implements FactIndexService {
         if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
             //3.根据组织Id查询组织信息
             CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyInfoByAegncyId(formDTO.getOrgId());
+            log.debug("monthScoreList search agency result:{}", JSON.toJSONString(agency));
             if (null == agency) {
-                //throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
+                log.warn(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
                 return resultList;
             }
             //4.根据组织级别判断查询哪类数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
                 list = factIndexAgencyScoreDao.selectAgencyMonthWeightScoreList(formDTO);
-
+                log.debug("monthScoreList search selectAgencyMonthWeightScoreList result:{}", JSON.toJSONString(list));
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
                 list = factIndexCommunityScoreDao.selectCommunityMonthWeightScoreList(formDTO);
+                log.debug("monthScoreList search selectCommunityMonthWeightScoreList result:{}", JSON.toJSONString(list));
             } else {
-                //throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+                log.warn(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+                log.debug("monthScoreList search othoer result:{}", JSON.toJSONString(list));
                 return resultList;
             }
             //网格层级数据
@@ -246,7 +252,7 @@ public class FactIndexServiceImpl implements FactIndexService {
         } else {
             throw new RenException(String.format("能力指数查询,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
         }
-
+        log.debug("monthScoreList search result:{}", JSON.toJSONString(list));
         //5.封装数据并返回
         for (MonthScoreListResultDTO.ScoreListResultDTO l : list) {
             if (FactConstant.DJNL.equals(l.getIndexCode())) {
@@ -275,7 +281,7 @@ public class FactIndexServiceImpl implements FactIndexService {
         if (null != fwList) {
             resultList.add(fw);
         }
-
+        log.debug("monthScoreList search return result:{}", JSON.toJSONString(resultList));
         return resultList;
     }
 
@@ -298,8 +304,8 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //3.根据组织级别拼接查询条件，判断查询不同数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
-                if ("district".equals(agency.getLevel())) {
+                if ("district".equals(agency.getAgencyLevel())) {
                     formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
                 } else {
                     formDTO.setAllParentIndexCode(FactConstant.JIE_DAO_XIANG_GUAN + ":" + formDTO.getIndexCode());
@@ -307,7 +313,7 @@ public class FactIndexServiceImpl implements FactIndexService {
                 resultList = factIndexAgencySubScoreDao.selectAblityList(formDTO);
 
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 formDTO.setAllParentIndexCode(FactConstant.SHE_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
                 resultList = factIndexCommunitySubScoreDao.selectCommunityAblityList(formDTO);
             } else {
@@ -366,10 +372,10 @@ public class FactIndexServiceImpl implements FactIndexService {
             }
             //4.根据组织级别拼接查询条件，判断查询不同数据表
             //区县级、乡镇街道级
-            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
                 resultList = factIndexAgencySubScoreDao.selectMonthAblityList(formDTO);
                 //社区级
-            } else if ("community".equals(agency.getLevel())) {
+            } else if ("community".equals(agency.getAgencyLevel())) {
                 resultList = factIndexCommunitySubScoreDao.selectCommunityMonthAblityList(formDTO);
             } else {
                 //throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));

epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

@@ -155,7 +155,7 @@
     <springProfile name="prod">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.datareport.dao" level="INFO"/>
+        <logger name="com.epmet.datareport.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>

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

@@ -44,7 +44,8 @@
             agency_id AS agencyId,
             agency_name AS name,
             area_marks AS areaMarks,
-            level AS level
+            level as level,
+            level as agencyLevel
         FROM
             screen_customer_agency
         WHERE
@@ -60,7 +61,8 @@
             agency_name AS subName,
             area_marks AS subAreaMarks,
             center_mark AS subCenterMark,
-            'agency' AS type
+            'agency' AS type,
+            level as agencyLevel
         FROM
             screen_customer_agency
         WHERE
@@ -73,7 +75,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,
@@ -190,7 +192,8 @@
         SELECT
                 agency_id AS agencyId,
                 agency_name AS name,
-                level AS level
+                level AS level,
+                level AS agencyLevel
         FROM
                 screen_customer_agency
         WHERE

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

@@ -10,7 +10,8 @@
             grid_name AS subName,
             area_marks AS subAreaMarks,
             center_mark AS subCenterMark,
-            'grid' AS type
+            'grid' AS type,
+            '' as agencyLevel
         FROM
             screen_customer_grid
         WHERE
@@ -23,7 +24,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 +38,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/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.74
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.79
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.74</version>
+    <version>0.3.79</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>

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/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -193,12 +193,10 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         List<FactIssueAgencyMonthlyEntity> issueTotal = factIssueAgencyMonthlyService.getIssueIncCountAndTotalByMonthId(formDTO.getCustomerId(), formDTO.getMonthId());
 
         List<GridUserCountResultDTO> userCountList = factRegUserAgencyMonthlyService.selectAgencyUserCount(formDTO.getCustomerId(), formDTO.getMonthId());
-        if (CollectionUtils.isEmpty(issueTotal)) {
-            log.error("抽取【公众参与-人均议题】，获取注册用户数为空");
-            return;
-        }
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
         Set<String> agencyIdSet = new HashSet<>();
+        if (!CollectionUtils.isEmpty(issueTotal)) {
+            log.error("抽取【公众参与-人均议题】，获取注册用户数为空");
             issueTotal.forEach(issue -> {
                 String agencyId = issue.getAgencyId();
                 agencyIdSet.add(agencyId);
@@ -212,7 +210,6 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                     entity.setAvgIssue(avgIssueCount);
                 }
             });
-
             List<List<String>> partition = ListUtils.partition(new ArrayList<>(agencyIdSet), NumConstant.THIRTY);
             partition.forEach(list -> {
                 //获取该月 表决的人数
@@ -241,8 +238,10 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                     for (IssueVoteUserCountResultDTO vote : issueList) {
                         Integer memberCount = orgMemberCount.get(orgId);
                         if (memberCount == null) {
-                        memberCount = 0;
+                            //memberCount = 0;
+                            continue;
                         }
+
                         bigDecimal = bigDecimal.add(new BigDecimal(vote.getVoteCount() / (memberCount * 1.0)));
                     }
                     if (votedByIssueCount.intValue() != 0) {
@@ -250,9 +249,15 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                     }
                 }
             });
+        }
         screenUserJoinService.deleteAndInsertBatch(formDTO, new ArrayList<>(insertMap.values()));
     }
 
+    public static void main(String[] args) {
+        BigDecimal bigDecimal = new BigDecimal(0);
+        bigDecimal = bigDecimal.add(new BigDecimal(0 / (1 * 1.0)));
+    }
+
     private void buildUserJoinEntity(ExtractScreenFormDTO formDTO, Object org, Map<String, ScreenUserJoinEntity> result) {
         DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(DateUtils.stringToDate(formDTO.getMonthId(), DateUtils.DATE_PATTERN_YYYYMM));
         ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(dimIdBean, ScreenUserJoinEntity.class);

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) {
+    public Integer deleteOldPartyBaseInfo(String customerId, List<String> orgIds) {
-        return baseDao.deleteOldPartyBaseInfo(customerId, dateId,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 ">

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -17,11 +17,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 
@@ -52,11 +55,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
     <choose>
@@ -91,11 +97,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 
@@ -131,11 +140,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 
@@ -299,11 +311,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 
@@ -332,11 +347,14 @@
     <choose>
         <!-- 参与用户 -->
         <when test='regOrPartiFlag == "parti"'>
-            AND PARTICIPATION = '1'
+            AND (
+            ( FIRST_REGISTER = '1' AND REGISTER = '1' AND PARTICIPATION = '1' )
+            OR ( FIRST_REGISTER = '0' AND REGISTER = '0' AND PARTICIPATION = '1' )
+            )
         </when>
         <!-- 默认查注册用户 -->
         <otherwise>
-            AND REGISTER = '1'
+            AND FIRST_REGISTER = '1'
         </otherwise>
     </choose>
 

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-prod
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.27
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.28
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.27</version>
+    <version>0.3.28</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-oss</artifactId>

epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.44
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.45
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

epmet-module/gov-access/gov-access-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.44</version>
+    <version>0.3.45</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.57
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.58
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.57</version>
+    <version>0.3.58</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.96
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.97
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.96</version>
+    <version>0.3.97</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -206,4 +206,14 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      **/
     List<OrganizeTreeResultDTO> selectAllSub(@Param("agencyId") String agencyId);
+
+    /**
+     * @param agencyId      组织id
+     * @param operateUserId 当前操作人
+     * @return int
+     * @author yinzuomei
+     * @description
+     * @Date 2020/12/15 10:04
+     **/
+    int delByAgencyId(@Param("agencyId") String agencyId, @Param("operateUserId") String operateUserId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java

@@ -18,12 +18,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerDepartmentDTO;
 import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.result.AgencyDeptList;
 import com.epmet.dto.result.DepartmentListResultDTO;
-import com.epmet.dto.result.SubListResultDTO;
 import com.epmet.entity.CustomerDepartmentEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -93,4 +91,14 @@ public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity>
      * @return void
      */
     void deleteStaffDep(@Param("staffId") String staffId);
+
+    /**
+     * @return int
+     * @param deptId 部门id
+     * @param operateUserId 当前操作人id
+     * @author yinzuomei
+     * @description
+     * @Date 2020/12/15 10:05
+     **/
+    int delDeptById(@Param("deptId")String deptId,@Param("operateUserId") String operateUserId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerAgencyConstant;
@@ -67,7 +68,8 @@ public class AgencyServiceImpl implements AgencyService {
     private StaffServiceImpl staffServiceImpl;
     @Autowired
     private CustomerGridDao customerGridDao;
-
+    @Autowired
+    private LoginUserUtil loginUserUtil;
     /**
      * @param formDTO
      * @return
@@ -199,7 +201,7 @@ public class AgencyServiceImpl implements AgencyService {
             return result;
         }
         //4:删除当前机关组织（逻辑删）
-        if (customerAgencyDao.deleteById(formDTO.getAgencyId()) < NumConstant.ONE) {
+        if (customerAgencyDao.delByAgencyId(formDTO.getAgencyId(),loginUserUtil.getLoginUserId()) < NumConstant.ONE) {
             log.error(CustomerAgencyConstant.DEL_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.DEL_EXCEPTION);
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@@ -21,16 +21,16 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerDepartmentConstant;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerDepartmentDao;
 import com.epmet.dao.CustomerStaffDepartmentDao;
-import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.CustomerDepartmentDTO;
+import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
-import com.epmet.dto.StaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
@@ -49,7 +49,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -73,7 +72,8 @@ public class DepartmentServiceImpl implements DepartmentService {
     private CustomerStaffDepartmentService customerStaffDepartmentService;
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
-
+    @Autowired
+    private LoginUserUtil loginUserUtil;
     /**
      * @param formDTO
      * @return
@@ -139,7 +139,7 @@ public class DepartmentServiceImpl implements DepartmentService {
             return result;
         }
         //2:删除部门信息（逻辑删）
-        if (customerDepartmentDao.deleteById(formDTO.getDepartmentId()) < NumConstant.ONE) {
+        if (customerDepartmentDao.delDeptById(formDTO.getDepartmentId(),loginUserUtil.getLoginUserId()) < NumConstant.ONE) {
             log.error(CustomerDepartmentConstant.DEL_EXCEPTION);
             throw new RenException(CustomerDepartmentConstant.DEL_EXCEPTION);
         }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -381,4 +381,12 @@
     <select id="getAgencyElementTree" resultMap="elementTreeAgency">
         select id,organization_name,customer_id from customer_agency where pid = #{pid} and customer_id = #{customerId}
     </select>
+
+    <update id="delByAgencyId" parameterType="map">
+        update customer_agency
+         set updated_by = #{operateUserId},
+            del_flag = '1',
+            UPDATED_TIME=NOW()
+        where id=#{agencyId}
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -76,4 +76,12 @@
         AND ca.del_flag = '0'
         AND cd.agency_id = #{agencyId}
     </select>
+
+    <update id="delDeptById" parameterType="map">
+        update customer_department
+        set updated_by = #{operateUserId},
+            del_flag = '1',
+            UPDATED_TIME=NOW()
+        where id=#{deptId}
+    </update>
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -194,7 +194,8 @@
         set
             grid_name = #{gridName},
             manage_district = #{manageDistrict},
-            updated_by = #{updatedBy}
+            updated_by = #{updatedBy},
+            UPDATED_TIME=NOW()
         where
             id = #{id}
     </update>
@@ -205,7 +206,8 @@
             customer_grid
         set
             updated_by = #{userId},
-            del_flag = 1
+            del_flag = 1,
+            UPDATED_TIME=NOW()
         where
             id = #{gridId}
     </update>

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java

@@ -54,7 +54,7 @@ public class ResiTopicAttachmentDTO implements Serializable {
 	private String attachmentFormat;
 
     /**
-     * 附件类型（（图片 - figure、 视频 - video、 语音 - voice、 文档 - doc））
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
      */
 	private String attachmentType;
 

epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.76
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.81
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.76</version>
+    <version>0.3.81</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -386,7 +386,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//4、校验是否已经注册居民
 		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
-			logger.error(String.format("用户同意邀请进组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+			logger.warn(String.format("用户通过邀请链接入组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
 			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
 		UserRoleDTO userRoleDTO=this.getUserRoleDTO(result.getData().getUserRoleList());
@@ -480,7 +480,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		//4、校验是否已经注册居民
 		if(null==result.getData().getUserRoleList()||result.getData().getUserRoleList().size()==0){
-			logger.error(String.format("用户同意邀请进组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+			logger.warn(String.format("用户通过扫码入组失败,返回角色列表为空错误编码%s,错误提示%s",EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
 			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
 		//2020.11.17 sun 新增扫描或邀请进组是否需要审核的逻辑  start

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java

@@ -54,7 +54,7 @@ public class ResiTopicAttachmentEntity extends BaseEpmetEntity {
 	private String attachmentFormat;
 
     /**
-     * 附件类型（（图片 - figure、 视频 - video、 语音 - voice、 文档 - doc））
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
      */
 	private String attachmentType;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -315,6 +315,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 attachment.setCreatedBy(tokenDto.getUserId());
                 attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
+                attachment.setAttachmentType("image");
                 resiTopicAttachmentDao.insertOne(attachment);
             }
         }

epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.8__alter_resi_topic_attachment.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `resi_topic_attachment`
+MODIFY COLUMN `ATTACHMENT_TYPE`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））' AFTER `ATTACHMENT_FORMAT`;
+
+UPDATE resi_topic_attachment SET ATTACHMENT_TYPE = 'image';

epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.137
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.138
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.137</version>
+    <version>0.3.138</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>