朱园亮 / xingyun-erp · Commits

Commit eb07c1f360dd1437a92a79994be59d91bd23cda9

Authored by yeqianyong
1 parent 1cd1468f

楚江ERP-订货单变更记录详情调整

Inline Side-by-side
Showing 2 changed files with 8 additions and 14 deletions
... ... @@ -41,13 +41,13 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
41 41 * 订货开始日期
42 42 */
43 43 @ApiModelProperty("订货开始日期")
44   - private String orderDateStart;
  44 + private String createStartTime;
45 45
46 46 /**
47 47 * 订货结束日期
48 48 */
49 49 @ApiModelProperty("订货结束日期")
50   - private String orderDateEnd;
  50 + private String createEndTime;
51 51
52 52 /**
53 53 * 状态
... ...
... ... @@ -92,33 +92,27 @@
92 92 <include refid="OrderChangeRecord_sql"/>
93 93 <where>
94 94 <if test="vo.orderNo != null and vo.orderNo != ''">
95   - AND tb.order_no = #{vo.orderNo}
  95 + AND tb.order_no LIKE CONCAT('%', #{vo.orderNo},'%')
96 96 </if>
97 97 <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
98 98 AND cu.name LIKE CONCAT('%', #{vo.orderingUnitName},'%')
99 99 </if>
100   - <if test="vo.orderDateStart != null">
101   - AND tb.order_date >= #{vo.orderDateStart}
  100 + <if test="vo.createStartTime != null">
  101 + AND tb.create_time >= #{vo.createStartTime}
102 102 </if>
103   - <if test="vo.orderDateEnd != null">
  103 + <if test="vo.createEndTime != null">
104 104 <![CDATA[
105   - AND tb.order_date <= #{vo.orderDateEnd}
  105 + AND tb.create_time <= #{vo.createEndTime}
106 106 ]]>
107 107 </if>
108   - <if test="vo.status != null and vo.status != ''">
109   - AND tb.status = #{vo.status}
110   - </if>
111 108 <if test="vo.examineStatus != null and vo.examineStatus != ''">
112 109 AND tb.examine_status = #{vo.examineStatus}
113 110 </if>
114   - <if test="vo.revokeStatus != null and vo.revokeStatus != ''">
115   - AND tb.revoke_status = #{vo.revokeStatus}
116   - </if>
117 111 <if test="vo.deptId != null and vo.deptId != ''">
118 112 AND tb.dept_id = #{vo.deptId}
119 113 </if>
120 114 <if test="vo.deptName != null and vo.deptName != ''">
121   - AND sd.name = #{vo.deptName}
  115 + AND sd.name LIKE CONCAT('%', #{vo.deptName},'%')
122 116 </if>
123 117 <if test="vo.workshopId != null and vo.workshopId != ''">
124 118 AND tb.workshop_id = #{vo.workshopId}
... ...