Merge branch 'dev_1118' into dev_youhua

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -204,7 +204,7 @@ public class SysDeptController {
      * @author qushutong
      * @date 2019/12/13 15:25
      */
-    @GetMapping("getDeptTree")
+    @GetMapping("party/getDeptTree")
     public Result<DeptOption> getDeptTree(){
         return sysDeptService.getDeptTree();
     }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -119,7 +119,7 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
     List<SysDeptEntity> selectListHeadDeptNode(@Param("dataScopeDeptList") List<Long> dataScopeDeptList);
 
     /**
-     * s
+     * 通过数据权限和上级机构列表查询下级机构id列表
      *
      * @param dataScopeDeptList
      * @param parentDeptIdList
@@ -139,8 +139,6 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
     List<UserSysDeptInfoResultDTO> selectListUserSysDeptInfo(UserSysDeptInfoFormDTO formDTO);
 
 
-
-
     /**
      * @author: qushutong
      * @Date: 2019/12/13 14:17

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -423,7 +423,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         // 用于存放 每次组装好的 某一级节点。页面只需展示三级，所以没有存放顶级节点（市区）
         List<JSONArray> cache = Lists.newArrayList();
         Map<String, Object> object;
-        while (CollUtil.isNotEmpty(dataScopeDeptList)) {
+        while (CollUtil.isNotEmpty(dataScopeDeptList) && CollUtil.isNotEmpty(parentDeptIdList)) {
             // 通过上级节点组装所有下级节点
             object = this.packageChildrenNodeArray(parentNodeArray, dataScopeDeptList, parentDeptIdList);
 
@@ -561,7 +561,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     }
 
 
-
     List<DeptTreeDTO> getOtherDept(List<DeptTreeDTO> deptList, JSONArray parent) {
         List<Long> already = Lists.newArrayList();
         for (int i = 0; i < parent.size(); i++) {

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/GroupFeignClient.java

@@ -12,6 +12,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -215,5 +216,5 @@ public interface GroupFeignClient {
      * @since 2019/11/21 10:35
      */
     @PostMapping(value = "group/epdc-app/group/joinPartyGroup", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result joinGridPartyGroup(GroupUserFormDTO formDto);
+    Result joinGridPartyGroup(@RequestBody GroupUserFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -30,6 +30,7 @@ import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
 import com.elink.esua.epdc.enums.*;
 import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.GroupFeignClient;
 import com.elink.esua.epdc.feign.OssFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.jwt.JwtTokenProperties;
@@ -96,6 +97,9 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private GroupTask groupTask;
 
+    @Autowired
+    private GroupFeignClient groupFeignClient;
+
     //private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png";
     private static String USER_FACE = "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png";
 
@@ -296,7 +300,7 @@ public class AppUserServiceImpl implements AppUserService {
         EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value());
 
         // 网格长加入网格党员群并设置为群主
-        this.joinGridPartyGroup(newAppUser, NumConstant.ONE_STR);
+        this.joinGridPartyGroup(newAppUser, newAppUser.getGridId(), NumConstant.ONE_STR);
 
         return new Result().ok(authorization);
     }
@@ -724,7 +728,7 @@ public class AppUserServiceImpl implements AppUserService {
             registeredUser = userResult.getUserDTO();
             // 用户已认证为党员，绑定网格时加入该网格党员群
             if (NumConstant.ONE_STR.equals(registeredUser.getPartyFlag())) {
-                this.joinGridPartyGroup(registeredUser, NumConstant.ZERO_STR);
+                this.joinGridPartyGroup(registeredUser, userResult.getGridId(), NumConstant.ZERO_STR);
             }
         }
 
@@ -828,10 +832,11 @@ public class AppUserServiceImpl implements AppUserService {
             formDto.setNickname(user.getNickname());
             formDto.setUserAvatar(user.getFaceImg());
             formDto.setMobile(user.getMobile());
-            formDto.setDeptId(user.getGridId());
+            formDto.setDeptId(user.getDeptId());
             formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
 
-            groupTask.updateUserPartyMember(formDto);
+            groupFeignClient.updateUserPartyMember(formDto);
+//            groupTask.updateUserPartyMember(formDto);
         }
 
         return new Result().ok(authorizationDto);
@@ -1006,7 +1011,7 @@ public class AppUserServiceImpl implements AppUserService {
      * @author liuchuang
      * @since 2019/11/21 10:58
      */
-    private void joinGridPartyGroup(UserDTO userDto, String lordFlag) {
+    private void joinGridPartyGroup(UserDTO userDto, Long gridId, String lordFlag) {
         GroupUserFormDTO formDto = new GroupUserFormDTO();
         formDto.setUserId(userDto.getId());
         formDto.setNickname(userDto.getNickname());
@@ -1015,8 +1020,9 @@ public class AppUserServiceImpl implements AppUserService {
         formDto.setPartyMember(userDto.getPartyFlag());
         formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
         formDto.setLordFlag(lordFlag);
-        formDto.setGridId(userDto.getGridId());
-        groupTask.joinGridPartyGroup(formDto);
+        formDto.setGridId(gridId);
+        groupFeignClient.joinGridPartyGroup(formDto);
+//        groupTask.joinGridPartyGroup(formDto);
     }
 
     @Override

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -611,6 +611,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     //修改通知部门Id（街道Id）
                     ItemInformationEntity itemInfoStreetDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoStreetDto);
+                    itemInfoStreetDto.setId(null);
                     Result<CompleteDeptDTO>  result =adminFeignClient.getCompleteDept(entity.getGridId());
                     CompleteDeptDTO comDeptDto = result.getData();
                     itemInfoStreetDto.setDeptId(comDeptDto.getStreetId().toString());
@@ -635,6 +636,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     // 通知部门Id（被吹哨部门）
                     ItemInformationEntity itemInfoEachDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto);
+                    itemInfoEachDto.setId(null);
                     itemInfoEachDto.setDeptId(itemDto.getDeptId().toString());
                     itemInformationService.insert(itemInfoEachDto);
                 }
@@ -647,6 +649,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     // 通知部门Id（被吹哨部门）
                     ItemInformationEntity itemInfoEachDto = new ItemInformationEntity();
                     BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto);
+                    itemInfoEachDto.setId(null);
                     itemInfoEachDto.setDeptId(itemDeptId.toString());
                     itemInformationService.insert(itemInfoEachDto);
                 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -401,23 +401,21 @@
                 <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
                     #{deptId}
                 </foreach>
-            </if>
-                 ) temp
-            )
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
         <if test="gridId != null and gridId != ''">
