|
|
@@ -642,13 +642,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if(b.getSetUpAmount()!=null)t.setSetUpAmount(new BigDecimal(b.getSetUpAmount()));
|
|
|
if (b.getPubicityUrl()!=null)t.setPubicityUrl(b.getPubicityUrl());
|
|
|
TOrderTask task2=tOrderTaskMapper.queryById(b.getTid());//查询出项目信息
|
|
|
- if(b.getProjectStatus()!=task2.getProjectStatus()||!b.getTimeRecord().equals(task2.getTimeRecord())){
|
|
|
+ if(!Objects.equals(b.getProjectStatus(), task2.getProjectStatus())
|
|
|
+ ||!b.getTimeRecord().equals(task2.getTimeRecord())){
|
|
|
TTaskMid taskMid = new TTaskMid();
|
|
|
taskMid.setTid(b.getTid());
|
|
|
- if(b.getProjectStatus()==NewProjectStatus.YLX.getCode()||b.getProjectStatus()==NewProjectStatus.YNGS.getCode()){
|
|
|
+ if(Objects.equals(b.getProjectStatus(), NewProjectStatus.YLX.getCode())
|
|
|
+ || Objects.equals(b.getProjectStatus(), NewProjectStatus.YNGS.getCode())){
|
|
|
t.setSetUpStatus(1);
|
|
|
taskMid.setSetUpCount(task2.getCommodityQuantity());
|
|
|
- if (b.getProjectStatus()==NewProjectStatus.YNGS.getCode()){
|
|
|
+ if (Objects.equals(b.getProjectStatus(), NewProjectStatus.YNGS.getCode())){
|
|
|
t.setIfPublicity(1);
|
|
|
taskMid.setPromulgateCount(task2.getCommodityQuantity());
|
|
|
}
|