|
|
@@ -2512,17 +2512,34 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
public void pushDunNodeContent() {
|
|
|
List<TOrderNew> tOrderNews = tOrderNewMapper.selectgetAll();
|
|
|
for (TOrderNew e : tOrderNews) {
|
|
|
- StringBuffer str=new StringBuffer();
|
|
|
List<OutNewOrderDunBo> dunBoList = newOrderDunMapper.selectListNewOrderDun(e.getOrderNo(), null);
|
|
|
+ StringBuilder valueByCode= new StringBuilder();
|
|
|
for (OutNewOrderDunBo bo : dunBoList) {
|
|
|
- String valueByCode = NewOrderDunType.getValueByCode(bo.getProjectType());
|
|
|
- if (bo.getDunType().equals(0)){
|
|
|
- valueByCode+=bo.getCustomizeName();
|
|
|
+ String str =""+bo.getProjectType()+bo.getDunType();
|
|
|
+ valueByCode.append(NewOrderDunType.getValueByCode(Integer.valueOf(str)));
|
|
|
+ if (bo.getDunType().equals(0)){
|
|
|
+ valueByCode.append(bo.getCustomizeName());
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(bo.getCustomizeTimes())){
|
|
|
- valueByCode+=" "+bo.getCustomizeTimes()+")";
|
|
|
+ valueByCode.append(" ").append(bo.getCustomizeTimes());
|
|
|
+ }
|
|
|
+ if (bo.getAppropriationRatio()!=null){
|
|
|
+ valueByCode.append(" ").append(bo.getAppropriationRatio()).append("%");
|
|
|
+ }else {
|
|
|
+ valueByCode.append(" ").append(bo.getMoney());
|
|
|
}
|
|
|
+ if (bo.getStatus()==0){
|
|
|
+ valueByCode.append(" 未启动");
|
|
|
+ }else if (bo.getStatus()==1){
|
|
|
+ valueByCode.append(" 已启动");
|
|
|
+ }
|
|
|
+ valueByCode.append(",");
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(valueByCode)){
|
|
|
+ TOrderMid mid=new TOrderMid();
|
|
|
+ mid.setOrderNo(e.getOrderNo());
|
|
|
|
|
|
+ tOrderMidMapper.updateByOrderNo(mid);
|
|
|
}
|
|
|
}
|
|
|
}
|