Przeglądaj źródła

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 lat temu
rodzic
commit
e8a9c92084

+ 2 - 6
src/main/java/com/goafanti/order/enums/ProjectStage.java

@@ -15,14 +15,10 @@ public enum ProjectStage {
 	WAIT_SET_UP(1,"等待立项 "),
 	/** 已立项 **/
 	ALREADY_SET_UP(2,"已立项 "),
-	/** 进行中 **/
-	PROCESSING(3,"进行中"),
 	/** 已结项 **/
-	FINISH(4,"已结项"),
+	FINISH(3,"已结项"),
 	/** 已撤项 **/
-	CANCEL(5,"已撤项"),
-	/** 已冻结 **/
-	FREEZE(6,"已 冻结"),
+	CANCEL(4,"已撤项"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
 	

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderService.java

@@ -367,7 +367,7 @@ public interface OrderService {
 	 * @param signComment
 	 * @return
 	 */
-	int updateSetUpProject(String orderNo, String signDate, String signComment);
+	int updateSetUpProject(String orderNo, String signComment);
 	
 	/**
 	 * 订单编号

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

@@ -1352,7 +1352,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	@Transactional
-	public int updateSetUpProject(String orderNo, String signDate, String signComment) {
+	public int updateSetUpProject(String orderNo, String signComment) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		checkOrder(tOrder);
 		boolean flag = false;

+ 19 - 15
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -584,27 +583,15 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		return res;
 	}
 	
-	/** 进入项目立项 **/
-	@RequestMapping(value = "/toSetUpProject", method = RequestMethod.GET)
-	public Result toSetUpProject(String orderNo,String buyerName){
-		Result res = new Result();
-		ProjectListBo bo = new ProjectListBo();
-		bo.setOrderNo(orderNo);
-		bo.setBuyerName(buyerName);
-		bo.setSignDate(DateFormatUtils.format(new Date(), AFTConstants.YYYYMMDDHHMMSS));
-		res.setData(bo);
-		return res;
-	}
-	
 	/** 项目立项 **/
 	@RequestMapping(value = "/setUpProject", method = RequestMethod.GET)
-	public Result setUpProject(String orderNo,String signDate,String signComment){
+	public Result setUpProject(String orderNo,String signComment){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单编号"));
 			return res;
 		}
-		orderServiceImpl.updateSetUpProject(orderNo,signDate,signComment);
+		orderServiceImpl.updateSetUpProject(orderNo,signComment);
 		return res;
 	}
 	
@@ -890,4 +877,21 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateProjectTask(task);
 		return res;
 	}
+	
+	/**
+	 * 撤项或结项
+	 * @param contractId
+	 * @param operatorType
+	 * @return
+	 */
+	@RequestMapping(value = "/revokeOrComplete",method = RequestMethod.GET)
+	public Result revokeOrComplete(String contractId,Integer operatorType,String completeComment){
+		Result res = new Result();
+		if(StringUtils.isBlank(contractId) || operatorType == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号和操作类型"));
+			return res;
+		}
+		techProjectService.updateRevokeOrComplete(contractId,operatorType,completeComment);
+		return res;
+	}
 }

+ 8 - 0
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -135,4 +135,12 @@ public interface TechProjectService {
 	 * @return
 	 */
 	int deleteProjectTask(String taskId);
+
+	/**
+	 * 撤项和结项
+	 * @param contractId
+	 * @param operatorType
+	 * @return
+	 */
+	int updateRevokeOrComplete(String contractId, Integer operatorType,String completeComment);
 }

+ 21 - 0
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -415,4 +415,25 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		return contractTaskMapper.deleteByPrimaryKey(taskId);
 	}
 
+	@Override
+	public int updateRevokeOrComplete(String contractId, Integer operatorType,String completeComment) {
+		Contract contract = contractMapper.selectByPrimaryKey(contractId);
+		Date updateTime = new Date();
+		if(contract != null){
+			if(contract.getStatus() != ProjectStage.ALREADY_SET_UP.getCode()){
+				throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, contractId, ""));
+			}
+			if(operatorType == 0){ // 撤项
+				contract.setStatus(ProjectStage.CANCEL.getCode());
+			}else if(operatorType == 1){ // 结项
+				contract.setCompleteComment(completeComment);
+				contract.setStatus(ProjectStage.FINISH.getCode());
+				contract.setCompleteDate(updateTime);
+			}
+			contract.setUpdateTime(updateTime);
+			return contractMapper.updateByPrimaryKeySelective(contract);
+		}
+		return 0;
+	}
+
 }