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

no message

This commit is contained in:
cb 2025-09-25 11:38:11 +08:00
parent 5c2049c3ea
commit 47f717fcb2
5 changed files with 12 additions and 3 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/OrderMasterController.java
View File

@ -1706,6 +1706,8 @@ public class OrderMasterController extends BaseController {
} }
OrderStandardDetail orderStandardDetail = new OrderStandardDetail(); OrderStandardDetail orderStandardDetail = new OrderStandardDetail();
orderStandardDetail.setHandoverImages(orderDetail.getHandoverImages());
orderStandardDetail.setHandoverRemark(orderDetail.getHandoverRemark());
orderStandardDetail.setDeliveryType(orderDetail.getDeliveryType()); orderStandardDetail.setDeliveryType(orderDetail.getDeliveryType());
orderStandardDetail.setDeliveryRemark(orderDetail.getDeliveryRemark()); orderStandardDetail.setDeliveryRemark(orderDetail.getDeliveryRemark());
orderStandardDetail.setDeliveryImages(orderDetail.getDeliveryImages()); orderStandardDetail.setDeliveryImages(orderDetail.getDeliveryImages());

1
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
View File

@ -327,6 +327,7 @@ public class WorkerController extends BaseController {
startPage(); startPage();
// worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null); // worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null);
worker.setName(workerListRequest.getWorkerName()); worker.setName(workerListRequest.getWorkerName());
worker.setStatus(0);
List<Worker> list = workerService.getWorkList(worker); List<Worker> list = workerService.getWorkList(worker);
list.forEach(w -> { list.forEach(w -> {
Goods goods = new Goods(); Goods goods = new Goods();

6
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
View File

@ -120,4 +120,10 @@ public class OrderStandardDetail {
*/ */
private String trackingNumber; private String trackingNumber;
private String handoverImages;
private String handoverRemark;
} }

2
ghy-admin/src/main/resources/templates/worker/worker.html
View File

@ -245,7 +245,7 @@
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="areaDetail(\'' + row.workerId + '\')"><i class="fa fa-info"></i>服务区域</a> '); actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="areaDetail(\'' + row.workerId + '\')"><i class="fa fa-info"></i>服务区域</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="categoryDetail(\'' + row.workerId + '\')"><i class="fa fa-info"></i>服务技能</a> '); actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="categoryDetail(\'' + row.workerId + '\')"><i class="fa fa-info"></i>服务技能</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.workerId + '\')"><i class="fa fa-remove"></i>删除</a> '); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.workerId + '\')"><i class="fa fa-remove"></i>删除</a> ');
return actions.join(''); return actions.join('');
} else { } else {
return ""; return "";

4
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -247,7 +247,7 @@
AND ca.country_id = #{district} AND ca.country_id = #{district}
</if> </if>
<if test="isMonitoredOrder"> <if test="isMonitoredOrder">
AND (om.all_self_assigned = 0 or om.all_self_assigned is null) AND om.order_status in (0,1,2,3,4) and om.worker_id is not null AND (om.has_dispatched_all = 0 OR (om.has_dispatched_all = 1 AND om.all_self_assigned = 0)) AND om.order_status in (0,1,2,3,4) and om.worker_id is not null
</if> </if>
<if test="allSelfAssigned != null"> <if test="allSelfAssigned != null">
AND all_self_assigned = #{allSelfAssigned} AND all_self_assigned = #{allSelfAssigned}
@ -390,7 +390,7 @@
LEFT JOIN financial_master fm ON om.id = fm.order_master_id LEFT JOIN financial_master fm ON om.id = fm.order_master_id
<where> <where>
<if test="isMonitoredOrder"> <if test="isMonitoredOrder">
AND (om.all_self_assigned = 0 or om.all_self_assigned is null) AND om.order_status in (1,2,3,4) AND (om.has_dispatched_all = 0 OR (om.has_dispatched_all = 1 AND om.all_self_assigned = 0)) AND om.order_status in (1,2,3,4)
</if> </if>
<if test="allSelfAssigned != null"> <if test="allSelfAssigned != null">
AND all_self_assigned = #{allSelfAssigned} AND all_self_assigned = #{allSelfAssigned}