isPublish

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

@@ -135,7 +135,7 @@ public class IcPartyActDTO implements Serializable {
     /**
      * 是否发布，0未发布；1已发布；
      */
-	private String isPublic;
+	private String isPublish;
 
     /**
      * 活动发布人

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

@@ -0,0 +1,17 @@
+package com.epmet.resi.partymember.dto.icpartyact;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/8/18 18:45
+ */
+@Data
+public class IcPartActTypeDTO {
+    private String label;
+    private String value;
+    private Integer yearCount;
+    private String frequencyDesc;
+}
+

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java

@@ -1,19 +1,16 @@
 package com.epmet.modules.partyOrg.controller;
 
-import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.partyOrg.service.IcPartyActService;
-import com.epmet.resi.partymember.dto.IcPartyActDTO;
+import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
+import java.util.List;
 
 
 /**
@@ -29,43 +26,16 @@ public class IcPartyActController {
     @Autowired
     private IcPartyActService icPartyActService;
 
-    @RequestMapping("page")
+    /**
-    public Result<PageData<IcPartyActDTO>> page(@RequestParam Map<String, Object> params){
+     * 活动类型
-        PageData<IcPartyActDTO> page = icPartyActService.page(params);
+     * @param tokenDto
-        return new Result<PageData<IcPartyActDTO>>().ok(page);
+     * @return
-    }
+     */
-
+    @PostMapping("/acttypelist")
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public com.epmet.commons.tools.utils.Result<List<IcPartActTypeDTO>> actTypeList(@LoginUser TokenDto tokenDto){
-    public Result<IcPartyActDTO> get(@PathVariable("id") String id){
+        List<IcPartActTypeDTO> list=icPartyActService.actTypeList(tokenDto.getCustomerId());
-        IcPartyActDTO data = icPartyActService.get(id);
+        return new Result<List<IcPartActTypeDTO>>().ok(list);
-        return new Result<IcPartyActDTO>().ok(data);
+   }
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("save")
-    public Result save(@RequestBody IcPartyActDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icPartyActService.save(dto);
-        return new Result();
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("update")
-    public Result update(@RequestBody IcPartyActDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icPartyActService.update(dto);
-        return new Result();
-    }
-
-    @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icPartyActService.delete(ids);
-        return new Result();
-    }
 
 //    @PostMapping("homeMonthTotal")
 //    public Result

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

@@ -2,8 +2,11 @@ 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.IcPartActTypeDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 党建组织活动
  *
@@ -12,5 +15,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcPartyActDao extends BaseDao<IcPartyActEntity> {
-	
+
+    /**
+     * 活动类型列表
+     * @param customerId
+     * @return
+     */
+    List<IcPartActTypeDTO> actTypeList(String customerId);
 }

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

@@ -62,12 +62,12 @@ public class IcPartyActEntity extends BaseEpmetEntity {
 	private String publishOrgType;
 
     /**
-     * PARTY_ORG_ID的全路径，包含自身。方便前端回显
+     * PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显
      */
 	private String publishOrgPath;
 
     /**
-     * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动；
+     * 活动类型，来源于ic_party_act_type_dict
      */
 	private String actType;
 
@@ -134,7 +134,7 @@ public class IcPartyActEntity extends BaseEpmetEntity {
     /**
      * 是否发布，0未发布；1已发布；
      */
-	private String isPublic;
+	private String isPublish;
 
     /**
      * 活动发布人

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

@@ -1,12 +1,10 @@
 package com.epmet.modules.partyOrg.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
-import com.epmet.resi.partymember.dto.IcPartyActDTO;
+import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 党建组织活动
@@ -17,62 +15,9 @@ import java.util.Map;
 public interface IcPartyActService extends BaseService<IcPartyActEntity> {
 
     /**
-     * 默认分页
+     * 活动类型列表
-     *
+     * @param customerId
-     * @param params
+     * @return
-     * @return PageData<IcPartyActDTO>
-     * @author generator
-     * @date 2022-08-18
      */
-    PageData<IcPartyActDTO> page(Map<String, Object> params);
+    List<IcPartActTypeDTO> actTypeList(String customerId);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IcPartyActDTO>
-     * @author generator
-     * @date 2022-08-18
-     */
-    List<IcPartyActDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IcPartyActDTO
-     * @author generator
-     * @date 2022-08-18
-     */
-    IcPartyActDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-08-18
-     */
-    void save(IcPartyActDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-08-18
-     */
-    void update(IcPartyActDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2022-08-18
-     */
-    void delete(String[] ids);
 }

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

@@ -1,22 +1,15 @@
 package com.epmet.modules.partyOrg.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.Constant;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.modules.partyOrg.dao.IcPartyActDao;
 import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
 import com.epmet.modules.partyOrg.service.IcPartyActService;
-import com.epmet.resi.partymember.dto.IcPartyActDTO;
+import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 党建组织活动
@@ -27,56 +20,22 @@ import java.util.Map;
 @Service
 public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPartyActEntity> implements IcPartyActService {
 
-    @Override
-    public PageData<IcPartyActDTO> page(Map<String, Object> params) {
-        IPage<IcPartyActEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IcPartyActDTO.class);
-    }
 
+    /**
+     * 活动类型列表
+     *
+     * @param customerId
+     * @return
+     */
     @Override
-    public List<IcPartyActDTO> list(Map<String, Object> params) {
+    public List<IcPartActTypeDTO> actTypeList(String customerId) {
-        List<IcPartyActEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<IcPartActTypeDTO> list= baseDao.actTypeList(customerId);
-
+        if(CollectionUtils.isEmpty(list)){
-        return ConvertUtils.sourceToTarget(entityList, IcPartyActDTO.class);
+            return baseDao.actTypeList(Constant.DEFAULT_CUSTOMER);
+        }
+        return list;
     }
 
-    private QueryWrapper<IcPartyActEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IcPartyActEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IcPartyActDTO get(String id) {
-        IcPartyActEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IcPartyActDTO.class);
-    }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IcPartyActDTO dto) {
-        IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IcPartyActDTO dto) {
-        IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
 
 }

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

@@ -3,4 +3,18 @@
 
 <mapper namespace="com.epmet.modules.partyOrg.dao.IcPartyActDao">
 
+    <select id="actTypeList" parameterType="java.lang.String" resultType="com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO">
+        SELECT
+            d.TYPE_KEY as value,
+            d.TYPE_NAME as label,
+            d.FREQUENCY_DESC as frequencyDesc,
+            d.YEAR_COUNT as yearCount
+        FROM
+            ic_party_act_type_dict d
+        WHERE
+            d.DEL_FLAG = '0'
+          AND d.CUSTOMER_ID = #{customerId}
+        ORDER BY
+            d.SORT ASC
+    </select>
 </mapper>