Browse Source

版本切换

anderx 3 years ago
parent
commit
80fc6c2134

+ 17 - 0
src/main/java/com/goafanti/common/dao/TTaskMemberMapper.java

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TTaskMember;
+
+public interface TTaskMemberMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TTaskMember record);
+
+    int insertSelective(TTaskMember record);
+
+    TTaskMember selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TTaskMember record);
+
+    int updateByPrimaryKey(TTaskMember record);
+}

+ 93 - 0
src/main/java/com/goafanti/common/mapper/TTaskMemberMapper.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.TTaskMemberMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TTaskMember">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="service_life" jdbcType="VARCHAR" property="serviceLife" />
+    <result column="service_year" jdbcType="VARCHAR" property="serviceYear" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, tid, service_life, service_year, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_task_member
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from t_task_member
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TTaskMember">
+    insert into t_task_member (id, tid, service_life, 
+      service_year, create_time)
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR}, 
+      #{serviceYear,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TTaskMember">
+    insert into t_task_member
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="serviceLife != null">
+        service_life,
+      </if>
+      <if test="serviceYear != null">
+        service_year,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="serviceLife != null">
+        #{serviceLife,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceYear != null">
+        #{serviceYear,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TTaskMember">
+    update t_task_member
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="serviceLife != null">
+        service_life = #{serviceLife,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceYear != null">
+        service_year = #{serviceYear,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TTaskMember">
+    update t_task_member
+    set tid = #{tid,jdbcType=INTEGER},
+      service_life = #{serviceLife,jdbcType=VARCHAR},
+      service_year = #{serviceYear,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 77 - 0
src/main/java/com/goafanti/common/model/TTaskMember.java

@@ -0,0 +1,77 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * t_task_member
+ * @author 
+ */
+public class TTaskMember implements Serializable {
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 项目id
+     */
+    private Integer tid;
+
+    /**
+     * 服务年限
+     */
+    private String serviceLife;
+
+    /**
+     * 本次年份
+     */
+    private String serviceYear;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTid() {
+        return tid;
+    }
+
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(String serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 24 - 0
src/main/java/com/goafanti/order/bo/InputAddTask.java

@@ -0,0 +1,24 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TOrderTask;
+
+public class InputAddTask  extends TOrderTask {
+    private String serviceLife;
+    private String serviceYear;
+
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(String serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+}

+ 4 - 4
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -97,17 +97,17 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 添加项目
 	 */
 	@RequestMapping(value = "/addOrderTask",method = RequestMethod.POST)
-	public Result addOrderTask(TOrderTask t){
+	public Result addOrderTask(InputAddTask in){
 		Result res = new Result();
-		if(StringUtils.isBlank(t.getOrderNo())){
+		if(StringUtils.isBlank(in.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		if (t.getOrderNo()!=null&&orderNewService.checkOrderMain(t)) {
+		if (in.getOrderNo()!=null&&orderNewService.checkOrderMain(in)) {
 			res.getError().add(buildError("订单主要任务已存在","订单主要任务已存在"));
 			return res;
 		}
-		return res.data(orderNewService.addOrderTask(t));
+		return res.data(orderNewService.addOrderTask(in));
 	}
 	/**
 	 * 修改项目(营销员)

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

@@ -490,7 +490,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/addMemberProject" ,method = RequestMethod.POST)
-	public Result addMemberProject(TOrderTask t){
+	public Result addMemberProject(InputAddTask t){
 		Result res = new Result();
 		if(org.apache.commons.lang3.StringUtils.isBlank(t.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));

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

@@ -26,9 +26,9 @@ public interface OrderNewService {
 	 * 创建项目
 	 * @param t
 	 */
-	int addOrderTask(TOrderTask t);
+	int addOrderTask(InputAddTask t);
 
-	int addMemberProject(TOrderTask t);
+	int addMemberProject(InputAddTask t);
 	/**
 	 * 修改项目信息
 	 * @param t

+ 14 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -129,6 +129,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private BusinessCategoryMapper businessCategoryMapper;
 	@Autowired
 	private OrderProjectService orderProjectService;
+	@Autowired
+	private TTaskMemberMapper tTaskMemberMapper;
+
+
 	@Value(value = "${upload.path}")
 	private String					uploadPath			= null;
 
@@ -177,7 +181,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public int addOrderTask(TOrderTask t) {
+	public int addOrderTask(InputAddTask t) {
 		TOrderNew order=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		checkOrder(order,t);
 		t.setTaskStatus(TaskState.WFP.getCode());
@@ -186,6 +190,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
 		t.setCname(str);
 		tOrderTaskMapper.insertSelective(t);
+		if (t.getServiceLife()!=null&&t.getServiceYear()!=null){
+			TTaskMember ttm=new TTaskMember();
+			ttm.setTid(t.getId());
+			ttm.setServiceLife(t.getServiceLife());
+			ttm.setServiceYear(t.getServiceYear());
+			tTaskMemberMapper.insertSelective(ttm);
+		}
 		TTaskMid tm=new TTaskMid();
 		tm.setTid(t.getId());
 		//判断这个项目是不是高新复审
@@ -212,9 +223,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public int addMemberProject(TOrderTask t){
+	public int addMemberProject(InputAddTask t){
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
-		addOrderTask( t);
+		addOrderTask(t);
 		orderProjectService.addMemberLog(t.getId(),0,"新增会员项目");
 		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null,0);
 		return 1;