党员活动

huanghongfa

2021-01-25 c6786a51cbeb05d702dbc9068481f707ebd863d6

党员活动

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,15 +24,7 @@
  <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/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" 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" />
@@ -414,7 +406,7 @@
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="94460000" />
      <workItem from="1611365644515" duration="33195000" />
      <workItem from="1611536010905" duration="15792000" />
      <workItem from="1611536010905" duration="17854000" />
    </task>
    <servers />
  </component>
@@ -470,54 +462,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="417" key="GridCell.Tab.0.bottom" timestamp="1611562553204">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom" timestamp="1611562921654">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562553204" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611562553204">
    <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611562921654">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611562553204" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611562553204">
    <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611562921654">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611562553204" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611562553204">
    <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611562921654">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611562553204" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611562552965">
    <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611562921655">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562552965" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611562552965">
    <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611562921655">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611562552965" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611562552965">
    <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611562921654">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611562552965" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611562552965">
    <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611562921654" />
    <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611562921655">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611562552965" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611562552966">
    <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611562921655">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562552966" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611562552965">
    <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611562921655">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611562552965" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611562552965">
    <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611562921655">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611562552965" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611562552965">
    <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611562921655">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611562552965" />
    <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611562921655" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -542,10 +534,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="1611562794722">
    <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611562912861">
      <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="1611562794722" />
    <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611562912861" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -558,10 +550,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog/0.0.1536.824@0.0.1536.824" timestamp="1611462424079" />
    <state x="425" y="187" key="run.anything.popup" timestamp="1608280452280">
    <state x="425" y="187" key="run.anything.popup" timestamp="1611565231827">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1608280452280" />
    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1611565231827" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1611221223000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_dangjian.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -38,5 +36,6 @@
    /**
     * 报名时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -22,6 +23,7 @@
import org.apache.http.client.utils.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
@@ -437,11 +439,26 @@
     * @return 创建结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addActivityApplets(ComPbActivityDTO comPbActivityDTO) {
        ComPbActivityDO comPbActivityDO=new ComPbActivityDO();
        Long createBy = comPbActivityDTO.getCreateBy();
        BeanUtils.copyProperties(comPbActivityDTO,comPbActivityDO);
        int insert = comBpActivityDAO.insert(comPbActivityDO);
        if (insert>0) {
            ComPbActivityDO comPbActivityDO1 = comBpActivityDAO.selectOne(new QueryWrapper<ComPbActivityDO>().lambda().eq(ComPbActivityDO::getName, comPbActivityDTO.getName()).eq(ComPbActivityDO::getCover, comPbActivityDTO.getCover()).last(" order by create_at desc limit 1 "));
            Long comPbActivityDO1Id = comPbActivityDO1.getId();
            ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectByUserId(createBy);
            if (ObjectUtils.isEmpty(comPbMemberDO)) {
                log.error("【{}】不是党员",createBy);
                throw new PartyBuildingMemberException("用户不是党员");
            }
            Long comPbMemberDOId = comPbMemberDO.getId();
            ComPbActivityMemberDO comPbActivityMemberDO=new ComPbActivityMemberDO();
            comPbActivityMemberDO.setMemberId(comPbMemberDOId);
            comPbActivityMemberDO.setActivityId(comPbActivityDO1Id);
            comPbActivityMemberDO.setCreateAt(new Date());
            comPbActivityMemberDAO.insert(comPbActivityMemberDO);
            return R.ok();
        }
        return R.fail();