From c02382f0a401cced2b8a4f0dfbb2e00f7b2b0897 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 09:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyActController.java | 35 ++++++++++++- .../modules/partyOrg/dao/IcPartyActDao.java | 3 ++ .../partyOrg/dao/IcPartyActOrgDao.java | 2 + .../partyOrg/service/IcPartyActService.java | 16 ++++++ .../service/impl/IcPartyActServiceImpl.java | 51 +++++++++++++++++++ .../mapper/partyOrg/IcPartyActDao.xml | 9 ++++ .../mapper/partyOrg/IcPartyActOrgDao.xml | 8 +++ 7 files changed, 122 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index a5c2855bb6..73784ef2ad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -16,6 +16,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,7 +39,7 @@ public class IcPartyActController { private IcPartyActService icPartyActService; /** - * 添加、修改活动 + * 添加、修改活动各端通用 * @param tokenDto * @param formDTO * @return @@ -141,5 +142,35 @@ public class IcPartyActController { formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icPartyActService.homeSearch(formDTO)); } - + + /** + * pc活动列表-发布活动 + * pc党建日历左下角列表，点击发布 + * 工作端小程序点击发布 + * @param tokenDto + * @param icPartyActId + * @return + */ + @PostMapping("publish/{icPartyActId}") + public Result publicshIcPartyAct(@LoginUser TokenDto tokenDto,@PathVariable("icPartyActId")String icPartyActId){ + icPartyActService.publicshIcPartyAct(tokenDto.getUserId(),icPartyActId); + return new Result(); + } + + /** + * pc活动列表-发布活动 + * pc党建日历左下角列表，点击删除 + * pc生成年度记录，删除活动 + * 工作端小程序-详情页面，删除 + * @param tokenDto + * @param icPartyActIds + * @return + */ + @PostMapping("del") + public Result deleteIcPartyAct(@LoginUser TokenDto tokenDto,@RequestBody List icPartyActIds){ + if(CollectionUtils.isNotEmpty(icPartyActIds)){ + icPartyActService.deleteIcPartyAct(tokenDto.getCustomerId(),tokenDto.getUserId(),icPartyActIds); + } + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 5212f9bb34..febc8ec2ba 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -8,6 +8,7 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -37,4 +38,6 @@ public interface IcPartyActDao extends BaseDao { List selectPageList(IcPartyActPageFormDTO formDTO); String selectActTypeName(String actType); + + int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java index 09304e8ecb..9351804f7c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -31,4 +31,6 @@ public interface IcPartyActOrgDao extends BaseDao { * @return */ List selectJoinOrgList(String icPartyActId); + + int updateToDel(@Param("userId") String userId, @Param("icPartyActId") String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 3c4d7a92e0..512c38a99d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -80,4 +80,20 @@ public interface IcPartyActService extends BaseService { * @date 2022/8/19 14:01 */ List homeSearch(ActAndScheduleListFormDTO formDTO); + + /** + * * pc活动列表-发布活动 + * pc党建日历左下角列表，点击发布 + * 工作端小程序点击发布 + * @param userId + * @param icPartyActId + */ + void publicshIcPartyAct(String userId, String icPartyActId); + + /** + * 删除活动 + * @param userId + * @param icPartyActIds + */ + void deleteIcPartyAct(String customerId,String userId, List icPartyActIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index bab46cb4ff..de4d785935 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -497,4 +497,55 @@ public class IcPartyActServiceImpl extends BaseServiceImpl icPartyActIds) { + if(CollectionUtils.isEmpty(icPartyActIds)){ + return; + } + icPartyActIds.forEach(icPartyActId->{ + //删除活动主表和参与活动党组织关系表记录 + baseDao.deleteIcPartyAct(customerId,userId,icPartyActId); + icPartyActOrgDao.updateToDel(userId,icPartyActId); + }); + + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 7587cc4ef6..7ef1aca4d1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -123,4 +123,13 @@ WHERE d.type_key = #{actType} + + + update ic_party_act + set del_flag='1', + UPDATED_BY=#{userId}, + UPDATED_TIME=now() + where customerId=#{customerId} + and id=#{icPartyActId} + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml index ad074e65ef..a639a41a8d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml @@ -26,4 +26,12 @@ o.DEL_FLAG = '0' AND o.IC_PARTY_ACT_ID = #{icPartyActId} + + + update ic_party_act_org + set del_flag='1', + UPDATED_BY=#{userId}, + UPDATED_TIME=now() + where IC_PARTY_ACT_ID=#{icPartyActId} + \ No newline at end of file