Commit ffd81dd3 authored by 赵啸非's avatar 赵啸非

添加材料数量统计

parent 8b451c9a
......@@ -26,6 +26,8 @@ public final class Constant {
/** 登录用户类型为客户 */
public final static int CUSTOMER_USER = 99;
public final static String PARAMS_RECOMMEND_COUNT = "recommend_count";
public final static String PARAMS_BLANK_COUNT = "blank_count";
}
......@@ -18,6 +18,7 @@ import com.deepoove.poi.template.MetaTemplate;
import com.deepoove.poi.util.RegexUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.util.StringUtils;
......@@ -27,6 +28,7 @@ import com.mortals.xhx.common.code.ComponentEnum;
import com.mortals.xhx.common.code.MatterSourceEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.formdesign.*;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.key.ParamKey;
import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
import com.mortals.xhx.common.utils.BeanUtil;
......@@ -71,8 +73,6 @@ import java.util.stream.Collectors;
@Service("matterDatumService")
public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumDao, MatterDatumEntity, Long> implements MatterDatumService {
private static int RECOMMEND_COUNT = 5;
@Value("${upload.path}")
private String filePath;
@Autowired
......@@ -188,7 +188,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
}
if (!ObjectUtils.isEmpty(matterDatumEntities)) {
this.getDao().insertBatch(matterDatumEntities);
// this.save(matterDatumEntities, context);
// this.save(matterDatumEntities, context);
}
String msg = "当前加入材料已存在!";
if (pubIds.length == 1) {
......@@ -208,7 +208,6 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
}
private MatterDatumEntity updateOrSave(PubdatumEntity pubdatumEntity, Long matterId, Long siteId, Context context) {
int count = this.count(new MatterDatumQuery().siteId(siteId).matterId(matterId).materialName(pubdatumEntity.getMaterialName()), context);
if (count == 0) {
......@@ -234,7 +233,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
recommendCount += this.count(new MatterDatumQuery().matterId(matterEntity.getId()).isRecommend(YesNoEnum.YES.getValue()), context);
}
if (matterDatumEntity.getIsRecommend() == YesNoEnum.NO.getValue()) {
if (recommendCount >= RECOMMEND_COUNT) {
if (recommendCount >= GlobalSysInfo.getParamIntValue(Constant.PARAMS_RECOMMEND_COUNT, 7)) {
throw new AppException("超过推荐个数!");
}
matterDatumEntity.setIsRecommend(YesNoEnum.YES.getValue());
......@@ -248,9 +247,9 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
@Override
protected void findAfter(MatterDatumEntity params, PageInfo pageInfo, Context context, List<MatterDatumEntity> list) throws AppException {
list.stream().forEach(entity->{
list.stream().forEach(entity -> {
MatterEntity matterEntity = matterService.get(entity.getMatterId(), context);
if(!ObjectUtils.isEmpty(matterEntity)){
if (!ObjectUtils.isEmpty(matterEntity)) {
entity.setMatterNo(matterEntity.getMatterNo());
entity.setMatterName(matterEntity.getMatterName());
}
......
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