anderx лет назад: 4
Родитель
Сommit
b2421e3fb6

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

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

+ 76 - 0
src/main/java/com/goafanti/common/mapper/TOrderAssistMapper.xml

@@ -0,0 +1,76 @@
+<?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.TOrderAssistMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderAssist">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, order_no, aid, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_order_assist
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from t_order_assist
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderAssist" useGeneratedKeys="true">
+    insert into t_order_assist (order_no, aid, create_time
+      )
+    values (#{orderNo,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderAssist" useGeneratedKeys="true">
+    insert into t_order_assist
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderAssist">
+    update t_order_assist
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,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.TOrderAssist">
+    update t_order_assist
+    set order_no = #{orderNo,jdbcType=VARCHAR},
+      aid = #{aid,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 64 - 0
src/main/java/com/goafanti/common/model/TOrderAssist.java

@@ -0,0 +1,64 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * t_order_assist
+ * @author 
+ */
+public class TOrderAssist implements Serializable {
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 协单人编号
+     */
+    private String aid;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 4 - 0
src/main/java/com/goafanti/order/bo/assistListBo.java

@@ -0,0 +1,4 @@
+package com.goafanti.order.bo;
+
+public class assistListBo {
+}

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

@@ -11,9 +11,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.model.TOrderAssist;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.*;
+import com.goafanti.order.service.OrderAssistService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.constant.ErrorConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,6 +40,8 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	
 	@Autowired
 	private OrderNewService orderNewService;
+	@Autowired
+	private OrderAssistService orderAssistService;
 	@Value(value = "${upload.path}")
 	private String	uploadPath			= null;
 	/**
@@ -618,4 +623,38 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return excelUtil.exportExcel(list,"签单省份统计表",uploadPath,sb.substring(0,sb.toString().length()-1));
 	}
 
+
+	/**
+	 * 新增协单人员
+	 * @param in
+	 * @return
+	 */
+	@RequestMapping(value = "/addAssist",method = RequestMethod.POST)
+	public Result addAssist(TOrderAssist in){
+		Result res = new Result();
+		if (in.getAid()==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"协单人"));
+			return res;
+		}
+		if (in.getOrderNo()==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
+			return res;
+		}
+		return res.data(orderAssistService.addAssist(in));
+	}
+
+	/**
+	 * 协单人员列表
+	 * @return
+	 */
+	@RequestMapping(value = "/assistList",method = RequestMethod.GET)
+	public Result assistList(String orderNo){
+		Result res = new Result();
+		if (orderNo==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
+			return res;
+		}
+		return res.data(orderAssistService.assistList(orderNo));
+	}
+
 }

+ 12 - 0
src/main/java/com/goafanti/order/service/OrderAssistService.java

@@ -0,0 +1,12 @@
+package com.goafanti.order.service;
+
+import com.goafanti.common.model.TOrderAssist;
+import com.goafanti.order.bo.assistListBo;
+
+import java.util.List;
+
+public interface OrderAssistService {
+    int addAssist(TOrderAssist in);
+
+    List<assistListBo> assistList(String orderNo);
+}

+ 26 - 0
src/main/java/com/goafanti/order/service/impl/OrderAssistServiceImpl.java

@@ -0,0 +1,26 @@
+package com.goafanti.order.service.impl;
+
+import com.goafanti.common.dao.TOrderAssistMapper;
+import com.goafanti.common.model.TOrderAssist;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.order.bo.assistListBo;
+import com.goafanti.order.service.OrderAssistService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OrderAssistServiceImpl extends BaseMybatisDao<TOrderAssistMapper> implements OrderAssistService {
+    @Autowired
+    private TOrderAssistMapper tOrderAssistMapper;
+    @Override
+    public int addAssist(TOrderAssist in) {
+        return tOrderAssistMapper.insertSelective(in);
+    }
+
+    @Override
+    public List<assistListBo> assistList(String orderNo) {
+        return null;
+    }
+}