年度计划查询

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java

@@ -0,0 +1,77 @@
+package com.epmet.resi.partymember.dto.partyOrg;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党组织活动类型字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-22
+ */
+@Data
+public class IcPartyActTypeDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 活动类型key
+     */
+	private String typeKey;
+
+    /**
+     * 活动名称
+     */
+	private String typeName;
+
+    /**
+     * 每年几次
+     */
+	private Integer yearCount;
+
+    /**
+     * 频次单位
+     */
+	private String frequencyUnit;
+
+    /**
+     * 频次数量
+     */
+	private Integer frequencyCount;
+
+    /**
+     * 频率描述
+     */
+	private String frequencyDesc;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 0未删除；1：已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    private String label;
+    private String value;
+
+}

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

@@ -3,8 +3,8 @@ package com.epmet.modules.partyOrg.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
 import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
-import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
+import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -26,7 +26,7 @@ public interface IcPartyActDao extends BaseDao<IcPartyActEntity> {
      * @param customerId
      * @return
      */
-    List<IcPartActTypeDTO> actTypeList(String customerId);
+    List<IcPartyActTypeDictDTO> actTypeList(String customerId);
 
     List<ActAndScheduleListResultDTO.ActivityListDTO> getActivityList(ActAndScheduleListFormDTO formDTO);
 

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

@@ -0,0 +1,16 @@
+package com.epmet.modules.partyOrg.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党组织活动类型字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-22
+ */
+@Mapper
+public interface IcPartyActTypeDictDao extends BaseDao<IcPartyActTypeDictEntity> {
+	
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java

@@ -0,0 +1,64 @@
+package com.epmet.modules.partyOrg.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党组织活动类型字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_act_type_dict")
+public class IcPartyActTypeDictEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 活动类型key
+     */
+	private String typeKey;
+
+    /**
+     * 活动名称
+     */
+	private String typeName;
+
+    /**
+     * 每年几次
+     */
+	private Integer yearCount;
+
+    /**
+     * 频次单位
+     */
+	private String frequencyUnit;
+
+    /**
+     * 频次数量
+     */
+	private Integer frequencyCount;
+
+    /**
+     * 频率描述
+     */
+	private String frequencyDesc;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}

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

@@ -0,0 +1,14 @@
+package com.epmet.modules.partyOrg.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity;
+
+/**
+ * 党组织活动类型字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-22
+ */
+public interface IcPartyActTypeDictService extends BaseService<IcPartyActTypeDictEntity> {
+
+}

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

@@ -1,6 +1,7 @@
 package com.epmet.modules.partyOrg.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
@@ -21,10 +22,7 @@ import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.partyOrg.dao.*;
-import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
+import com.epmet.modules.partyOrg.entity.*;
-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.*;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
@@ -33,6 +31,7 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
+import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
@@ -77,6 +76,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
     private ResiPartymemberAttachmentDao resiPartymemberAttachmentDao;
     @Autowired
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
+    @Autowired
+    private IcPartyActTypeDictService partyActTypeDictService;
     /**
      * 活动类型列表
      *
@@ -84,12 +85,20 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<IcPartActTypeDTO> actTypeList(String customerId) {
-        List<IcPartActTypeDTO> list= baseDao.actTypeList(customerId);
+        List<IcPartyActTypeDictDTO> list= baseDao.actTypeList(customerId);
         if(CollectionUtils.isEmpty(list)){
-            return baseDao.actTypeList(Constant.DEFAULT_CUSTOMER);
+            List<IcPartyActTypeDictDTO> icPartActTypeDTOS = baseDao.actTypeList(Constant.DEFAULT_CUSTOMER);
+            List<IcPartyActTypeDictEntity> entities = ConvertUtils.sourceToTarget(icPartActTypeDTOS, IcPartyActTypeDictEntity.class);
+            entities.forEach(e -> {
+                e.setId(IdWorker.getIdStr());
+                e.setCustomerId(customerId);
+            });
+            partyActTypeDictService.insertBatch(entities);
+            list = icPartActTypeDTOS;
         }
-        return list;
+        return ConvertUtils.sourceToTarget(list,IcPartActTypeDTO.class);
     }
 
 
@@ -347,13 +356,19 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         secondForm.setSearchType("yearSearch");
         disposeActAndScheduleListFormDTO(secondForm);
         List<ActAndScheduleListResultDTO.ActivityListDTO> activityList = baseDao.getActivityList(secondForm);
+        List<IcPartActTypeDTO> activityTypeList = actTypeList(formDTO.getCustomerId());
         List<YearSearchResultDTO> result = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(activityList)) {
             disposeActivityList(secondForm, activityList);
             Map<String, List<ActAndScheduleListResultDTO.ActivityListDTO>> groupByType = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getType));
             groupByType.forEach((type,list) -> {
                 YearSearchResultDTO dto = new YearSearchResultDTO();
-                dto.setType(type);
+                activityTypeList.forEach(at -> {
+                    if (at.getValue().equals(type)){
+                        dto.setType(at.getLabel());
+                        dto.setFrequency(at.getFrequencyDesc());
+                    }
+                });
                 dto.setActivityList(ConvertUtils.sourceToTarget(list, YearSearchResultDTO.YearSearchActivityListDTO.class));
                 result.add(dto);
             });

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

@@ -0,0 +1,18 @@
+package com.epmet.modules.partyOrg.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.partyOrg.dao.IcPartyActTypeDictDao;
+import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity;
+import com.epmet.modules.partyOrg.service.IcPartyActTypeDictService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 党组织活动类型字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-22
+ */
+@Service
+public class IcPartyActTypeDictServiceImpl extends BaseServiceImpl<IcPartyActTypeDictDao, IcPartyActTypeDictEntity> implements IcPartyActTypeDictService {
+
+}

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

@@ -3,12 +3,11 @@
 
 <mapper namespace="com.epmet.modules.partyOrg.dao.IcPartyActDao">
 
-    <select id="actTypeList" parameterType="java.lang.String" resultType="com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO">
+    <select id="actTypeList" parameterType="java.lang.String" resultType="com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO">
         SELECT
             d.TYPE_KEY as value,
             d.TYPE_NAME as label,
-            d.FREQUENCY_DESC as frequencyDesc,
+            d.*
-            d.YEAR_COUNT as yearCount
         FROM
             ic_party_act_type_dict d
         WHERE

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.modules.partyOrg.dao.IcPartyActTypeDictDao">
+
+</mapper>