xiangqing

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java

@@ -20,7 +20,11 @@ public class JoinOrgDTO implements Serializable {
      */
     @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class})
     private String joinOrgId;
-
+    /**
+     * 参加党组织名称
+     */
+    @NotBlank(message = "参加党组织名称不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class})
+    private String joinOrgName;
     /**
      * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
      */
@@ -49,5 +53,11 @@ public class JoinOrgDTO implements Serializable {
      * 客户ID
      */
     private String customerId;
+
+    /**
+     * ic_party_act_org.id
+     * 详情接口返回
+     */
+    private String icPartyActOrgRecId;
 }
 

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java

@@ -1,8 +1,14 @@
 package com.epmet.resi.partymember.dto.icpartyact.result;
 
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
+import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.validation.Valid;
 import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Description
@@ -12,5 +18,112 @@ import java.io.Serializable;
 @Data
 public class IcPartyActDetailResDTO implements Serializable {
     private static final long serialVersionUID = -8102085878449811977L;
+    private String customerId;
+
+    private String publishStaffId;
+
+    private String icPartyActId;
+
+    /**
+     * 活动类型，来源于ic_party_act_type_dict
+     */
+    private String actType;
+    private String actTypeName;
+
+    /**
+     * 活动举办时间：yyyy
+     */
+    private String holdYearId;
+
+    /**
+     * 活动举办时间:yyyyMM
+     */
+    private String holdMonthId;
+
+    /**
+     * 举办活动时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date holdTime;
+
+    /**
+     * 活动主题
+     */
+    private String topic;
+
+    /**
+     * 活动地点
+     */
+    private String address;
+
+    /**
+     * 活动地点纬度
+     */
+    private String latitude;
+
+    /**
+     * 活动地点经度
+     */
+    private String longitude;
+
+    /**
+     * 活动开始前几天
+     */
+    private Integer autoPublicType;
+    /**
+     * 发布活动党组织
+     */
+    private String publishPartyOrgId;
+
+    /**
+     * 发布活动党组织名称
+     */
+    private String publishPartyOrgName;
+
+    /**
+     * 发布活动党组织ID的上级节点
+     */
+    private String publishOrgPid;
+
+    /**
+     * 发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组
+     */
+    private String publishOrgType;
+
+    /**
+     * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
+     */
+    private String publishOrgPath;
+
+    /**
+     * 参加人员类型，0：全体党员；1：支部委员
+     */
+    private String joinUserType;
+    private String joinUserTypeName;
+
+
+    /**
+     * 是否自动通知参加人员，0否；1是
+     */
+    private String isAutoInform;
+
+    /**
+     * 活动介绍
+     */
+    private String introduce;
+
+    /**
+     * 参加活动党组织
+     */
+    @Valid
+    private List<JoinOrgDTO> joinOrgList;
+
+    /**
+     * 附件表
+     */
+    private List<FileCommonDTO> attachmentList;
+
+    private Boolean isSignIn;
+
 }
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java

@@ -35,4 +35,6 @@ public interface IcPartyActDao extends BaseDao<IcPartyActEntity> {
      * @return
      */
     List<IcPartyActPageResultDTO> selectPageList(IcPartyActPageFormDTO formDTO);
+
+    String selectActTypeName(String actType);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java

@@ -1,6 +1,7 @@
 package com.epmet.modules.partyOrg.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
 import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,6 @@ public interface ResiPartymemberAttachmentDao extends BaseDao<ResiPartymemberAtt
      * @return
      */
     int deleteByBusinessId(@Param("customerId")String customerId,@Param("businessIds") List<String> businessIds);
+
+    List<FileCommonDTO> selectListByBusinessId(String businessId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java

@@ -75,4 +75,13 @@ public interface IcPartyActSignInRecordService extends BaseService<IcPartyActSig
      * @date 2022-08-18
      */
     void delete(String[] ids);
+
+    /**
+     * 判断该用户是否已经签到
+     * TRUE：已签到
+     * @param icPartyActId
+     * @param userId
+     * @return
+     */
+    Boolean checkSignIn(String icPartyActId, String userId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java

@@ -24,10 +24,7 @@ import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
 import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity;
 import com.epmet.modules.partyOrg.entity.IcScheduleEntity;
 import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity;
-import com.epmet.modules.partyOrg.service.IcPartyActOrgService;
+import com.epmet.modules.partyOrg.service.*;
-import com.epmet.modules.partyOrg.service.IcPartyActService;
-import com.epmet.modules.partyOrg.service.IcPartyOrgService;
-import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO;
@@ -227,8 +224,19 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
      */
     @Override
     public IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId) {
-        //todo
+        IcPartyActEntity icPartyActEntity = baseDao.selectById(icPartyActId);
-        return null;
+        if (null == icPartyActEntity) {
+            String msg = "未找到活动详情";
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
+        }
+        IcPartyActDetailResDTO resDTO=ConvertUtils.sourceToTarget(icPartyActEntity,IcPartyActDetailResDTO.class);
+        resDTO.setIcPartyActId(icPartyActEntity.getId());
+        resDTO.setActTypeName(baseDao.selectActTypeName(icPartyActEntity.getActType()));
+        //参加人员类型，0：全体党员；1：支部委员
+        resDTO.setJoinUserTypeName(NumConstant.ZERO_STR.equals(resDTO.getJoinUserType()) ? "全体党员" : "支部委员");
+        resDTO.setAttachmentList(resiPartymemberAttachmentDao.selectListByBusinessId(icPartyActId));
+        resDTO.setIsSignIn(SpringContextUtils.getBean(IcPartyActSignInRecordService.class).checkSignIn(icPartyActId,userId));
+        return resDTO;
     }
 
     /**

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.modules.partyOrg.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -79,4 +80,22 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl<IcPartyAc
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 判断该用户是否已经签到
+     * TRUE：已签到
+     *
+     * @param icPartyActId
+     * @param userId
+     * @return
+     */
+    @Override
+    public Boolean checkSignIn(String icPartyActId, String userId) {
+        LambdaQueryWrapper<IcPartyActSignInRecordEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyActSignInRecordEntity::getIcPartyActId,icPartyActId).eq(IcPartyActSignInRecordEntity::getEpmetUserId,userId);
+        if(baseDao.selectCount(wrapper)>0){
+            return true;
+        }
+        return false;
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml

@@ -114,4 +114,13 @@
         </if>
         order by a.HOLD_TIME desc
     </select>
+
+    <select id="selectActTypeName" parameterType="java.lang.String">
+        SELECT
+            ifnull( d.type_name, '' ) AS typeName
+        FROM
+            ic_party_act_type_dict d
+        WHERE
+            d.type_key = #{actType}
+    </select>
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml

@@ -31,4 +31,21 @@
             BUSINESS_ID = #{businessId}
         </foreach>
     </delete>
+
+    <select id="selectListByBusinessId" parameterType="java.lang.String" resultType="com.epmet.commons.tools.dto.form.FileCommonDTO">
+        SELECT
+            a.ID,
+            a.`NAME`,
+            a.URL,
+            a.TYPE,
+            a.FORMAT,
+            a.DURATION
+        FROM
+            resi_partymember_attachment a
+        WHERE
+            a.DEL_FLAG = '0'
+          AND a.BUSINESS_ID = #{businessId}
+        ORDER BY
+            a.SORT ASC
+    </select>
 </mapper>