Bladeren bron

项目拆分开发

Signed-off-by: anderx <312518615@qq.com>
anderx 5 jaren geleden
bovenliggende
commit
e2db504c10

+ 3 - 3
GeneratorConfig.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-  <!-- <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" /> -->
-   <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" />
+   <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" /> 
+   <!-- <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" /> -->
   <context id="context1">	
-    <jdbcConnection connectionURL="jdbc:mysql://101.37.32.31:3306/aft" 
+     <jdbcConnection connectionURL="jdbc:mysql://101.37.32.31:3306/aft"  
     	driverClass="com.mysql.jdbc.Driver" password="dev123456" userId="dev" />
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />

+ 14 - 14
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -12,85 +12,85 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	long countByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int deleteByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	List<TOrderTask> selectByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

File diff suppressed because it is too large
+ 1589 - 1265
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml


File diff suppressed because it is too large
+ 226 - 111
src/main/java/com/goafanti/common/model/TOrderTask.java


+ 326 - 16
src/main/java/com/goafanti/common/model/TOrderTaskExample.java

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public TOrderTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2510,11 +2510,321 @@ public class TOrderTaskExample {
 			addCriterion("outsource not between", value1, value2, "outsource");
 			return (Criteria) this;
 		}
+
+		public Criteria andSplitSuperIsNull() {
+			addCriterion("split_super is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperIsNotNull() {
+			addCriterion("split_super is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperEqualTo(Integer value) {
+			addCriterion("split_super =", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotEqualTo(Integer value) {
+			addCriterion("split_super <>", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperGreaterThan(Integer value) {
+			addCriterion("split_super >", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_super >=", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperLessThan(Integer value) {
+			addCriterion("split_super <", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperLessThanOrEqualTo(Integer value) {
+			addCriterion("split_super <=", value, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperIn(List<Integer> values) {
+			addCriterion("split_super in", values, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotIn(List<Integer> values) {
+			addCriterion("split_super not in", values, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperBetween(Integer value1, Integer value2) {
+			addCriterion("split_super between", value1, value2, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitSuperNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_super not between", value1, value2, "splitSuper");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusIsNull() {
+			addCriterion("split_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusIsNotNull() {
+			addCriterion("split_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusEqualTo(Integer value) {
+			addCriterion("split_status =", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusNotEqualTo(Integer value) {
+			addCriterion("split_status <>", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusGreaterThan(Integer value) {
+			addCriterion("split_status >", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_status >=", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusLessThan(Integer value) {
+			addCriterion("split_status <", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("split_status <=", value, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusIn(List<Integer> values) {
+			addCriterion("split_status in", values, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusNotIn(List<Integer> values) {
+			addCriterion("split_status not in", values, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusBetween(Integer value1, Integer value2) {
+			addCriterion("split_status between", value1, value2, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_status not between", value1, value2, "splitStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdIsNull() {
+			addCriterion("split_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdIsNotNull() {
+			addCriterion("split_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdEqualTo(Integer value) {
+			addCriterion("split_id =", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdNotEqualTo(Integer value) {
+			addCriterion("split_id <>", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdGreaterThan(Integer value) {
+			addCriterion("split_id >", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("split_id >=", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdLessThan(Integer value) {
+			addCriterion("split_id <", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdLessThanOrEqualTo(Integer value) {
+			addCriterion("split_id <=", value, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdIn(List<Integer> values) {
+			addCriterion("split_id in", values, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdNotIn(List<Integer> values) {
+			addCriterion("split_id not in", values, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdBetween(Integer value1, Integer value2) {
+			addCriterion("split_id between", value1, value2, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("split_id not between", value1, value2, "splitId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidIsNull() {
+			addCriterion("split_aid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidIsNotNull() {
+			addCriterion("split_aid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidEqualTo(String value) {
+			addCriterion("split_aid =", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidNotEqualTo(String value) {
+			addCriterion("split_aid <>", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidGreaterThan(String value) {
+			addCriterion("split_aid >", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidGreaterThanOrEqualTo(String value) {
+			addCriterion("split_aid >=", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidLessThan(String value) {
+			addCriterion("split_aid <", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidLessThanOrEqualTo(String value) {
+			addCriterion("split_aid <=", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidLike(String value) {
+			addCriterion("split_aid like", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidNotLike(String value) {
+			addCriterion("split_aid not like", value, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidIn(List<String> values) {
+			addCriterion("split_aid in", values, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidNotIn(List<String> values) {
+			addCriterion("split_aid not in", values, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidBetween(String value1, String value2) {
+			addCriterion("split_aid between", value1, value2, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitAidNotBetween(String value1, String value2) {
+			addCriterion("split_aid not between", value1, value2, "splitAid");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeIsNull() {
+			addCriterion("split_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeIsNotNull() {
+			addCriterion("split_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeEqualTo(Date value) {
+			addCriterion("split_time =", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeNotEqualTo(Date value) {
+			addCriterion("split_time <>", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeGreaterThan(Date value) {
+			addCriterion("split_time >", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("split_time >=", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeLessThan(Date value) {
+			addCriterion("split_time <", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeLessThanOrEqualTo(Date value) {
+			addCriterion("split_time <=", value, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeIn(List<Date> values) {
+			addCriterion("split_time in", values, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeNotIn(List<Date> values) {
+			addCriterion("split_time not in", values, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeBetween(Date value1, Date value2) {
+			addCriterion("split_time between", value1, value2, "splitTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andSplitTimeNotBetween(Date value1, Date value2) {
+			addCriterion("split_time not between", value1, value2, "splitTime");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Mar 05 14:35:19 CST 2020
+	 * @mbg.generated  Mon Mar 16 11:29:15 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 18 - 0
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -195,6 +195,24 @@ public class OrderProjectApiController extends CertifyApiController {
 		res.setData(orderProjectService.selectTaskProgress(tid));
 		return res;
 	}
+	/**
+	 * 	拆分项目
+	 */
+	@RequestMapping(value="/splitProject" ,method = RequestMethod.GET)
+	public Result splitProject(Integer tid,String splitList){
+		Result res=new Result();
+		if (null==tid||StringUtils.isBlank(splitList)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"项目和拆分数","项目和拆分数"));
+			return res;
+		}
+		int i=orderProjectService.pushsplitProject(tid,splitList);
+		if (i==-1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"拆分数","拆分数"));
+			return res;
+		}
+		res.setData(i);
+		return res;
+	}
 	
 	
 	/**

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -50,4 +50,6 @@ public interface OrderProjectService {
 	void exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize)throws IOException ;
 
 	void checkProjiectAllocation(String orderNo);
+
+	int pushsplitProject(Integer tid, String splitList);
 }

+ 32 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -622,5 +622,37 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		
 	}
 	
+	@Override
+	public int pushsplitProject(Integer tid, String splitList) {
+			String[] str=splitList.split(",");
+			TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(tid);
+			TOrderTask usedTask=new TOrderTask();
+			usedTask.setId(tid);
+			usedTask.setSplitStatus(1);
+			tOrderTaskMapper.updateByPrimaryKeySelective(usedTask);
+			//计算拆分数量
+			Integer x=0;
+			for (String string : str) {
+				x+=Integer.getInteger(string);
+			}
+			if (task.getCommodityQuantity()!=x) {
+				return -1;
+			}
+			int i=1;
+			TOrderTask newTask=task;
+			newTask.setCommodityPrice(new BigDecimal(0));
+			newTask.setSplitAid(TokenManager.getAdminId());
+			newTask.setSplitStatus(2);
+			newTask.setSplitSuper(tid);
+			newTask.setSplitTime(new Date());
+			for (String string : str) {
+				newTask.setCommodityQuantity(Integer.getInteger(string));
+				newTask.setSplitId(i);
+				i++;
+				tOrderTaskMapper.insertSelective(newTask);
+			}
+		return 1;
+	}
+	
 	
 }