|
@@ -2,9 +2,7 @@ package com.ym.mec.biz.service.impl;
|
|
|
|
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
-import com.ym.mec.biz.dal.dao.CooperationOrganDao;
|
|
|
|
-import com.ym.mec.biz.dal.dao.ReplacementInstrumentDao;
|
|
|
|
-import com.ym.mec.biz.dal.dao.SysConfigDao;
|
|
|
|
|
|
+import com.ym.mec.biz.dal.dao.*;
|
|
import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
|
|
import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
|
|
import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatHead;
|
|
import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatHead;
|
|
import com.ym.mec.biz.dal.dto.ReplacementPayDto;
|
|
import com.ym.mec.biz.dal.dto.ReplacementPayDto;
|
|
@@ -28,8 +26,6 @@ import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
-import com.ym.mec.biz.dal.dao.ReplacementInstrumentActivityDao;
|
|
|
|
-
|
|
|
|
import org.springframework.http.HttpStatus;
|
|
import org.springframework.http.HttpStatus;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -70,6 +66,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private CooperationOrganService cooperationOrganService;
|
|
private CooperationOrganService cooperationOrganService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ReplacementInstrumentCooperationDao replacementInstrumentCooperationDao;
|
|
|
|
|
|
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
|
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
|
|
|
|
|
@@ -336,7 +334,14 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public ReplacementInstrumentActivityStatDto getInfo(Integer id) {
|
|
public ReplacementInstrumentActivityStatDto getInfo(Integer id) {
|
|
- return replacementInstrumentActivityDao.getInfo(id);
|
|
|
|
|
|
+ ReplacementInstrumentActivityStatDto info = replacementInstrumentActivityDao.getInfo(id);
|
|
|
|
+ if (info != null && info.getOpenFlag().equals(0)) {
|
|
|
|
+ ReplacementInstrumentCooperation byCooperationId = replacementInstrumentCooperationDao.getByCooperationId(info.getCooperationOrganId());
|
|
|
|
+ if (byCooperationId != null && byCooperationId.getOpenPay().equals(YesOrNoEnum.YES)) {
|
|
|
|
+ info.setOpenFlag(1);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return info;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|