Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalOrderInfo.java

@@ -2,6 +2,7 @@ package com.iamberry.rst.core.approval;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 审批订单信息表
@@ -11,6 +12,7 @@ public class ApprovalOrderInfo implements Serializable {
     private static final long serialVersionUID = -6637217889680405558L;
     private Integer approvalId;//
     private String applicantName;//申请人姓名
+    private Integer applicantId;//申请人id
     private String orderName;//订单名称
     private Integer companyName;//客户公司名称
     private String contactName;//客户联系人姓名
@@ -25,6 +27,9 @@ public class ApprovalOrderInfo implements Serializable {
     private String approvalDesc;//备注信息
     private Date approvalCreateTime;//创建时间
     private Date approvalUpdateTime;//修改时间
+    private List<ApprovalOrderItem> approvalOrderItemList;//审核订单项集合
+    private String adminName;//发起人姓名(发起人管理员姓名)
+    private String currentAdminName;//当前审核人姓名
 
     public Integer getApprovalId() {
         return approvalId;
@@ -153,4 +158,36 @@ public class ApprovalOrderInfo implements Serializable {
     public void setApprovalUpdateTime(Date approvalUpdateTime) {
         this.approvalUpdateTime = approvalUpdateTime;
     }
+
+    public List<ApprovalOrderItem> getApprovalOrderItemList() {
+        return approvalOrderItemList;
+    }
+
+    public void setApprovalOrderItemList(List<ApprovalOrderItem> approvalOrderItemList) {
+        this.approvalOrderItemList = approvalOrderItemList;
+    }
+
+    public Integer getApplicantId() {
+        return applicantId;
+    }
+
+    public void setApplicantId(Integer applicantId) {
+        this.applicantId = applicantId;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+
+    public String getCurrentAdminName() {
+        return currentAdminName;
+    }
+
+    public void setCurrentAdminName(String currentAdminName) {
+        this.currentAdminName = currentAdminName;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalRecord.java

@@ -12,6 +12,7 @@ public class ApprovalRecord implements Serializable {
     private Integer recordId;//
     private String approvalName;//审核人姓名
     private Integer adminId;//审核人id（管理员id）
+    private Integer approvalId;//审批订单id
     private Integer recordState;//审核状态1 待审核 2. 审核通过 3,拒绝申请4.删除申请
     private Date approvalTime;//审核时间
     private String approvalDesc;//审批备注
@@ -73,4 +74,20 @@ public class ApprovalRecord implements Serializable {
     public void setRecordUpdateTime(Date recordUpdateTime) {
         this.recordUpdateTime = recordUpdateTime;
     }
+
+    public Integer getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Integer recordId) {
+        this.recordId = recordId;
+    }
+
+    public Integer getApprovalId() {
+        return approvalId;
+    }
+
+    public void setApprovalId(Integer approvalId) {
+        this.approvalId = approvalId;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApprovalOrderService.java

@@ -0,0 +1,52 @@
+package com.iamberry.rst.faces.approval;
+
+import com.iamberry.rst.core.approval.ApplyPickItem;
+import com.iamberry.rst.core.approval.ApprovalOrderInfo;
+import com.iamberry.rst.core.approval.ApprovalOrderItem;
+import com.iamberry.rst.core.approval.ApprovalRecord;
+
+import java.util.List;
+
+/**
+ *  提货项信息接口
+ * @author
+ * @Date 2018-09-19
+ */
+public interface ApprovalOrderService {
+    /**
+     * 添加审批订单
+     * @return
+     */
+    int insert(ApprovalOrderInfo approvalOrderInfo);
+
+    /**
+     * 批量添加审批订单
+     * @return
+     */
+    int insertItem(List<ApprovalOrderItem> listApprovalOrderItem);
+    /**
+     * 添加审批记录
+     * @return
+     */
+    int insertRecord(ApprovalRecord approvalRecord);
+    /**
+     * 查询审批订单记录
+     * @return
+     */
+    List<ApprovalOrderInfo> listApprovalOrderInfo(ApprovalOrderInfo ApprovalOrderInfo);
+    /**
+     * 查询审批订单项记录
+     * @return
+     */
+    List<ApprovalOrderItem> listApprovalOrderItem(Integer approvalId);
+    /**
+     * 修改审批订单
+     * @return
+     */
+    int update(ApprovalOrderInfo ApprovalOrderInfo);
+    /**
+     * 删除订单项
+     * @return
+     */
+    int deleteItem(Integer approvalId);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -0,0 +1,60 @@
+package com.iamberry.rst.service.approval;
+
+import com.iamberry.rst.core.approval.ApplyPickItem;
+import com.iamberry.rst.core.approval.ApprovalOrderInfo;
+import com.iamberry.rst.core.approval.ApprovalOrderItem;
+import com.iamberry.rst.core.approval.ApprovalRecord;
+import com.iamberry.rst.faces.approval.ApplyPickItemService;
+import com.iamberry.rst.faces.approval.ApprovalOrderService;
+import com.iamberry.rst.service.approval.mapper.ApplyPickItemMapper;
+import com.iamberry.rst.service.approval.mapper.ApprovalOrderMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  提货项信息接口
+ * @author
+ * @Date 2018-09-19
+ */
+@Service
+public class ApprovalOrderServiceImpl implements ApprovalOrderService {
+    @Autowired
+    private ApprovalOrderMapper approvalOrderMapper;
+
+    @Override
+    public int insert(ApprovalOrderInfo approvalOrderInfo) {
+        return approvalOrderMapper.insert(approvalOrderInfo);
+    }
+
+    @Override
+    public int insertItem(List<ApprovalOrderItem> listApprovalOrderItem) {
+        return approvalOrderMapper.insertItem(listApprovalOrderItem);
+    }
+
+    @Override
+    public int insertRecord(ApprovalRecord approvalRecord) {
+        return approvalOrderMapper.insertRecord(approvalRecord);
+    }
+
+    @Override
+    public List<ApprovalOrderInfo> listApprovalOrderInfo(ApprovalOrderInfo ApprovalOrderInfo) {
+        return approvalOrderMapper.listApprovalOrderInfo(ApprovalOrderInfo);
+    }
+
+    @Override
+    public List<ApprovalOrderItem> listApprovalOrderItem(Integer approvalId) {
+        return approvalOrderMapper.listApprovalOrderItem(approvalId);
+    }
+
+    @Override
+    public int update(ApprovalOrderInfo ApprovalOrderInfo) {
+        return approvalOrderMapper.update(ApprovalOrderInfo);
+    }
+
+    @Override
+    public int deleteItem(Integer approvalId) {
+        return approvalOrderMapper.deleteItem(approvalId);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/ApprovalOrderMapper.java

@@ -0,0 +1,51 @@
+package com.iamberry.rst.service.approval.mapper;
+
+
+import com.iamberry.rst.core.approval.ApprovalOrderInfo;
+import com.iamberry.rst.core.approval.ApprovalOrderItem;
+import com.iamberry.rst.core.approval.ApprovalRecord;
+
+import java.util.List;
+
+/**
+ * 审批-审批订单mapper
+ */
+public interface ApprovalOrderMapper {
+
+    /**
+     * 添加审批订单
+     * @return
+     */
+    int insert(ApprovalOrderInfo approvalOrderInfo);
+
+    /**
+     * 批量添加审批订单
+     * @return
+     */
+    int insertItem(List<ApprovalOrderItem> listApprovalOrderItem);
+    /**
+     * 添加审批记录
+     * @return
+     */
+    int insertRecord(ApprovalRecord approvalRecord);
+    /**
+     * 查询审批订单记录
+     * @return
+     */
+    List<ApprovalOrderInfo> listApprovalOrderInfo(ApprovalOrderInfo ApprovalOrderInfo);
+    /**
+     * 查询审批订单项记录
+     * @return
+     */
+    List<ApprovalOrderItem> listApprovalOrderItem(Integer approvalId);
+    /**
+     * 修改审批订单
+     * @return
+     */
+    int update(ApprovalOrderInfo ApprovalOrderInfo);
+    /**
+     * 删除订单项
+     * @return
+     */
+    int deleteItem(Integer approvalId);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -1,6 +1,6 @@
 <?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.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper" >
+<mapper namespace="com.iamberry.rst.service.approval.mapper.ApprovalOrderMapper" >
   <resultMap id="BaseResultMap" type="ApprovalOrderInfo" >
     <id column="approval_id" property="approvalId" jdbcType="INTEGER" />
     <result column="applicant_name" property="applicantName" jdbcType="VARCHAR" />
@@ -19,6 +19,7 @@
     <result column="approval_desc" property="approvalDesc" jdbcType="VARCHAR" />
     <result column="approval_create_time" property="approvalCreateTime" jdbcType="TIMESTAMP" />
     <result column="approval_update_time" property="approvalUpdateTime" jdbcType="TIMESTAMP" />
+    <collection property="approvalOrderItemList" column="approval_id" ofType="ApprovalOrderItem" select="listApprovalOrderItem"/>
   </resultMap>
   <sql id="approval_order_column_List" >
     approval_id, applicant_name,applicant_id, order_name,company_name,contact_name,
@@ -34,7 +35,7 @@
   </sql>
 
   <sql id="approval_record_column_List" >
-    record_id,approval_name,admin_id,record_state,approval_time,approval_desc,record_create_time,record_update_time
+    record_id,approval_name,admin_id,approval_id,record_state,approval_time,approval_desc,record_create_time,record_update_time
   </sql>
 
 <insert id="insert" parameterType="ApprovalOrderInfo"  useGeneratedKeys="true" keyProperty="approvalId">
@@ -46,10 +47,10 @@
     (#{approvalId},(#{applicantName},#{applicantId},#{orderName},#{companyName}
     ,#{contactName},#{contactTel},#{deliveryTime},#{deliveryWay}
     ,#{contractName},#{contractImg},#{attachmentImg},#{approvalState}
-    ,#{currentAdminId},#{approvalDesc},#{approvalCreateTime})
+    ,#{currentAdminId},#{approvalDesc},NOW())
 </insert>
   <!-- 批量添加订单项数据 -->
-  <insert id="insertItem" parameterType="orderItem">
+  <insert id="insertItem" parameterType="ArrayList">
     INSERT INTO tb_rst_approval_order_item
     (
     approval_id,
@@ -67,4 +68,116 @@
       )
     </foreach>
   </insert>
+
+  <insert id="insertRecord" parameterType="ApprovalRecord">
+    INSERT INTO tb_rst_approval_order(
+    approval_name,
+    admin_id,
+    record_state,
+    approval_time,
+    approval_desc,
+    record_create_time
+    )
+    VALUES
+    (#{approvalName},
+    (#{adminId},#{recordState},
+    #{approvalTime},
+    #{approvalDesc},
+    #{recordCreateTime})
+  </insert>
+
+  <select id="listApprovalOrderInfo" parameterType="ApprovalOrderInfo" resultMap="BaseResultMap">
+    SELECT
+      ao.approval_id,
+      ao.applicant_name,
+      ao.applicant_id,
+      ao.order_name,
+      ao.company_name,
+      ao.contact_name,
+      ao.contact_tel,
+      ao.delivery_time,
+      ao.delivery_way,
+      ao.contract_name,
+      ao.contract_img,
+      ao.attachment_img,
+      ao.approval_state,
+      ao.current_admin_id,
+      ao.approval_desc,
+      ao.approval_create_time,
+      ao.approval_update_time,
+      sa.admin_name AS currentAdminName
+    from tb_rst_approval_order ao
+    LEFT JOIN  tb_rst_sys_admin sa ON ao.current_admin_id = sa.admin_id
+    <where>
+      <if test="applicantId != null and applicantId != ''">
+        ao.applicant_id = #{applicantId}
+      </if>
+      <if test="currentAdminId != null and currentAdminId != ''">
+        OR ao.current_admin_id = #{currentAdminId}
+      </if>
+      <if test="approvalState != null and approvalState != ''">
+        OR ao.approval_state = #{approvalState}
+      </if>
+      <if test="approvalId != null and approvalId != ''">
+        OR ao.approval_id = #{approvalId}
+      </if>
+    </where>
+  </select>
+
+  <select id="listApprovalOrderItem" parameterType="Integer" resultType="ApprovalOrderItem">
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM tb_rst_approval_order_item
+    WHERE approval_id = #{approvalId}
+  </select>
+
+  <update id="update" parameterType="ApprovalOrderInfo">
+    update tb_rst_approval_order
+    <set >
+      <if test="applicantName != null" >
+        applicant_name = #{applicantName},
+      </if>
+      <if test="applicantId != null" >
+        applicant_id = #{applicantId},
+      </if>
+      <if test="orderName != null" >
+        order_name = #{orderName},
+      </if>
+      <if test="companyName != null" >
+        company_name = #{companyName},
+      </if>
+      <if test="contactTel != null" >
+        contact_tel = #{contactTel},
+      </if>
+      <if test="deliveryTime != null" >
+        delivery_time = #{deliveryTime},
+      </if>
+      <if test="deliveryWay != null" >
+        delivery_way = #{deliveryWay},
+      </if>
+      <if test="contractName != null" >
+        contract_name = #{contractName},
+      </if>
+      <if test="contractImg != null" >
+        contract_img = #{contractImg},
+      </if>
+      <if test="attachmentImg != null" >
+        attachment_img = #{attachmentImg},
+      </if>
+      <if test="approvalState != null" >
+        approval_state = #{approvalState},
+      </if>
+      <if test="currentAdminId != null" >
+        current_admin_id = #{currentAdminId},
+      </if>
+      <if test="approvalDesc != null" >
+        approval_desc = #{approvalDesc}
+      </if>
+    </set>
+    where approval_id = #{approvalId}
+  </update>
+
+  <delete id="deleteItem" parameterType="Integer">
+    DELETE FROM tb_rst_approval_order_item where approval_id = #{approvalId}
+  </delete>
 </mapper>

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -194,5 +194,6 @@
 
 		<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickItemMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml"/>
 	</mappers>
 </configuration>