del

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DelMatterFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/22 11:11 上午
+ * @DESC
+ */
+@Data
+public class DelMatterFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -5351894549285626126L;
+
+    public interface DelMatterForm{}
+
+    /**
+     * 事项ID
+     */
+    @NotBlank(message = "matterId不能为空",groups = DelMatterForm.class)
+    private String matterId;
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java

@@ -29,6 +29,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcPartyServiceCenterDTO;
 import com.epmet.dto.form.AddPartyServiceCenterFormDTO;
+import com.epmet.dto.form.DelMatterFormDTO;
 import com.epmet.dto.form.EditPartyServiceCenterFormDTO;
 import com.epmet.excel.IcPartyServiceCenterExcel;
 import com.epmet.service.IcPartyServiceCenterService;
@@ -123,4 +124,16 @@ public class IcPartyServiceCenterController {
         return new Result();
     }
 
+    /**
+     * @Description  事项删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/22 1:25 下午
+     */
+    @PostMapping("delmatter")
+    public Result delMatter(@RequestBody DelMatterFormDTO formDTO){
+        icPartyServiceCenterService.delMatter(formDTO);
+        return new Result();
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcPartyServiceCenterDTO;
 import com.epmet.dto.form.AddPartyServiceCenterFormDTO;
+import com.epmet.dto.form.DelMatterFormDTO;
 import com.epmet.dto.form.EditPartyServiceCenterFormDTO;
 import com.epmet.entity.IcPartyServiceCenterEntity;
 
@@ -114,4 +115,12 @@ public interface IcPartyServiceCenterService extends BaseService<IcPartyServiceC
      */
     void editPartyServiceCenter(EditPartyServiceCenterFormDTO formDTO,TokenDto tokenDto);
 
+    /**
+     * @Description  事项删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/22 1:25 下午
+     */
+    void delMatter(DelMatterFormDTO formDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@@ -34,10 +34,13 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.PartyServiceCenterConstant;
+import com.epmet.dao.IcMatterAppointmentRecordDao;
 import com.epmet.dao.IcPartyServiceCenterDao;
 import com.epmet.dto.IcPartyServiceCenterDTO;
 import com.epmet.dto.form.AddPartyServiceCenterFormDTO;
+import com.epmet.dto.form.DelMatterFormDTO;
 import com.epmet.dto.form.EditPartyServiceCenterFormDTO;
+import com.epmet.entity.IcMatterAppointmentRecordEntity;
 import com.epmet.entity.IcPartyServiceCenterEntity;
 import com.epmet.entity.IcPartyServiceCenterMatterEntity;
 import com.epmet.service.IcPartyServiceCenterMatterService;
@@ -48,6 +51,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -63,6 +67,8 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
 
     @Autowired
     private IcPartyServiceCenterMatterService matterService;
+    @Autowired
+    private IcMatterAppointmentRecordDao matterAppointmentRecordDao;
 
     @Override
     public PageData<IcPartyServiceCenterDTO> page(Map<String, Object> params) {
@@ -161,6 +167,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
 
     /**
      * @Description  修改党群服务中心
+     * 事项只准删除，不准修改
      * @param formDTO
      * @param tokenDto
      * @author zxc
@@ -180,7 +187,6 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         IcPartyServiceCenterEntity centerEntity = ConvertUtils.sourceToTarget(formDTO, IcPartyServiceCenterEntity.class);
         centerEntity.setId(formDTO.getPartyServiceCenterId());
         baseDao.updateById(centerEntity);
-        matterService.deleteMattersByPartyServiceCenterId(formDTO.getPartyServiceCenterId());
         if (CollectionUtils.isNotEmpty(formDTO.getMatterList())){
             List<IcPartyServiceCenterMatterEntity> matters = ConvertUtils.sourceToTarget(formDTO.getMatterList(), IcPartyServiceCenterMatterEntity.class);
             matters.forEach(m -> {
@@ -191,4 +197,23 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         }
     }
 
+    /**
+     * @Description  事项删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/11/22 1:25 下午
+     */
+    @Override
+    public void delMatter(DelMatterFormDTO formDTO) {
+        LambdaQueryWrapper<IcMatterAppointmentRecordEntity> re = new LambdaQueryWrapper<>();
+        re.eq(BaseEpmetEntity::getDelFlag,NumConstant.ZERO).
+                eq(IcMatterAppointmentRecordEntity::getMatterId,formDTO.getMatterId()).
+                ge(IcMatterAppointmentRecordEntity::getAppointmentDate, LocalDate.now());
+        List<IcMatterAppointmentRecordEntity> appointmentRecords = matterAppointmentRecordDao.selectList(re);
+        if (CollectionUtils.isNotEmpty(appointmentRecords)){
+            throw new RenException(EpmetErrorCode.MATTER_EXISTS_APPOINTMENT_ERROR.getCode());
+        }
+        matterService.deleteById(formDTO.getMatterId());
+    }
+
 }