Commit 33ad92f4e615cc3c5bd4d620db16338772554fcb

Authored by yeqianyong
1 parent 8b4352f3

楚江erp:台账明细列表逻辑调整

... ... @@ -10,6 +10,7 @@ import java.time.LocalDateTime;
10 10 import io.swagger.annotations.ApiModelProperty;
11 11
12 12 import lombok.Data;
  13 +import org.apache.commons.lang3.StringUtils;
13 14
14 15 /**
15 16 * <p>
... ... @@ -230,6 +231,8 @@ public class QueryReceiptLedgerInfoBo extends BaseBo<ReceiptLedgerInfo> {
230 231
231 232 @Override
232 233 protected void afterInit(ReceiptLedgerInfo dto) {
233   -
  234 + if (StringUtils.isNotBlank(dto.getParentId())) {
  235 + this.spilt = true;
  236 + }
234 237 }
235 238 }
... ...
... ... @@ -89,7 +89,6 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
89 89 data.setFourthCoordinateDate(vo.getFourthCoordinateDate());
90 90 data.setFifthCoordinateDate(vo.getFifthCoordinateDate());
91 91 data.setDescription(vo.getDescription());
92   - data.setSpilt(vo.isSpilt());
93 92 getBaseMapper().insert(data);
94 93
95 94 OpLogUtil.setVariable("id", data.getId());
... ... @@ -201,7 +200,6 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
201 200 data.setFourthCoordinateDate(vo.getFourthCoordinateDate());
202 201 data.setFifthCoordinateDate(vo.getFifthCoordinateDate());
203 202 data.setDescription(vo.getDescription());
204   - data.setSpilt(true);
205 203 data.setCreateById(userId);
206 204 data.setUpdateById(userId);
207 205 return data;
... ...
... ... @@ -36,7 +36,6 @@
36 36 <result column="fifth_coordinate_date" property="fifthCoordinateDate"/>
37 37 <result column="description" property="description"/>
38 38 <result column="del_flag" property="delFlag"/>
39   - <result column="spilt" property="spilt"/>
40 39 <result column="create_by_id" property="createById"/>
41 40 <result column="update_by_id" property="updateById"/>
42 41 <result column="create_time" property="createTime"/>
... ... @@ -78,7 +77,6 @@
78 77 tb.fifth_coordinate_date,
79 78 tb.description,
80 79 tb.del_flag,
81   - tb.spilt,
82 80 tb.create_by_id,
83 81 tb.update_by_id,
84 82 tb.create_time,
... ... @@ -94,6 +92,7 @@
94 92 <select id="query" resultMap="ReceiptLedgerInfo">
95 93 <include refid="ReceiptLedgerInfo_sql"/>
96 94 <where>
  95 + AND tb.del_flag = false
97 96 <if test="vo.id != null and vo.id != ''">
98 97 AND tb.id = #{id}
99 98 </if>
... ...