clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

待确认状态更新

This commit is contained in:
donqi 2022-11-23 01:17:53 +08:00
parent fc6eecc821
commit 3bfcafa2ba
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -379,6 +379,8 @@ public class OrderDetailController extends BaseController {
orderListResponse.setChangeMoney(changeMoney); orderListResponse.setChangeMoney(changeMoney);
// orderListResponse.setAfterServiceRecordList(afterServiceRecordList); // orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
orderListResponse.setUpdateTime(detail.getUpdateTime()); orderListResponse.setUpdateTime(detail.getUpdateTime());
orderListResponse.setShelveStatus(detail.getShelveStatus());
orderListResponse.setLedgerAccountStatus(detail.getLedgerAccountStatus());
orderListResponses.add(orderListResponse); orderListResponses.add(orderListResponse);
}); });
return voDataTable(orderListResponses, list); return voDataTable(orderListResponses, list);

4
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -102,4 +102,8 @@ public class OrderListResponse {
private Boolean isOnlyServ; private Boolean isOnlyServ;
private Date updateTime; private Date updateTime;
private Integer shelveStatus;
private Integer ledgerAccountStatus;
} }

2
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
View File

@ -75,4 +75,6 @@ public class OrderDetail extends BaseEntity {
private Boolean useTimeNotRange; private Boolean useTimeNotRange;
private Integer shelveStatus; private Integer shelveStatus;
private Integer ledgerAccountStatus;
} }

7
ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -19,6 +19,8 @@
<result property="workBeginTime" column="work_begin_time"/> <result property="workBeginTime" column="work_begin_time"/>
<result property="workFinishTime" column="work_finish_time"/> <result property="workFinishTime" column="work_finish_time"/>
<result property="clockInLocation" column="clock_in_location"/> <result property="clockInLocation" column="clock_in_location"/>
<result property="shelveStatus" column="shelve_status"/>
<result property="ledgerAccountStatus" column="ledger_account_status"/>
<result property="createBy" column="create_by"/> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by"/>
@ -41,6 +43,8 @@
work_begin_time, work_begin_time,
work_finish_time, work_finish_time,
clock_in_location, clock_in_location,
ledger_account_status,
shelve_status,
create_by, create_by,
create_time, create_time,
update_time, update_time,
@ -63,6 +67,8 @@
od.work_begin_time, od.work_begin_time,
od.work_finish_time, od.work_finish_time,
od.clock_in_location, od.clock_in_location,
od.ledger_account_status,
od.shelve_status,
od.create_by, od.create_by,
od.create_time, od.create_time,
od.update_time, od.update_time,
@ -220,6 +226,7 @@
<if test="clockInLocation != null and clockInLocation != ''">clock_in_location = #{clockInLocation},</if> <if test="clockInLocation != null and clockInLocation != ''">clock_in_location = #{clockInLocation},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="ledgerAccountStatus != null">ledger_account_status = #{ledgerAccountStatus},</if>
update_time = SYSDATE() update_time = SYSDATE()
</set> </set>
WHERE id = #{id} WHERE id = #{id}