|
@@ -89,6 +89,9 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
private SysFunctionService sysFunctionService;
|
|
private SysFunctionService sysFunctionService;
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ private CompanyMapper companyMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private BusinessOpportunityMapper businessOpportunityMapper;
|
|
private BusinessOpportunityMapper businessOpportunityMapper;
|
|
|
|
|
|
@@ -193,6 +196,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public void insert(BusinessOpportunity bo) {
|
|
public void insert(BusinessOpportunity bo) {
|
|
|
|
+ String str = getString();
|
|
setNull(bo);
|
|
setNull(bo);
|
|
bOMapper.insert(bo);
|
|
bOMapper.insert(bo);
|
|
List<BusinessItemProduct> businessItemProducts = JSONArray.parseArray(bo.getBusinessItemProductList(), BusinessItemProduct.class);
|
|
List<BusinessItemProduct> businessItemProducts = JSONArray.parseArray(bo.getBusinessItemProductList(), BusinessItemProduct.class);
|
|
@@ -205,13 +209,20 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
actionLog.setItemId(bo.getId());
|
|
actionLog.setItemId(bo.getId());
|
|
actionLog.setCode("business");
|
|
actionLog.setCode("business");
|
|
actionLog.setCreatTime(new Date());
|
|
actionLog.setCreatTime(new Date());
|
|
- actionLog.setName("创建了商机");
|
|
|
|
|
|
+ actionLog.setName("创建了"+str);
|
|
actionLogMapper.insert(actionLog);
|
|
actionLogMapper.insert(actionLog);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private String getString() {
|
|
|
|
+ String userId = request.getHeader("Token");
|
|
|
|
+ Company company = companyMapper.selectById(userMapper.selectById(userId).getCompanyId());
|
|
|
|
+ return company.getIsExistBusiness()==1 ? "商机" :"项目";
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public void update(BusinessOpportunity bo, String userId) {
|
|
public void update(BusinessOpportunity bo, String userId) {
|
|
|
|
+ String str = getString();
|
|
setNull(bo);
|
|
setNull(bo);
|
|
bOMapper.updateById(bo);
|
|
bOMapper.updateById(bo);
|
|
bipMapper.delete(new QueryWrapper<BusinessItemProduct>().eq("business_id", bo.getId()));
|
|
bipMapper.delete(new QueryWrapper<BusinessItemProduct>().eq("business_id", bo.getId()));
|
|
@@ -222,7 +233,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
}
|
|
}
|
|
ActionLog log = new ActionLog();
|
|
ActionLog log = new ActionLog();
|
|
log.setItemId(bo.getId());
|
|
log.setItemId(bo.getId());
|
|
- log.setName("编辑了商机");
|
|
|
|
|
|
+ log.setName("编辑了"+str);
|
|
log.setCode("business");
|
|
log.setCode("business");
|
|
log.setUserId(userId);
|
|
log.setUserId(userId);
|
|
log.setCreatTime(new Date());
|
|
log.setCreatTime(new Date());
|
|
@@ -232,6 +243,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public void getAndTransfer(BusinessOpportunity bo, User user) {
|
|
public void getAndTransfer(BusinessOpportunity bo, User user) {
|
|
|
|
+ String str = getString();
|
|
UpdateWrapper<BusinessOpportunity> updateWrapper = new UpdateWrapper<>();
|
|
UpdateWrapper<BusinessOpportunity> updateWrapper = new UpdateWrapper<>();
|
|
String ids1 = bo.getIds();
|
|
String ids1 = bo.getIds();
|
|
List<Integer> ids = new ArrayList<>();
|
|
List<Integer> ids = new ArrayList<>();
|
|
@@ -252,13 +264,13 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
|
|
for (BusinessOpportunity clue1 : clues) {
|
|
for (BusinessOpportunity clue1 : clues) {
|
|
if (clue1.getInchargerId() == null) {
|
|
if (clue1.getInchargerId() == null) {
|
|
//认领
|
|
//认领
|
|
- clueLog.setName("认领了商机");
|
|
|
|
|
|
+ clueLog.setName("认领了"+str);
|
|
clueLog.setUserId(user.getId());
|
|
clueLog.setUserId(user.getId());
|
|
bo.setInchargerId(user.getId());
|
|
bo.setInchargerId(user.getId());
|
|
actionLogMapper.insert(clueLog);
|
|
actionLogMapper.insert(clueLog);
|
|
} else {
|
|
} else {
|
|
//转移
|
|
//转移
|
|
- clueLog.setName("转移了商机");
|
|
|
|
|
|
+ clueLog.setName("转移了"+str);
|
|
bo.setInchargerId(bo.getInchargerId());
|
|
bo.setInchargerId(bo.getInchargerId());
|
|
actionLogMapper.insert(clueLog);
|
|
actionLogMapper.insert(clueLog);
|
|
}
|
|
}
|