一起议地址

huanghongfa

2021-01-28 1f1ad24ae5ece62f88b7b31c05a874ba1d07abcb

一起议地址

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,7 +24,12 @@
  <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$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -409,7 +414,7 @@
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="33195000" />
      <workItem from="1611536010905" duration="21843000" />
      <workItem from="1611622682269" duration="43110000" />
      <workItem from="1611622682269" duration="46073000" />
    </task>
    <servers />
  </component>
@@ -469,54 +474,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="1031" height="488" key="GridCell.Tab.0.bottom" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.0.bottom" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.0.center" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.0.center" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.0.left" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.0.left" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.0.right" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.0.right" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.1.bottom" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.1.bottom" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.1.center" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.1.center" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.1.left" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.1.left" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.1.right" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.1.right" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.2.bottom" timestamp="1611735612424">
    <state width="1031" height="488" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.2.bottom" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611735612424" />
    <state width="1031" height="488" key="GridCell.Tab.2.center" timestamp="1611735612424">
    <state width="1031" height="488" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.2.center" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611735612424" />
    <state width="1031" height="488" key="GridCell.Tab.2.left" timestamp="1611735612423">
    <state width="1031" height="488" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.2.left" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" />
    <state width="1031" height="488" key="GridCell.Tab.2.right" timestamp="1611735612424">
    <state width="1031" height="488" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state width="1031" height="488" key="GridCell.Tab.2.right" timestamp="1611810996568">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="488" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611735612424" />
    <state width="1031" height="488" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611810996568" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

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

@@ -50,6 +50,8 @@
        String address = comActDiscussDTO.getAddress();
        if (ObjectUtils.isEmpty(address)) {
            return R.fail("地址不能为空");
        }else if(address.contains("null")){
            comActDiscussDTO.setAddress(null);
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -142,5 +142,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date singDate;

    @ApiModelProperty("党员活动是否个人发布  1 是 0 否")
    private Integer isPerson;


}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java

@@ -96,7 +96,7 @@
            "SELECT\n" +
            "d.id,\n" +
            "d.vote_title,\n" +
            "d.address,\n" +
            "if(d.address is null or d.address='null',a.name,d.address )address,\n" +
            "d.photo_pah,\n" +
            "d.`discuss_subject`,\n" +
            "d.type,\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.service_dangjian.model.dos.ComPbActivityMemberDO;
@@ -66,4 +67,6 @@
    List<Long> selectAllPartyBuildingActivityMembers(Long id);
    @Select("select m.id from sys_user u join com_pb_member m on u.id_card=m.id_card and u.community_id=#{communityId} and u.user_id=#{userId} ")
    Long selectMemberIdByUserId(@Param("userId") Long userId, @Param("communityId") Long communityId);
    @Select("select type from sys_user where user_id=#{createBy}")
    LoginUserInfoVO selectUserInfo(Long createBy);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java

@@ -293,6 +293,14 @@

        comPbActivityDOS.forEach(comPbActivityDO -> {
            ComActActivityVO comActActivityVO = new ComActActivityVO();
            Long createBy = comPbActivityDO.getCreateBy();
            LoginUserInfoVO loginUserInfoVO=comPbActivityMemberDAO.selectUserInfo(createBy);
            Integer type = loginUserInfoVO.getType();
            if (type==1) {
                comActActivityVO.setIsPerson(1);
            }else{
                comActActivityVO.setIsPerson(0);
            }
            Integer status = comPbActivityDO.getStatus();
            if (status.intValue()==3) {
                status=4;