|
|
@@ -17,10 +17,7 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
-import com.goafanti.order.enums.OrderChangeProcess;
|
|
|
-import com.goafanti.order.enums.OrderChangeType;
|
|
|
-import com.goafanti.order.enums.OrderNewState;
|
|
|
-import com.goafanti.order.enums.OrderType;
|
|
|
+import com.goafanti.order.enums.*;
|
|
|
import com.goafanti.order.service.NewOrderDunService;
|
|
|
import com.goafanti.order.service.OrderChangeService;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
@@ -693,11 +690,45 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
TOrderMid tm=new TOrderMid();
|
|
|
tm.setOrderNo(nb.getOrderNo());
|
|
|
tm.setProjectType(1);
|
|
|
+ tm.setDunNodeContent(getDunNodeContent(t1));
|
|
|
tOrderMidMapper.updateByOrderNo(tm);
|
|
|
}
|
|
|
+
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
|
|
|
}
|
|
|
|
|
|
+ private String getDunNodeContent(TOrderNew e) {
|
|
|
+ List<OutNewOrderDunBo> dunBoList = newOrderDunMapper.selectListNewOrderDun(e.getOrderNo(), null);
|
|
|
+ StringBuilder valueByCode= new StringBuilder();
|
|
|
+ for (OutNewOrderDunBo bo : dunBoList) {
|
|
|
+ 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.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("%");
|
|
|
+ }else {
|
|
|
+ valueByCode.append(" ").append(bo.getMoney());
|
|
|
+ }
|
|
|
+ if (bo.getStatus()==0){
|
|
|
+ valueByCode.append(" 未启动");
|
|
|
+ }else if (bo.getStatus()==1){
|
|
|
+ valueByCode.append(" 已启动");
|
|
|
+ }
|
|
|
+ valueByCode.append(",");
|
|
|
+ }
|
|
|
+ return valueByCode.toString();
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public boolean checkOderNo(String orderNo) {
|
|
|
int i=newOrderChangeMapper.checkOderNo(orderNo);
|