修改跟进bug

jyy

2021-01-11 ecca3995944764a639dc26c75c33dab83d607125

修改跟进bug

 zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java

@@ -7,10 +7,7 @@
import com.matrix.system.app.dto.*;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.SysFollowupCommentDao;
import com.matrix.system.hive.dao.SysFollowupDao;
import com.matrix.system.hive.dao.SysVipAlbumDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -45,6 +42,14 @@
    private SysFollowupCommentDao followupCommentDao;



    @Autowired
    private SysOrderItemDao orderItemDao;

    @Autowired
    private SysBeauticianStateDao beauticianStateDao;


    @ApiOperation(value = "新增跟进记录", notes = "新增跟进记录")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SysFollowup.class)
@@ -57,9 +62,33 @@
        followup.setStaffId(user.getSuId());
        followup.setCompanyId(user.getCompanyId());
        followup.setShopId(user.getShopId());
        //处理订单摘要
        if(followup.getOrderId()!=null){
            List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(followup.getOrderId());
            String abs="";
            if(sysOrderItems.size()>1){
                abs= sysOrderItems.get(0).getShoppingGoods().getName()+"等"+sysOrderItems.size()+"件商品";
            }else{
                abs= sysOrderItems.get(0).getShoppingGoods().getName();
            }
           followup.setOrderAbstract(abs);
        }
        //服务单摘要
        if(followup.getServiceId()!=null){
            List<SysBeauticianState> sysBeauticianStates = beauticianStateDao.selectBySerIds(followup.getServiceId());
            String abs="";
            if(sysBeauticianStates.size()>1){
                abs= sysBeauticianStates.get(0).getProjInfo().getName()+"等"+sysBeauticianStates.size()+"项服务";
            }else{
                abs= sysBeauticianStates.get(0).getProjInfo().getName();
            }
            followup.setOrderAbstract(abs);
        }

        followupDao.insert(followup);
        //插入图片
        List<SysVipAlbum> albums=followup.getAlbums();
        if(CollectionUtils.isNotEmpty(albums)){
        for (SysVipAlbum vipAlbum:albums){
            if(StringUtils.isNotBlank(vipAlbum.getImg())){
                vipAlbum.setCreateBy(user.getSuName());
@@ -70,6 +99,8 @@
                vipAlbumDao.insert(vipAlbum);
            }
        }
        }

        return AjaxResult.buildSuccessInstance("保存成功");
    }


 zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java

@@ -32,7 +32,6 @@
    /**
     * 员工ID
     */
    @NotNull(message = "员工ID")
    private Long  staffId;