|
|
@@ -248,11 +248,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
InputAddTask t2=new InputAddTask();
|
|
|
BeanUtils.copyProperties(t,t2);
|
|
|
if (bp.getProjectType().equals(NewProjectTypeEnum.HT.getCode())){
|
|
|
- if (t.getHtMember()==1){
|
|
|
+ if (t.getHtMember()==1) {
|
|
|
//会员项目替换
|
|
|
- List<BusinessProjectBo> additionalDeductionList = businessProjectMapper.selectByFirstBName("高新会员",1);
|
|
|
+ List<BusinessProjectBo> additionalDeductionList = businessProjectMapper.selectByFirstBName("高新会员", 1);
|
|
|
for (BusinessProjectBo e : additionalDeductionList) {
|
|
|
- if(!e.getId().equals(t.getCommodityId())){
|
|
|
+ if (!e.getId().equals(t.getCommodityId())) {
|
|
|
t2.setCommodityId(e.getId());
|
|
|
t2.setCommodityName(e.getBname());
|
|
|
t2.setMain(0);
|
|
|
@@ -264,32 +264,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- if(t.getAdditionalDeduction()==1){
|
|
|
- //加计扣除
|
|
|
- List<BusinessProjectBo> additionalDeductionList = businessProjectMapper.selectByFirstBName("加计扣除", 1);
|
|
|
- for (BusinessProjectBo e : additionalDeductionList) {
|
|
|
- t2.setCommodityId(e.getId());
|
|
|
- t2.setCommodityName(e.getBname());
|
|
|
- t2.setMain(0);
|
|
|
- t2.setCommodityPrice(new BigDecimal(0));
|
|
|
- t2.setId(null);
|
|
|
- addTTaskMember(t2);
|
|
|
- addTaskMid(t2);
|
|
|
- }
|
|
|
- }
|
|
|
- if(t.getRdAwardsubsidy()==1){
|
|
|
- //研发奖补
|
|
|
- List<BusinessProjectBo> list = businessProjectMapper.selectByFirstBName("研发奖补", 1);
|
|
|
- for (BusinessProjectBo e : list) {
|
|
|
- t2.setCommodityId(e.getId());
|
|
|
- t2.setCommodityName(e.getBname());
|
|
|
- t2.setMain(0);
|
|
|
- t2.setCommodityPrice(new BigDecimal(0));
|
|
|
- t2.setId(null);
|
|
|
- addTTaskMember(t2);
|
|
|
- addTaskMid(t2);
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
if (bp.getProjectType().equals(NewProjectTypeEnum.SIMPLE.getCode())){
|
|
|
List<BusinessProjectBo> list = businessProjectMapper.selectByFirstBName("简单会员", 2);
|