anderx 4 lat temu
rodzic
commit
b255312225

+ 6 - 6
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -30,8 +30,8 @@ import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.LiquidationNewState;
+import com.goafanti.order.enums.NewProjectStatus;
 import com.goafanti.order.enums.OrderNewState;
-import com.goafanti.order.enums.ProjectNewStage;
 import com.goafanti.techproject.enums.TaskState;
 
 public class ExportExcelUtil {
@@ -288,7 +288,7 @@ public class ExportExcelUtil {
 					case "任务负责人": o = ob.getTargetName(); break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); break;
 					case "任务数量": o = ob.getCommodityQuantity().toString(); break;
-					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
+					case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
 					case "受理日期": o = ob.getAcceptTime(); break;
 					case "评审日期": o = ob.getReviewTime(); break;
 					case "下证日期": o = ob.getLicenceTime();break;
@@ -428,7 +428,7 @@ public class ExportExcelUtil {
 					case "客户名称": o = ob.getUserName(); break;
 					case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus());break;
 					case "签单金额(万元)": o = ob.getTotalAmount().toString(); break;
-					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
+					case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
 					case "结算状态": o = LiquidationNewState.getValueByCode(ob.getLiquidationStatus()); break;
 					case "应收款(万元)": o = ob.getAccountsReceivable().toString(); break;
 					case "已收款(万元)": o = ob.getSettlementAmount().toString(); break;
@@ -480,7 +480,7 @@ public class ExportExcelUtil {
 					case "客户名称": o = ob.getUserName(); break;
 					case "任务负责人": o = ob.getReceiverName(); break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); break;
-					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
+					case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
 					case "工时": o = ob.getHours().toString(); break;
 					case "合同编号":o =ob.getContractNo();break;
 					case "签单日期":o =ob.getSignTime();break;
@@ -532,7 +532,7 @@ public class ExportExcelUtil {
 					
 					setWidth(sheet, i, o,2);break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); setWidth(sheet, i, o,1);break;
-					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); setWidth(sheet, i, o,1);break;
+					case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); setWidth(sheet, i, o,1);break;
 					case "分配时间": o = ob.getTaskDate();setWidth(sheet, i, o,1); break;
 					case "订单部门": o = ob.getDepName();setWidth(sheet, i, o,1);break;
 					default: o = ""; break;
