党员风采

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

@@ -98,5 +98,9 @@ public class IcPartymemberStyleDTO implements Serializable {
 	private Date updatedTime;
 
     private List<String> imageList;
-
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+    private String categoryId;
 }

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

@@ -22,4 +22,5 @@ public class PartyMemberStyleFormDTO implements Serializable {
     private String mainDeed;
     private Integer pageNo;
     private Integer pageSize;
+    private String categoryId;
 }

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

@@ -0,0 +1,21 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+@Data
+public class StyleSelectListFormDTO implements Serializable {
+
+    public interface AddUserInternalGroup {}
+    @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * query:查询条件用；新增或者编辑：addorupdate
+     */
+    @NotBlank(message = "type不能为空",groups = AddUserInternalGroup.class)
+    private String type;
+}

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

@@ -1,24 +1,22 @@
 package com.epmet.modules.partymember.controller;
 
 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.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.dto.IcPartymemberStyleCategoryDictDTO;
 import com.epmet.modules.partymember.service.IcPartymemberStyleCategoryDictService;
 import com.epmet.resi.partymember.dto.partymember.form.AddStyleCategoryFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.StyleCategoryCommonFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleSelectListFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UpdateStyleCategoryFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.StyleCategoryDictResDTO;
 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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -84,4 +82,20 @@ public class IcPartymemberStyleCategoryDictController {
         return new Result();
     }
 
+    /**
+     * 党员风采-分类下拉框
+     * 查询条件中：展示所有未删除的
+     * 新增活修改党员风采：展示可用的
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("select-list")
+    public Result<List<StyleCategoryDictResDTO>> list(@RequestBody StyleSelectListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, StyleSelectListFormDTO.AddUserInternalGroup.class);
+        return new Result<List<StyleCategoryDictResDTO>>().ok(icPartymemberStyleCategoryDictService.selectList(formDTO));
+    }
+
+
+
 }

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

@@ -100,6 +100,7 @@ public class IcPartymemberStyleController {
                 excel.setGridName(item.getGridName());
                 excel.setName(item.getName());
                 excel.setMainDeed(item.getMainDeed());
+                excel.setCategoryName(item.getCategoryName());
                 return excel;
             }).collect(Collectors.toList());
         }

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

@@ -59,5 +59,6 @@ public class IcPartymemberStyleEntity extends BaseEpmetEntity {
      * 主要事迹
      */
 	private String mainDeed;
-
+	private String categoryId;
+	private String categoryCode;
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartymemberStyleExcel.java

@@ -40,4 +40,7 @@ public class IcPartymemberStyleExcel {
 
     @Excel(name = "主要事迹")
     private String mainDeed;
+
+    @Excel(name="所属分类")
+    private String categoryName;
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartymemberStyleImportExcel.java

@@ -41,4 +41,7 @@ public class IcPartymemberStyleImportExcel extends ExcelVerifyInfo {
 
     @Excel(name = "照片")
     private String imageUrl;
+
+    @Excel(name="所属分类")
+    private String categoryName;
 }

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

@@ -1,15 +1,13 @@
 package com.epmet.modules.partymember.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IcPartymemberStyleCategoryDictDTO;
 import com.epmet.modules.partymember.entity.IcPartymemberStyleCategoryDictEntity;
 import com.epmet.resi.partymember.dto.partymember.form.AddStyleCategoryFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleSelectListFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UpdateStyleCategoryFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.StyleCategoryDictResDTO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 党员风采分类字典表
@@ -44,4 +42,13 @@ public interface IcPartymemberStyleCategoryDictService extends BaseService<IcPar
      * @param formDTO
      */
     void updateStatus(UpdateStyleCategoryFormDTO formDTO);
+
+    /**
+     * 党员风采-分类下拉框
+     * @param formDTO
+     * @return
+     */
+    List<StyleCategoryDictResDTO> selectList(StyleSelectListFormDTO formDTO);
+
+    IcPartymemberStyleCategoryDictEntity get(String categoryId);
 }

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

@@ -11,6 +11,7 @@ import com.epmet.modules.partymember.dao.IcPartymemberStyleDao;
 import com.epmet.modules.partymember.entity.IcPartymemberStyleCategoryDictEntity;
 import com.epmet.modules.partymember.service.IcPartymemberStyleCategoryDictService;
 import com.epmet.resi.partymember.dto.partymember.form.AddStyleCategoryFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.StyleSelectListFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UpdateStyleCategoryFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.StyleCategoryDictResDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -135,4 +136,36 @@ public class IcPartymemberStyleCategoryDictServiceImpl extends BaseServiceImpl<I
         baseDao.update(null, updateWrapper);
     }
 
