增加教材管理-详情-出库记录

src/main/java/com/xjrsoft/module/textbook/vo/TextbookIssueRecordListVo.java

@@ -15,25 +15,31 @@ import java.util.Date;
 public class TextbookIssueRecordListVo {
 
     /**
-    * 主键编号
+    * 出库时间
     */
-    @ApiModelProperty("入库时间")
-    private Date warehouseDate;
+    @ApiModelProperty("出库时间")
+    private Date issueDate;
     /**
-    * 序号
+    * 出库人员
     */
-    @ApiModelProperty("入库人员")
-    private String warehouseUser;
+    @ApiModelProperty("出库人员")
+    private String issueUser;
     /**
-    * 入库数量
+    * 出库数量
     */
-    @ApiModelProperty("入库数量")
-    private Integer warehouseNumber;
+    @ApiModelProperty("出库数量")
+    private Integer issueNumber;
     /**
-    * 来源
+    * 出库方式
     */
-    @ApiModelProperty("来源")
-    private String source;
+    @ApiModelProperty("出库方式")
+    private String issueMode;
+
+    /**
+     * 出库方式
+     */
+    @ApiModelProperty("去处")
+    private String remark;
 
 
 

src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -68,9 +68,12 @@
         WHERE t1.delete_mark = 0 AND t1.textbook_id = #{id} order by t1.sort_code
     </select>
     <select id="issueList" resultType="com.xjrsoft.module.textbook.vo.TextbookIssueRecordListVo">
-        SELECT t1.create_date AS issue_date,t2.name AS issue_user,t1.issue_number FROM textbook_issue_record t1
+        SELECT t1.create_date AS issue_date,t2.name AS issue_user,t1.issue_number,t6.name AS issue_mode,t1.remark FROM textbook_issue_record t1
         LEFT JOIN xjr_user t2 ON t1.create_user_id = t2.id
         LEFT JOIN wf_textbook_claim_item t3 ON t1.wf_textbook_claim_item_id = t3.id
+        LEFT JOIN wf_textbook_recede_item t4 ON t3.textbook_id = t4.textbook_id
+        LEFT JOIN wf_textbook_recede t5 ON t5.id = t4.wf_textbook_recede_id
+        LEFT JOIN xjr_dictionary_detail t6 ON t6.code = t1.issue_mode AND t6.item_id = 1739821685805215745
         WHERE t1.delete_mark = 0 AND t3.textbook_id = #{id} ORDER BY t1.sort_code;
     </select>
     <select id="claimList" resultType="com.xjrsoft.module.textbook.vo.WfTextbookClaimListVo">