通知

huanghongfa

2021-01-25 35c4c4461ade290fd2152969d279ac9a5cbacd4a

通知

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,6 +24,8 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
@@ -406,7 +408,7 @@
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="33195000" />
      <workItem from="1611536010905" duration="7459000" />
      <workItem from="1611536010905" duration="10363000" />
    </task>
    <servers />
  </component>
@@ -462,54 +464,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1493" height="196" key="GridCell.Tab.0.bottom" timestamp="1611538940250">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1493" height="196" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611538940250" />
    <state width="1493" height="196" key="GridCell.Tab.0.center" timestamp="1611538940250">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611555202108">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1493" height="196" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611538940250" />
    <state width="1493" height="196" key="GridCell.Tab.0.left" timestamp="1611538940250">
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611555202108" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611555202108">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1493" height="196" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611538940250" />
    <state width="1493" height="196" key="GridCell.Tab.0.right" timestamp="1611538940250">
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611555202108" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1493" height="196" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611538940250" />
    <state width="1031" height="477" key="GridCell.Tab.1.bottom" timestamp="1611537056713">
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611555202108" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611537056713" />
    <state width="1031" height="477" key="GridCell.Tab.1.center" timestamp="1611537056713">
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611537056713" />
    <state width="1031" height="477" key="GridCell.Tab.1.left" timestamp="1611537056713">
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611537056713" />
    <state width="1031" height="477" key="GridCell.Tab.1.right" timestamp="1611537056713">
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611537056713" />
    <state width="1031" height="477" key="GridCell.Tab.2.bottom" timestamp="1611537056713">
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611537056713" />
    <state width="1031" height="477" key="GridCell.Tab.2.center" timestamp="1611537056713">
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611537056713" />
    <state width="1031" height="477" key="GridCell.Tab.2.left" timestamp="1611537056713">
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611537056713" />
    <state width="1031" height="477" key="GridCell.Tab.2.right" timestamp="1611537056713">
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611555202109">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="477" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611537056713" />
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611555202109" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -534,10 +536,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611130640592" />
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611544688304">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611556859678">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611544688304" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611556859678" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -109,7 +109,7 @@
            sysUserNoticeVO.setBusinessType(6);
//            sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
            sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
//            sysUserNoticeVO.setBusinessId(activityId);
//            sysUserNoticeVO.setBusinessId(activityId);R
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(1);
            R r1 = userService.addNotice(sysUserNoticeVO);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -242,4 +243,6 @@
    ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone);
    @Update("update sys_user set face_state=null where user_id=#{userId}")
    int updateFaceState(Long userId);
    @Select("select name from com_act where community_id=#{communityId}")
    ComActVO selectCommunity(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -13,6 +13,7 @@
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.*;
@@ -411,6 +412,8 @@
            });
            loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
        }
        ComActVO comActVO=userDao.selectCommunity(loginUserInfoVO.getCommunityId());
        loginUserInfoVO.setCommunityName(comActVO.getName());
        return R.ok(loginUserInfoVO);
    }