+    /**
+     * 党员风采-分类下拉框
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public List<StyleCategoryDictResDTO> selectList(StyleSelectListFormDTO formDTO) {
+        LambdaQueryWrapper<IcPartymemberStyleCategoryDictEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(IcPartymemberStyleCategoryDictEntity::getCustomerId, formDTO.getCustomerId());
+        if("addorupdate".equals(formDTO.getType())){
+            //查询可用的
+            queryWrapper.eq(IcPartymemberStyleCategoryDictEntity::getBeDisabled,false);
+        }
+        queryWrapper.orderByAsc(IcPartymemberStyleCategoryDictEntity::getSort);
+        List<IcPartymemberStyleCategoryDictEntity> list = baseDao.selectList(queryWrapper);
+        List<StyleCategoryDictResDTO> resultList = new ArrayList<>();
+        for (IcPartymemberStyleCategoryDictEntity entity : list) {
+            StyleCategoryDictResDTO resDTO = new StyleCategoryDictResDTO();
+            resDTO.setCategoryId(entity.getId());
+            resDTO.setCategoryName(entity.getCategoryName());
+            resDTO.setBeDisabled(entity.getBeDisabled());
+            resultList.add(resDTO);
+        }
+        return resultList;
+    }
+
+    @Override
+    public IcPartymemberStyleCategoryDictEntity get(String categoryId) {
+        return baseDao.selectById(categoryId);
+    }
+
 }

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

@@ -39,9 +39,11 @@ import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.GridOptionFormDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.partymember.dao.IcPartymemberStyleDao;
+import com.epmet.modules.partymember.entity.IcPartymemberStyleCategoryDictEntity;
 import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity;
 import com.epmet.modules.partymember.entity.IcPartymemberStyleImageEntity;
 import com.epmet.modules.partymember.excel.IcPartymemberStyleImportExcel;
+import com.epmet.modules.partymember.service.IcPartymemberStyleCategoryDictService;
 import com.epmet.modules.partymember.service.IcPartymemberStyleImageService;
 import com.epmet.modules.partymember.service.IcPartymemberStyleService;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
@@ -76,6 +78,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
     private IcPartymemberStyleImageService icPartymemberStyleImageService;
     @Resource
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Resource
+    private IcPartymemberStyleCategoryDictService icPartymemberStyleCategoryDictService;
 
     @Override
     public PageData<IcPartymemberStyleDTO> page(Map<String, Object> params) {
@@ -105,6 +109,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                     return;
                 }
                 item.setGridName(gridInfo.getGridName());
+                IcPartymemberStyleCategoryDictEntity dict = icPartymemberStyleCategoryDictService.get(item.getCategoryId());
+                item.setCategoryName(null == dict ? StrConstant.EPMETY_STR : dict.getCategoryName());
             }
         });
 
@@ -188,6 +194,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         wrapper.eq(StringUtils.isNotBlank(formDTO.getGridId()), IcPartymemberStyleEntity::getGridId, formDTO.getGridId());
         wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcPartymemberStyleEntity::getName, formDTO.getName());
         wrapper.like(StringUtils.isNotBlank(formDTO.getMainDeed()), IcPartymemberStyleEntity::getMainDeed, formDTO.getMainDeed());
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getCategoryId()),IcPartymemberStyleEntity::getCategoryId,formDTO.getCategoryId());
         List<IcPartymemberStyleEntity> list = baseDao.selectList(wrapper);
         PageInfo<IcPartymemberStyleEntity> pageInfo = new PageInfo<>(list);
         List<IcPartymemberStyleDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartymemberStyleDTO.class);
@@ -200,6 +207,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                     return;
                 }
                 item.setGridName(gridInfo.getGridName());
+                IcPartymemberStyleCategoryDictEntity dict = icPartymemberStyleCategoryDictService.get(item.getCategoryId());
+                item.setCategoryName(null == dict ? StrConstant.EPMETY_STR : dict.getCategoryName());
             }
         });
         return new PageData<>(dtoList, pageInfo.getTotal());
@@ -265,6 +274,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
             entity.setGridId(gridMap.get(item.getGridName()));
             entity.setName(item.getName());
             entity.setMainDeed(item.getMainDeed());
+
             AtomicInteger i = new AtomicInteger();
             if (StringUtils.isNotBlank(item.getImageUrl())) {
                 Arrays.asList(item.getImageUrl().split(StrConstant.COMMA)).forEach(url -> {