@@ -642,7 +642,7 @@ public class ExportExcelUtil {
 				r.createCell(7).setCellValue(ob.getRefundAmount().toString());
 				
 				r.createCell(8).setCellValue(OrderNewState.getValueByCode(ob.getOrderStatus()));
-				r.createCell(9).setCellValue(ProjectNewStage.getValueByCode(ob.getProjectStatus()));
+				r.createCell(9).setCellValue(NewProjectStatus.getValueByCode(ob.getProjectStatus()));
 				
 				r.createCell(10).setCellValue(BonusSubject.getValueByCode(ob.getBonusSubject()));
 				r.createCell(11).setCellValue(ob.getProofCount().toString());

+ 0 - 74
src/main/java/com/goafanti/order/enums/OrderProjectStatus.java

@@ -1,74 +0,0 @@
-package com.goafanti.order.enums;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 已作废
- * @author Administrator
- *
- */
-public enum OrderProjectStatus {
-	//项目状态 0-项目待提交 1-项目已提交,2-项目评审,3-项目立项,4-项目公示,5-项目抽查,6-项目备案,
-	//7-项目下证,8-项目验收,9-项目拨款 10- 项目进度10% 11- 项目进度30% 12- 项目进度70%
-	XMDTJ(0,"项目待提交"),
-	XMYTJ(1,"项目已提交"),
-	XMPS(2,"项目评审"),
-	XMLX(3,"项目立项"),
-	XMGS(4,"项目公示"),
-	XMCC(5,"项目抽查"),
-	XMBA(6,"项目备案"),
-	XMXZ(7,"项目下证"),
-	XMYS(8,"项目验收"),
-	XMBK(9,"项目拨款"),
-	XMJD10(10,"项目进度10%"),
-	XMJD30(11,"项目进度30%"),
-	XMJD70(12,"项目进度70%"),
-	INVALID(99,"未知");
-	
-	
-	private OrderProjectStatus(Integer code, String desc) {
-		this.code = code;
-		this.desc = desc;
-	}
-
-	private static Map<Integer, OrderProjectStatus> status = new HashMap<Integer, OrderProjectStatus>();
-
-	static {
-		for (OrderProjectStatus value : OrderProjectStatus.values()) {
-			status.put(value.getCode(), value);
-		}
-	}
-	public static OrderProjectStatus getStatus(Integer code) {
-		if (containsType(code)) {
-			return status.get(code);
-		}
-		return INVALID;
-	}
-	public static String getValueByCode(Integer code){
-        for(OrderProjectStatus orderType:OrderProjectStatus.values()){
-            if(code.equals(orderType.getCode())){
-                return orderType.getDesc();
-            }
-        }
-        return  INVALID.getDesc();
-    }
-	public static boolean containsType(Integer code) {
-		return status.containsKey(code);
-	}
-	
-	private Integer	code;
-	private String	desc;
-	public Integer getCode() {
-		return code;
-	}
-	public void setCode(Integer code) {
-		this.code = code;
-	}
-	public String getDesc() {
-		return desc;
-	}
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
-}

+ 0 - 85
src/main/java/com/goafanti/order/enums/ProjectNewStage.java

@@ -1,85 +0,0 @@
-package com.goafanti.order.enums;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 项目阶段
- * @author Administrator
- *
- */
-public enum ProjectNewStage {
-	/** 项目待提交 **/
-	DTJ(0,"项目待提交"),
-	/** 项目已提交 **/
-	YTJ(1,"项目已提交"),
-	/** 项目评审 **/
-	PS(2,"项目评审"),
-	/** 项目立项 **/
-	LS(3,"项目立项"),
-	/** 项目公示 **/
-	GS(4,"项目公示"),
-	/** 项目抽查 **/
-	CC(5,"项目抽查"),
-	/** 项目备案 **/
-	BA(6,"项目备案"),
-	/** 项目下证 **/
-	XZ(7,"项目下证"),
-	/** 项目验收 **/
-	YS(8,"项目验收"),
-	/** 项目拨款 **/
-	BK(9,"项目拨款"),
-
-	JD10(10,"项目进度10%"),
-	
-	JD30(11,"项目进度30%"),
-	
-	JD70(12,"项目进度70%"),
-	/** 无效 **/
-	INVALID(10, "INVALID");
-	
-	private ProjectNewStage(Integer code, String desc) {
-		this.code = code;
-		this.desc = desc;
-	}
-
-	private static Map<Integer, ProjectNewStage> status = new HashMap<Integer, ProjectNewStage>();
-
-	static {
-		for (ProjectNewStage value : ProjectNewStage.values()) {
-			status.put(value.getCode(), value);
-		}
-	}
-	public static ProjectNewStage getStatus(Integer code) {
-		if (containsType(code)) {
-			return status.get(code);
-		}
-		return INVALID;
-	}
-	
-	public static String getValueByCode(Integer code){
-        for(ProjectNewStage projectNewStage:ProjectNewStage.values()){
-            if(code.equals(projectNewStage.getCode())){
-                return projectNewStage.getDesc();
-            }
-        }
-        return  "";
-    }
-	public static boolean containsType(Integer code) {
-		return status.containsKey(code);
-	}
-	private Integer	code;
-	private String	desc;
-	public Integer getCode() {
-		return code;
-	}
-	public void setCode(Integer code) {
-		this.code = code;
-	}
-	public String getDesc() {
-		return desc;
-	}
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
-}

+ 4 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -108,12 +108,11 @@ import com.goafanti.order.bo.outOrderDunListBo;
 import com.goafanti.order.enums.ActiveState;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.LiquidationNewState;
-import com.goafanti.order.enums.NewDunState;
 import com.goafanti.order.enums.NewOrderDunType;
+import com.goafanti.order.enums.NewProjectStatus;
 import com.goafanti.order.enums.OrderDunSubject;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProcessStatus;
-import com.goafanti.order.enums.ProjectNewStage;
 import com.goafanti.order.enums.TaskState;
 import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.OrderNewService;
@@ -202,7 +201,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setSettlementAmount(initial);
 		t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
 		t.setProcessStatus(ProcessStatus.YPYXY.getCode());
-		t.setProjectStatus(ProjectNewStage.DTJ.getCode());
+		t.setProjectStatus(NewProjectStatus.WQD.getCode());
 		t.setApproval(ApprovalNewState.FTP.getCode());
 		t.setDeleteSign(0);//0-正常,1-作废,2-锁定
 		t.setSalesmanId(TokenManager.getAdminId());
@@ -225,7 +224,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNew order=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		checkOrder(order,t);
 		t.setTaskStatus(TaskState.WFP.getCode());
-		t.setProjectStatus(ProjectNewStage.DTJ.getCode());
+		t.setProjectStatus(NewProjectStatus.WQD.getCode());
 		if(t.getCommodityPrice()!=null)order.setTotalAmount(order.getTotalAmount());
 		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
 		t.setCname(str);
@@ -1025,7 +1024,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
     				case "应收款": o = ob.getAccountsReceivable().toString(); break;
     				case "已收款": o = ob.getSettlementAmount().toString(); break;
     				case "未收款": o = ob.getUncollectedAmount().toString(); break;
-    				case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
+    				case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
     				case "催收科目": o = ob.getDunSubject(); break;
     				case "催款状态": o = ob.getDunStatus()==0?"未启动":"已启动"; break;
     				case "催款启动时间": o = ob.getStartDate(); break;

+ 1 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -93,7 +93,6 @@ import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.NewProjectStatus;
 import com.goafanti.order.enums.OrderDunProjectType;
-import com.goafanti.order.enums.OrderProjectStatus;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderProjectService;
@@ -471,7 +470,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			//查出父项目
 			List<TOrderTaskListBo> list=tOrderTaskMapper.splitProjectList(task2.getSplitSuper());
 			//设置一个比较大的流程数字,然后取最小的
-			Integer i=OrderProjectStatus.XMJD10.getCode();
+			Integer i=28;
 			for (TOrderTaskListBo tt : list) {
 				if (tt.getProjectStatus()<i) i=tt.getProjectStatus();
 			}