-                AND (item.GRID_ID = #{gridId}
-                OR find_in_set(#{gridId},item.ALL_DEPT_IDS))
+            AND dept.DEPT_ID = #{gridId}
         </if>
         <if test="streetId != null and streetId != ''">
-                AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS)
-                OR find_in_set(#{streetId},item.ALL_DEPT_IDS))
+            AND dept.DEPT_ID = #{streetId}
         </if>
         <if test="communityId != null and communityId != ''">
-                AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS)
-                OR find_in_set(#{communityId},item.ALL_DEPT_IDS))
+            AND dept.DEPT_ID = #{communityId}
+        </if>
+
+                 ) temp
+            )
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </if>
         <if test="itemCode != null and itemCode != ''">
             AND item.ITEM_CODE like concat('%', #{itemCode}, '%')

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -32,6 +33,7 @@ public class GroupSettingStateDTO implements Serializable {
     /**
      * 处理意见
      */
+    @Size(min = 0, max = 500, message = "处理意见在500字以内")
     private String processingOpinions;
 
     /**

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/TopicAuditRecordResultDTO.java

@@ -24,7 +24,7 @@ public class TopicAuditRecordResultDTO implements Serializable {
     /**
      * 处理意见
      */
-    private String processionOpinions;
+    private String processingOpinions;
 
     /**
      * 审核时间

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@@ -147,10 +147,7 @@
             ugp1.NICKNAME,
             ugp2.LORD_FLAG,
             COUNT( DISTINCT tp.ID ) AS topicNum,
-        CASE
-                WHEN SUM( tp.STATE = 10 OR tp.STATE = 15 ) IS NULL THEN
-                0 ELSE SUM( tp.STATE = 10 OR tp.STATE = 15 )
-            END AS changeToIssueNum
+            COUNT( DISTINCT tp1.ID ) AS changeToIssueNum
         FROM
             epdc_group gp
             LEFT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID
@@ -166,6 +163,9 @@
             AND ugp2.USER_ID = #{userId}
             LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID
             AND tp.DEL_FLAG = '0'
+            LEFT JOIN epdc_topic tp1 ON gp.ID = tp1.GROUP_ID
+            AND tp1.DEL_FLAG = '0'
+			AND (tp1.STATE = 10 OR tp1.STATE = 15)
         WHERE
             gp.DEL_FLAG = '0'
             AND gp.ID = #{id}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -544,7 +544,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 authenticationFailedEntity.setRegistTime(oldEntity.getRegisterTime());
                 partyAuthenticationFailedDao.insert(authenticationFailedEntity);
 
-                userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
+                userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
                 userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否，1-是)  认证失败：0
                 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
             } else {
@@ -597,6 +597,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId());
         userDto.setLeaderFlag(relationInfo.getLeaderFlag());
+        userDto.setFaceImg(oldEntity.getFaceImg());
         return new Result().ok(userDto);
     }
 
@@ -702,7 +703,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         // 查询认证失败的党员
         if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.value().equals(authenticatedFlag)) {
-            state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value();
+            state = AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value();
             workUserFromDto.setAuthenticatedFlag(state);
             workUserFromDto.setPartyFlag(YesOrNoEnum.NO.value());
             List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectPartyAuthenticationFailedList(workUserFromDto);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -330,7 +330,7 @@
         LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
         WHERE u.DEL_FLAG = '0'
         AND ug.DEL_FLAG = '0'
-        <if test="partyFlag ='0' and authenticatedFlag ='2'">
+        <if test="partyFlag ='0' and authenticatedFlag ='1'">
             and EXISTS(select m.USER_ID
             from epdc_party_authentication_failed m
             where m.USER_ID=u.id)