|
|
@@ -2511,11 +2511,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Override
|
|
|
public void pushDunNodeContent() {
|
|
|
List<TOrderNew> tOrderNews = tOrderNewMapper.selectgetAll();
|
|
|
-// for (TOrderNew e : tOrderNews) {
|
|
|
-// pushOrderDunContent(e);
|
|
|
-// }
|
|
|
- TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey("526004619772837888");
|
|
|
- pushOrderDunContent(tOrderNew);
|
|
|
+ for (TOrderNew e : tOrderNews) {
|
|
|
+ pushOrderDunContent(e);
|
|
|
+ }
|
|
|
+// TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey("412255829035991040");
|
|
|
+// pushOrderDunContent(tOrderNew);
|
|
|
}
|
|
|
|
|
|
private void pushOrderDunContent(TOrderNew e) {
|
|
|
@@ -2524,11 +2524,16 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
for (OutNewOrderDunBo bo : dunBoList) {
|
|
|
String str =""+bo.getProjectType()+bo.getDunType();
|
|
|
valueByCode.append(NewOrderDunType.getValueByCode(Integer.valueOf(str)));
|
|
|
-if (bo.getDunType().equals(0)){
|
|
|
+ if (bo.getDunType().equals(0)){
|
|
|
valueByCode.append(bo.getCustomizeName());
|
|
|
- }
|
|
|
- if(StringUtils.isNotBlank(bo.getCustomizeTimes())){
|
|
|
- valueByCode.append(" ").append(bo.getCustomizeTimes());
|
|
|
+ if(StringUtils.isNotBlank(bo.getCustomizeTimes())){
|
|
|
+ valueByCode.append(" ").append(bo.getCustomizeTimes());
|
|
|
+ }
|
|
|
+ }else if (bo.getProjectType().equals(5)||bo.getProjectType().equals(6)){
|
|
|
+ if (bo.getDunType().equals(2)){
|
|
|
+ valueByCode.append(" ").append(bo.getStartDate());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
if (bo.getAppropriationRatio()!=null){
|
|
|
valueByCode.append(" ").append(bo.getAppropriationRatio()).append("%");
|