组织类型管理

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VactOrgTypeDao.java

@@ -19,8 +19,12 @@ package com.elink.esua.epdc.modules.volunteer.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VactOrgTypeEntity;
+import com.elink.esua.epdc.volunteer.VactOrgTypeDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 志愿活动组织类型
  *
@@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface VactOrgTypeDao extends BaseDao<VactOrgTypeEntity> {
-	
+
+    List<VactOrgTypeDTO> getPageList(Map<String, Object> params);
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactOrgTypeServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.modules.volunteer.dao.VactOrgTypeDao;
@@ -51,11 +52,9 @@ public class VactOrgTypeServiceImpl extends BaseServiceImpl<VactOrgTypeDao, Vact
 
     @Override
     public PageData<VactOrgTypeDTO> page(Map<String, Object> params) {
-        IPage<VactOrgTypeEntity> page = baseDao.selectPage(
+        IPage<VactOrgTypeDTO> page = getPage(params);
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        List<VactOrgTypeDTO> list = baseDao.getPageList(params);
-                getWrapper(params)
+        return new PageData<>(list, page.getTotal());
-        );
-        return getPageData(page, VactOrgTypeDTO.class);
     }
 
     @Override
@@ -83,13 +82,36 @@ public class VactOrgTypeServiceImpl extends BaseServiceImpl<VactOrgTypeDao, Vact
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(VactOrgTypeDTO dto) {
+        String typeName = dto.getTypeName();
+        if (StringUtils.isNotBlank(typeName)) {
+            if (getCodeCount(dto) > 0) {
+                throw new RenException("您输入的名称已存在");
+            }
+        }
         VactOrgTypeEntity entity = ConvertUtils.sourceToTarget(dto, VactOrgTypeEntity.class);
         insert(entity);
     }
 
+    public Integer getCodeCount(VactOrgTypeDTO dto) {
+        QueryWrapper<VactOrgTypeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("type_name", dto.getTypeName());
+        wrapper.eq("del_flag", "0");
+        return baseDao.selectCount(wrapper);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(VactOrgTypeDTO dto) {
+        String typeName = dto.getTypeName();
+        QueryWrapper<VactOrgTypeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("type_name", dto.getTypeName());
+        wrapper.eq("del_flag", "0");
+        wrapper.ne("id", dto.getId());
+        if (StringUtils.isNotBlank(typeName)) {
+            if (baseDao.selectCount(wrapper) > 0) {
+                throw new RenException("您输入的名称已存在");
+            }
+        }
         VactOrgTypeEntity entity = ConvertUtils.sourceToTarget(dto, VactOrgTypeEntity.class);
         updateById(entity);
     }

epdc-cloud-heart/src/main/resources/mapper/volunteer/VactOrgTypeDao.xml

@@ -15,6 +15,11 @@
         <result property="updater" column="updater"/>
         <result property="updateDate" column="update_date"/>
     </resultMap>
+    <select id="getPageList" resultType="com.elink.esua.epdc.volunteer.VactOrgTypeDTO">
+        select * from epdc_vact_org_type
+        where del_flag='0'
+        order by create_date desc
+    </select>
 
 
 </mapper>