[修改] 三说代码事件流程代码提交

manailin

2022-09-23 166b1181d090cbc184c2a93bdb5b3db33da0758a

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -10,7 +10,6 @@
import com.panzhihua.common.constants.ReturnMsgConstants;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
import com.panzhihua.common.model.dtos.user.IndexDataDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.*;
@@ -26,13 +25,11 @@
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang3.RandomUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;

import static java.util.Objects.nonNull;
@@ -100,7 +97,7 @@
            ComActDO community = comActDAO.selectById(comEvent.getRequestUserCommunity());
            comEvent.setCurrentOrgName(community.getName());
        }
        if (comEvent.getCenterId() != null) {
        if (!StringUtils.isEmpty(comEvent.getCenterId())) {
            ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(comEvent.getCenterId());
            comEvent.setCurrentOrgName(center.getName());
        }
@@ -119,12 +116,12 @@
        if (!flag) {
            return R.fail(ReturnMsgConstants.DATA_EXIST);
        }
        saveEventImageList(comEvent.getImages(), comEvent.getId());
        saveEventImageList(comEvent.getImages(), comEvent.getId(),null,1);
        return R.ok(ReturnMsgConstants.SAVE_SUCCESS);
    }

    @Transactional(rollbackFor = Exception.class)
    public Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id) {
    public Boolean saveEventImageList(List<ComEventRequestImageVO> images, Long id,Long transferId,Integer status) {
        List<ComEventResource> comEventResourceList = new ArrayList<>();
        if (!StringUtils.isEmpty(images)) {
            List<ComEventRequestImageVO> imagesList = images;
@@ -132,7 +129,8 @@
                ComEventResource comEventResource = new ComEventResource();
                comEventResource.setId(Snowflake.getId());
                comEventResource.setRefId(id);
                comEventResource.setStatus(1);
                comEventResource.setTransferId(transferId);
                comEventResource.setStatus(status);
                comEventResource.setType(1);
                comEventResource.setResourceName(comEventRequestImageVO.getName());
                comEventResource.setResourceSize(comEventRequestImageVO.getSize());
@@ -147,9 +145,9 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R updateComEvent(ComEvent comEvent) {
        if (checkExist(comEvent.getOrderSn(), null)) {
/*        if (checkExist(comEvent.getOrderSn(), comEvent.getId())) {
            return R.fail(ReturnMsgConstants.DATA_EXIST);
        }
        }*/
        int flag = baseMapper.updateById(comEvent);
        return flag > 0 ? R.ok(comEvent, ReturnMsgConstants.UPDATE_SUCCESS) : R.fail(ReturnMsgConstants.UPDATE_FALSE);
    }
@@ -168,8 +166,8 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R conciliationEvent(ComEventConciliationVO comEventConciliationVO) {
        saveEventImageList(comEventConciliationVO.getImages(), comEventConciliationVO.getId());
    public R conciliationEvent(ComEventConciliationVO comEventConciliationVO, LoginUserInfoVO loginUserInfo) {
        saveEventImageList(comEventConciliationVO.getImages(), comEventConciliationVO.getId(),null,4);
        ComEvent comEvent = baseMapper.selectById(comEventConciliationVO.getId());
        comEvent.setEventSucceed(comEventConciliationVO.getEventSucceed());
        comEvent.setEventResult(comEventConciliationVO.getEventResult());
@@ -194,6 +192,24 @@
            }
        }
        int flag = baseMapper.updateById(comEvent);
        ComEventTransferRecord comEventTransferRecord = new ComEventTransferRecord();
        comEventTransferRecord.setEventId(comEvent.getId());
        comEventTransferRecord.setSave(true);
        comEventTransferRecord.setProcessResult(comEvent.getCurrentEventProcessResult());
        comEventTransferRecord.setProcessResultData(new Date().toString());
        comEventTransferRecord.setProcessDate(new Date());
        comEventTransferRecord.setProcessBy(loginUserInfo.getUserId());
        comEventTransferRecord.setProcessByName(loginUserInfo.getName());
        comEventTransferRecord.setProcessType(1);
        comEventTransferRecord.setCreateAt(new Date());
        comEventTransferRecord.setSpecialistId(comEvent.getSpecialistId());
        comEventTransferRecord.setSpecialistOrg(comEvent.getCurrentOrgId());
        comEventTransferRecord.setSpecialistLevel(comEvent.getSpecialistLevel());
        comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
        comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
        comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
        saveEventImageList(comEvent.getImages(),comEvent.getId(),comEventTransferRecord.getId(),4);
        comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
        return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
    }

@@ -221,12 +237,18 @@
        ComEvent comEvent = baseMapper.selectById(id);
        ComSanshuoExpert specter = comSanShuoExpertService.getById(comEvent.getSpecialistId());
        CopyUtil.copyProperties(comEvent, comEventDetailVO);
        List<ComEventResource> resourceList = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id));
        List<ComEventResource> resourceList = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id)
                .eq(ComEventResource::getStatus,1));
        List<ComEventRequestImageVO> comEventRequestImageVO = CopyUtil.deepCopyListObject(resourceList, ComEventRequestImageVO.class);
        comEventDetailVO.setImages(comEventRequestImageVO);
        map.put("specter", specter);
        map.put("eventDetail", comEventDetailVO);
        List<ComEventTransferRecord> transferRecord = comEventTransferRecordService.list(new QueryWrapper<ComEventTransferRecord>().lambda().eq(ComEventTransferRecord::getEventId, id));
        transferRecord.forEach(comEventTransferRecord -> {
            List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getTransferId, comEventTransferRecord.getId()));
            List<ComEventRequestImageVO> ImageVO = CopyUtil.deepCopyListObject(list, ComEventRequestImageVO.class);
            comEventTransferRecord.setImages(ImageVO);
        });
        map.put("transferLog", transferRecord);
        List<ComEventResource> resource = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, id)
                .eq(ComEventResource::getStatus, 5));
@@ -265,6 +287,10 @@
    @Override
    public R calculate() {
        List<ComEventCalculateVO> calculateList = baseMapper.calculate();
        ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
        comEventCalculateVO.setStatus("0");
        comEventCalculateVO.setSum(baseMapper.selectCount(new QueryWrapper<ComEvent>().lambda()).toString());
        calculateList.add(comEventCalculateVO);
        return R.ok(calculateList);
    }