Commit 2d3bed33 authored by 赵啸非's avatar 赵啸非

添加公共庫

parent 1df7c5c3
......@@ -167,14 +167,19 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
int success = 0;
int fail = 0;
List<PubdatumEntity> pubdatumEntityList = pubdatumService.get(pubIds, context);
List<MatterDatumEntity> matterDatumEntities = new ArrayList<>();
for (PubdatumEntity pubdatumEntity : pubdatumEntityList) {
Boolean bool = updateOrSave(pubdatumEntity, matterId, siteId, context);
if (bool) {
MatterDatumEntity matterDatumEntity = updateOrSave(pubdatumEntity, matterId, siteId, context);
if (!ObjectUtils.isEmpty(matterDatumEntity)) {
matterDatumEntities.add(matterDatumEntity);
success++;
} else {
fail++;
}
}
if(!ObjectUtils.isEmpty(matterDatumEntities)){
this.save(matterDatumEntities,context);
}
String msg = "当前加入材料已存在!";
if (pubIds.length == 1) {
if (success > 0) {
......@@ -192,17 +197,16 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
return Rest.ok(msg);
}
private Boolean updateOrSave(PubdatumEntity pubdatumEntity, Long matterId, Long siteId, Context context) {
private MatterDatumEntity updateOrSave(PubdatumEntity pubdatumEntity, Long matterId, Long siteId, Context context) {
MatterDatumEntity matterDatumEntity = this.selectOne(new MatterDatumQuery().siteId(siteId).matterId(matterId).materialName(pubdatumEntity.getMaterialName()));
if (ObjectUtils.isEmpty(matterDatumEntity)) {
MatterDatumEntity entity = new MatterDatumEntity();
BeanUtils.copyProperties(pubdatumEntity, entity, new String[]{"id", "matterId"});
entity.setSiteId(siteId);
entity.setMatterId(matterId);
this.save(entity, context);
return true;
return entity;
}
return false;
return null;
}
@Override
......
......@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -57,15 +58,20 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
}
int success = 0;
int fail = 0;
List<MatterEntity> matterEntities = new ArrayList<>();
List<SheetMatterEntity> sheetMatterEntityList = sheetMatterService.get(sheetMatterIds, context);
for (SheetMatterEntity sheetMatterEntity : sheetMatterEntityList) {
Boolean bool = updateOrSave(sheetMatterEntity, siteId, context);
if (bool) {
MatterEntity matterEntity = updateOrSave(sheetMatterEntity, siteId, context);
if (!ObjectUtils.isEmpty(matterEntity)) {
matterEntities.add(matterEntity);
success++;
} else {
fail++;
}
}
if (!ObjectUtils.isEmpty(matterEntities)) {
this.save(matterEntities, context);
}
String msg = "当前加入事项已存在!";
if (sheetMatterIds.length == 1) {
if (success > 0) {
......@@ -83,7 +89,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
return Rest.ok(msg);
}
private Boolean updateOrSave(SheetMatterEntity sheetMatterEntity, Long siteId, Context context) {
private MatterEntity updateOrSave(SheetMatterEntity sheetMatterEntity, Long siteId, Context context) {
MatterEntity siteMatterEntity = this.selectOne(new MatterQuery().siteId(siteId).tcode(sheetMatterEntity.getTcode()));
if (ObjectUtils.isEmpty(siteMatterEntity)) {
MatterEntity matterEntity = new MatterEntity();
......@@ -100,10 +106,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
matterEntity.setSource(MatterSourceEnum.AUTO.getValue());
matterEntity.setCreateUserId(this.getContextUserId(context));
matterEntity.setCreateTime(new Date());
this.save(matterEntity, context);
return true;
return matterEntity;
}
return false;
return null;
}
@Override
......@@ -112,7 +117,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
if (matterEntity == null) {
throw new AppException("数据已更改,请重试");
}
String msg="推荐成功!";
String msg = "推荐成功!";
int recommendCount = this.count(new MatterQuery().siteId(matterEntity.getSiteId()).isRecommend(YesNoEnum.YES.getValue()), null);
if (matterEntity.getIsRecommend() == YesNoEnum.NO.getValue()) {
if (recommendCount >= RECOMMEND_COUNT) {
......@@ -121,7 +126,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
matterEntity.setIsRecommend(YesNoEnum.YES.getValue());
} else {
matterEntity.setIsRecommend(YesNoEnum.NO.getValue());
msg="取消推荐成功!";
msg = "取消推荐成功!";
}
this.update(matterEntity, context);
return Rest.ok(msg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment