提货列表

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

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.approval;
+
+import com.iamberry.rst.core.approval.HistoricalRecord;
+
+import java.util.List;
+
+/**
+ *  接口
+ * @author
+ * @Date 2018-10-26
+ */
+public interface HistoricalRecordService {
+    /**
+     * 获取集合
+     * @param  historicalRecord
+     * @return List
+     */
+    List<HistoricalRecord> getHistoricalRecordList(HistoricalRecord  historicalRecord);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  historicalRecord
+     */
+    HistoricalRecord  getHistoricalRecordById(Integer  id);
+    /**
+     * 增加数据
+     * @param  historicalRecord
+     * @return Integer
+     */
+    Integer  save(HistoricalRecord  historicalRecord);
+    /**
+     * 修改数据
+     * @param  historicalRecord
+     * @return Integer
+     */
+    Integer  update(HistoricalRecord  historicalRecord);
+}

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

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.approval;
+
+import com.iamberry.rst.core.approval.HistoricalRecord;
+import com.iamberry.rst.faces.approval.HistoricalRecordService;
+import com.iamberry.rst.service.approval.mapper.HistoricalRecordMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  接口
+ * @author
+ * @Date 2018-10-26
+ */
+@Service
+public class HistoricalRecordServiceImpl  implements HistoricalRecordService {
+    @Autowired
+    private HistoricalRecordMapper historicalRecordMapper;
+    /**
+     * 获取集合
+     * @param  historicalRecord
+     * @return List
+     */
+    @Override
+    public List<HistoricalRecord> getHistoricalRecordList(HistoricalRecord  historicalRecord){
+        return  historicalRecordMapper.getHistoricalRecordList(historicalRecord);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  historicalRecord
+     */
+    @Override
+    public  HistoricalRecord  getHistoricalRecordById(Integer  id){
+        return  historicalRecordMapper.getHistoricalRecordById(id);
+    }
+    /**
+     * 增加数据
+     * @param  historicalRecord
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(HistoricalRecord  historicalRecord){
+        return  historicalRecordMapper.save(historicalRecord);
+    }
+    /**
+     * 修改数据
+     * @param  historicalRecord
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(HistoricalRecord  historicalRecord){
+        return  historicalRecordMapper.update(historicalRecord);
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.approval.mapper;
+
+import com.iamberry.rst.core.approval.HistoricalRecord;
+
+import java.util.List;
+
+/**
+ *  接口
+ * @author
+ * @Date 2018-10-26
+ */
+public interface HistoricalRecordMapper {
+    /**
+     * 获取集合
+     * @param  historicalRecord
+     * @return List
+     */
+    List<HistoricalRecord> getHistoricalRecordList(HistoricalRecord  historicalRecord);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  historicalRecord
+     */
+    HistoricalRecord  getHistoricalRecordById(Integer  id);
+    /**
+     * 增加数据
+     * @param  historicalRecord
+     * @return Integer
+     */
+    Integer  save(HistoricalRecord  historicalRecord);
+    /**
+     * 修改数据
+     * @param  historicalRecord
+     * @return Integer
+     */
+    Integer  update(HistoricalRecord  historicalRecord);
+}

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

@@ -0,0 +1,91 @@
+<?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.approval.mapper.HistoricalRecordMapper">
+    <resultMap  id="BaseResultMap" type="HistoricalRecord" >
+        <result    column="record_id"    property="recordId" />
+        <result    column="approval_id"    property="approvalId" />
+        <result    column="admin_id"    property="adminId" />
+        <result    column="record_state"    property="recordState" />
+        <result    column="task_id"    property="taskId" />
+        <result    column="approval_time"    property="approvalTime" />
+        <result    column="record_create_time"    property="recordCreateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.record_id,
+        t.approval_id,
+        t.admin_id,
+        t.record_state,
+        t.task_id,
+        t.approval_time,
+        t.record_create_time
+    </sql>
+    <select id="getHistoricalRecordList" resultMap="BaseResultMap" parameterType="HistoricalRecord" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_historical_record t
+        <where>
+            <if test="recordId != null ">
+                AND t.record_id = #{recordId}
+            </if >
+            <if test="approvalId != null ">
+                AND t.approval_id = #{approvalId}
+            </if >
+            <if test="adminId != null ">
+                AND t.admin_id = #{adminId}
+            </if >
+            <if test="recordState != null ">
+                AND t.record_state = #{recordState}
+            </if >
+            <if test="taskId != null and taskId != ''">
+                AND t.task_id = #{taskId}
+            </if >
+        </where>
+    </select>
+    <select id="getHistoricalRecordById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_historical_record t
+        where t.record_id= #{recordId}
+    </select>
+    <insert id="save" parameterType="HistoricalRecord" >
+        insert into
+        tb_rst_historical_record
+        (
+        approval_id,
+        admin_id,
+        record_state,
+        task_id,
+        approval_time
+        )
+        values
+        (
+        #{approvalId},
+        #{adminId},
+        #{recordState},
+        #{taskId},
+        #{approvalTime}
+        )
+    </insert>
+    <update id="update" parameterType="HistoricalRecord" >
+        update
+        tb_rst_historical_record
+        <set >
+            <if test="approvalId != null ">
+                approval_id = #{approvalId},
+            </if >
+            <if test="adminId != null ">
+                admin_id = #{adminId},
+            </if >
+            <if test="recordState != null ">
+                record_state = #{recordState},
+            </if >
+            <if test="taskId != null and taskId != ''">
+                task_id = #{taskId},
+            </if >
+            <if test="approvalTime != null and approvalTime != ''">
+                approval_time = #{approvalTime},
+            </if >
+        </set >
+        where record_id= #{recordId}
+    </update>
+</mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -43,6 +43,8 @@ public class ApplyPickController {
     private ApprovalProductionContractServiceImpl approvalProductionContractService;
     @Autowired
     private ApprovalProductionService approvalProductionService;
+    @Autowired
+    private HistoricalRecordService historicalRecordService;
 
     /**
      * 获取已审批通过的订单
@@ -170,6 +172,9 @@ public class ApplyPickController {
         if(applyPickId == null){
            return new ResponseJson(500, "FAILURE", 500);
         }
+        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        Admin admin = sysService.getByOpenid(openId);
+
         ResponseJson rj = ResponseJson.getSUCCESS();
         ApprovalApplyPick approvalApplyPick = applyPickService.getApprovalApplyPickById(applyPickId);
 
@@ -188,6 +193,7 @@ public class ApplyPickController {
         /*绑定的生产审批信息*/
         ApprovalInfo productionApprovalInfo = approvalOrderService.getApprovalInfoById(approvalApplyPick.getProductionApprovalId());
 
+        /*生产订单信息*/
         ApprovalProduction  ap = new ApprovalProduction();
         ap.setApprovalId(productionApprovalInfo.getApprovalId());
         List<ApprovalProduction> approvalProductionList = approvalProductionService.getApprovalProductionList(ap);
@@ -199,10 +205,19 @@ public class ApplyPickController {
             ap.setListProductionItem(approvalProductionItemList);
             rj.addResponseKeyValue("ApprovalProduction",ap);
         }
+
+        /*获取当前登录人查看当前审批的记录，判断状态*/
+        HistoricalRecord historicalRecord = new HistoricalRecord();
+        historicalRecord.setApprovalId(approvalApplyPick.getApprovalId());
+        historicalRecord.setAdminId(admin.getAdminId());
+        List<HistoricalRecord> historicalRecords = historicalRecordService.getHistoricalRecordList(historicalRecord);
+
         rj.addResponseKeyValue("approvalApplyPick",approvalApplyPick);
         rj.addResponseKeyValue("productionContractList",approvalProductionContractList);
         rj.addResponseKeyValue("approvalInfo",approvalInfo);
         rj.addResponseKeyValue("productionApprovalInfo",productionApprovalInfo);
+        rj.addResponseKeyValue("admin",admin);
+        rj.addResponseKeyValue("historicalRecords",historicalRecords);
         return rj;
     }
 
@@ -242,5 +257,4 @@ public class ApplyPickController {
         }
         return rj;
     }
-
 }

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

@@ -245,6 +245,7 @@
 		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalProductionContractMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalProductionMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/approval/mapper/historicalRecordMapper.xml"/>
 
 		<!--member-->
 		<mapper resource="com/iamberry/rst/service/member/mapper/memberMapper.xml"/>