add 标协会议修改，删除时同步到会员系统

jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/BaseUtil.java

@@ -34,17 +34,16 @@ public class BaseUtil {
 
     /**
      * 修改封装
-     * @param db        查询数据库得到的对象
      * @param object    任意继承JeroEntity的对象
      * @param userId  token解析得到的id
      */
-    public static void update(Object db,Object object, String userId){
+    public static void update(Object object, String userId){
-        JeroEntity baseDb = (JeroEntity) db;//查询数据库得到的对象
+        //要被封装的对象
-        JeroEntity jeroEntity = (JeroEntity) object;//要被封装的对象
+        JeroEntity jeroEntity = (JeroEntity) object;
-        jeroEntity.setCreateBy(baseDb.getCreateBy());//封装创建人
+        //封装修改人
-        jeroEntity.setCreateTime(baseDb.getCreateTime());//封装创建时间
+        jeroEntity.setUpdateBy(userId);
-        jeroEntity.setUpdateBy(userId);//封装修改人
+        //封装修改时间
-        jeroEntity.setUpdateTime(new Date());//封装修改时间
+        jeroEntity.setUpdateTime(new Date());
     }
 
     /**

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java

@@ -69,7 +69,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 			meetingHotelContactsService.saveBatch(hotelContactsList);
 		}
 		if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-			stableCrossTrainingService.push(payMeeting,hotelContactsList);
+			stableCrossTrainingService.add(payMeeting,hotelContactsList);
 		}
 	}
 
@@ -94,7 +94,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 			);
 			meetingHotelContactsService.saveBatch(hotelContactsList);
 		}
-
+		if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
+			stableCrossTrainingService.edit(payMeeting,hotelContactsList);
+		}
     }
 
 	@NotNull
@@ -195,7 +197,11 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 	 */
 	@Override
     public void deleteById(String id) {
-        removeById(id);
+		PayMeeting payMeeting = getById(id);
+		if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
+			stableCrossTrainingService.delete(id);
+		}
+		removeById(id);
         LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(PayMeetingHotelContacts::getMeetingId,id);
 		meetingHotelContactsService.remove(wrapper);
@@ -206,6 +212,12 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 	 */
 	@Override
     public void deleteByIds(List<String> ids) {
+		for (String id : ids) {
+			PayMeeting payMeeting = getById(id);
+			if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
+				stableCrossTrainingService.delete(id);
+			}
+		}
         removeByIds(ids);
 		LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(PayMeetingHotelContacts::getMeetingId,ids);

jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/IHotelManagementService.java

@@ -23,7 +23,7 @@ public interface IHotelManagementService extends IService<HotelManagement> {
     /**
      *  编辑
      */
-    Boolean edit(HotelManagement hotelManagement) throws Exception;
+    Boolean edit(HotelManagement hotelManagement);
 
     /**
      * 根据会议id查询酒店

jero-boot-incoming-payment/src/main/java/com/jero/standards/jiudian/hotelManagement/service/impl/HotelManagementServiceImpl.java

@@ -81,7 +81,7 @@ public class HotelManagementServiceImpl extends ServiceImpl<HotelManagementMappe
      * 编辑
      */
     @Override
-    public Boolean edit(HotelManagement hotelManagement) throws Exception {
+    public Boolean edit(HotelManagement hotelManagement) {
         //判断主键是否存在
         if (StringUtils.isBlank(hotelManagement.getId())) {
             throw new JeroBootException(Result.NULL_ID);
@@ -93,7 +93,11 @@ public class HotelManagementServiceImpl extends ServiceImpl<HotelManagementMappe
         HotelManagement hotelManagementDB = hotelManagementService.getById(hotelManagement.getId());
 
         //获取召开时间
-        this.isZhi(hotelManagement);
+        try {
+            this.isZhi(hotelManagement);
+        }catch (Exception e){
+            throw new JeroBootException(e);
+        }
         Boolean resFlag = Boolean.TRUE;
         LambdaUpdateWrapper<HotelManagement> updateWrapper = new LambdaUpdateWrapper();
         updateWrapper.eq(HotelManagement::getId, hotelManagement.getId())

jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/IStableCrossTrainingService.java

@@ -19,17 +19,17 @@ public interface IStableCrossTrainingService extends IService<StableCrossTrainin
     /**
      * 添加
      */
-    Boolean add(StableCrossTraining stableCrossTraining);
+    Boolean add(PayMeeting payMeeting, List<PayMeetingHotelContacts> hotelContactsList);
 
     /**
      * 编辑
      */
-    Boolean edit(StableCrossTraining stableCrossTraining) throws Exception;
+    Boolean edit(PayMeeting payMeeting, List<PayMeetingHotelContacts> hotelContactsList);
 
     /**
      * 通过id删除
      */
-    Boolean delete(String id) throws Exception;
+    Boolean delete(String id);
 
     /**
      * 批量删除
@@ -46,5 +46,5 @@ public interface IStableCrossTrainingService extends IService<StableCrossTrainin
      */
     List<StableCrossTraining> queryList(StableCrossTraining stableCrossTraining) throws Exception;
 
-    void push(PayMeeting payMeeting, List<PayMeetingHotelContacts> hotelContactsList);
+    StableCrossTraining push(PayMeeting payMeeting, List<PayMeetingHotelContacts> hotelContactsList);
 }

jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
@@ -19,10 +18,8 @@ import com.jero.standards.jiudian.hotelcontact.entity.HotelContact;
 import com.jero.standards.jiudian.hotelcontact.mapper.HotelContactMapper;
 import com.jero.standards.jiudian.hotelcontact.service.IHotelContactService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.*;
 import com.jero.standards.xuanguan.attendmeetings.entity.AttendMeetings;
 import com.jero.standards.xuanguan.attendmeetings.service.IAttendMeetingsService;
-import com.jero.standards.xuanguan.stablecrosstraining.entity.OSSFileVO;
 import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining;
 import com.jero.standards.xuanguan.stablecrosstraining.mapper.StableCrossTrainingMapper;
 import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService;
@@ -31,15 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 /**
  * @Description: 宣贯培训
@@ -67,8 +56,9 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
     private IStableCrossTrainingService stableCrossTrainingService;
 
     @Override
-    public void push(PayMeeting payMeeting, List<PayMeetingHotelContacts> hotelContactsList) {
+    public StableCrossTraining push(PayMeeting payMeeting, List<PayMeetingHotelContacts> hotelContactsList) {
         StableCrossTraining stableCrossTraining = new StableCrossTraining();
+        stableCrossTraining.setId(payMeeting.getId());
         stableCrossTraining.setName(payMeeting.getMeetingName());
         stableCrossTraining.setMeetingType(payMeeting.getMeetingType());
         stableCrossTraining.setYear(payMeeting.getParticularYear());
@@ -99,15 +89,22 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
             hotelList.add(hotelContact);
         }
         stableCrossTraining.setHotelList(hotelList);
-        add(stableCrossTraining);
+        return stableCrossTraining;
     }
 
     /**
      * 添加
      */
     @Override
-    public Boolean add(StableCrossTraining stableCrossTraining) {
+    public Boolean add(PayMeeting payMeeting, List<PayMeetingHotelContacts> hotelContactsList) {
-
+        StableCrossTraining stableCrossTraining = push(payMeeting, hotelContactsList);
+        // 会议名称唯一校验
+        LambdaQueryWrapper<StableCrossTraining> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StableCrossTraining::getName,stableCrossTraining.getName());
+        int count = stableCrossTrainingService.count(wrapper);
+        if (count>0){
+            throw new JeroBootException("会议名称与标协会员系统重复");
+        }
         //配置培训状态
         this.isTrainingState(stableCrossTraining);
         Boolean resFlag = stableCrossTrainingService.save(stableCrossTraining);
@@ -221,23 +218,22 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
      * 编辑
      */
     @Override
-    public Boolean edit(StableCrossTraining stableCrossTraining) throws Exception {
+    public Boolean edit(PayMeeting payMeeting, List<PayMeetingHotelContacts> hotelContactsList){
-        //判断是否为管理员
+        StableCrossTraining stableCrossTraining = push(payMeeting, hotelContactsList);
-//        sysBaseAPI.isAuthentication();
+
-        //判断主键是否存在
+        // 会议名称唯一校验
-        if (StringUtils.isBlank(stableCrossTraining.getId())) {
+        LambdaQueryWrapper<StableCrossTraining> wrapper = new LambdaQueryWrapper<>();
-            throw new JeroBootException(Result.NULL_ID);
+        wrapper.eq(StableCrossTraining::getName,stableCrossTraining.getName());
+        wrapper.ne(StableCrossTraining::getId,stableCrossTraining.getId());
+        int count = stableCrossTrainingService.count(wrapper);
+        if (count>0){
+            throw new JeroBootException("会议名称与标协会员系统重复");
         }
-        StableCrossTraining stableCrossTrainingDB = this.queryById(stableCrossTraining.getId());
-        //判空
-        this.ifEntityIsEmpty(stableCrossTraining);
-        //TODO 会议名称唯一校验
-        //sysBaseAPI.checkValue("1", "web_stable_cross_training", "name",
-        //        stableCrossTraining.getName(), stableCrossTraining.getId());
         //配置培训状态
         this.isTrainingState(stableCrossTraining);
-        //修改时间/修改人
+        //创建时间/创建人/修改时间/修改人
-//        this.update(stableCrossTraining);
+        LoginUser user = TokenUtils.getUserByToken();
+        BaseUtil.update(stableCrossTraining, user.getId());
         //添加宣贯培训
         LambdaUpdateWrapper<StableCrossTraining> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(StableCrossTraining::getId, stableCrossTraining.getId())
@@ -284,7 +280,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
      * 通过id删除
      */
     @Override
-    public Boolean delete(String id) throws Exception {
+    public Boolean delete(String id) {
         //判断主键是否存在
         if (StringUtils.isBlank(id)) {
             throw new JeroBootException(Result.NULL_ID);