Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-09 e76d382202ed5c8286b09593e05b2c36acde1c0f

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -1,13 +1,12 @@
package com.dg.core.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.GuideRepairOrderImage;
import com.dg.core.db.gen.entity.Slideshow;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.db.gen.entity.*;
import com.dg.core.db.gen.mapper.GuideRepairOrderImageMapper;
import com.dg.core.db.gen.mapper.GuideRepairOrderMapper;
import com.dg.core.db.gen.mapper.SysUserMapper;
import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.util.Snowflake;
@@ -26,6 +25,9 @@
    @Resource
    private  GuideRepairOrderImageMapper guideRepairOrderImageMapper;

    @Resource
    private SysUserMapper sysUserMapper;

    @Override
    public  int addOrder(GuideRepairOrder guideRepairOrder){

@@ -35,10 +37,14 @@
        guideRepairOrder.setMatterName(transactionEvent.getMatterName());
        guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
        guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
        sysUserMapper.selectListByDepartmentId(null, "," + guideRepairOrder.getMatterId(), guideRepairOrder.getMatterId() + ",")
        guideRepairOrder.setState("1");
        guideRepairOrder.setCreateTime(LocalDateTime.now());
        guideRepairOrder.setUpdateTime(LocalDateTime.now());
        transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()+1);
         String[] images = guideRepairOrder.getImages().split(",");
        for (String image: images) {
        if (guideRepairOrder.getImages()!=null){
           String[] images = guideRepairOrder.getImages().split(",");
           for (String image: images) {
            GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
            guideRepairOrderImage.setId(Snowflake.getId());
            guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
@@ -46,15 +52,18 @@
            guideRepairOrderImage.setCreateTime(LocalDateTime.now());
            guideRepairOrderImage.setType(1);
            guideRepairOrderImageMapper.insert(guideRepairOrderImage);
          }
        }
        if (guideRepairOrder.getOrderNum()!=null){
          GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
          guideRepairOrderImage.setId(Snowflake.getId());
          guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
          guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
          guideRepairOrderImage.setCreateTime(LocalDateTime.now());
          guideRepairOrderImage.setType(2);
          guideRepairOrderImageMapper.insert(guideRepairOrderImage);
        if (guideRepairOrder.getVideo()!=null){
          if (guideRepairOrder.getOrderNum()!=null){
            GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
            guideRepairOrderImage.setId(Snowflake.getId());
            guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
            guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
            guideRepairOrderImage.setCreateTime(LocalDateTime.now());
            guideRepairOrderImage.setType(2);
            guideRepairOrderImageMapper.insert(guideRepairOrderImage);
        }
        }
        int ans= baseMapper.insert(guideRepairOrder);
        int i = transactionEventMapper.updateById(transactionEvent);
@@ -72,6 +81,8 @@

    @Override
    public int updateConfig(GuideRepairOrder order) {
        SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
        order.setGuideUserPhone(sysUser.getPhonenumber());
        return baseMapper.updateConfig(order);
    }

@@ -80,5 +91,15 @@
        return baseMapper.selectBySubmitId(submitUserId);
    }

    @Override
    public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName,List<String> ids) {
        return baseMapper.selectConfigList(page,state,matterName, ids);
    }

    @Override
    public int countConfigList(String matterName,List<String> ids) {
        return baseMapper.countConfigList(matterName,ids);
    }


}