|
|
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
4
|
4
|
import com.huimv.employment.dao.entity.FeDraftWorkItem;
|
|
5
|
5
|
import com.huimv.employment.dao.entity.FeOrderWorkItem;
|
|
6
|
6
|
import com.huimv.employment.dao.mapper.FeOrderWorkItemMapper;
|
|
|
7
|
+import com.huimv.employment.service.draft.dto.DraftWorkerGroupItem;
|
|
7
|
8
|
import org.springframework.stereotype.Service;
|
|
8
|
9
|
import org.springframework.util.StringUtils;
|
|
9
|
10
|
|
|
|
@@ -36,6 +37,43 @@ public class OrderWorkItemService {
|
|
36
|
37
|
.orderByAsc(FeOrderWorkItem::getId));
|
|
37
|
38
|
}
|
|
38
|
39
|
|
|
|
40
|
+ /**
|
|
|
41
|
+ * 转为与草稿详情一致的 {@code worker_groups} 结构(字段名 work_type / work_location / settlement_mode)。
|
|
|
42
|
+ */
|
|
|
43
|
+ public List<DraftWorkerGroupItem> toApiGroups(List<FeOrderWorkItem> items) {
|
|
|
44
|
+ List<DraftWorkerGroupItem> groups = new ArrayList<>();
|
|
|
45
|
+ if (items == null) {
|
|
|
46
|
+ return groups;
|
|
|
47
|
+ }
|
|
|
48
|
+ for (FeOrderWorkItem item : items) {
|
|
|
49
|
+ groups.add(toApiGroup(item));
|
|
|
50
|
+ }
|
|
|
51
|
+ return groups;
|
|
|
52
|
+ }
|
|
|
53
|
+
|
|
|
54
|
+ public List<DraftWorkerGroupItem> toApiGroupsByOrderId(Long orderId) {
|
|
|
55
|
+ return toApiGroups(listByOrderId(orderId));
|
|
|
56
|
+ }
|
|
|
57
|
+
|
|
|
58
|
+ public DraftWorkerGroupItem toApiGroup(FeOrderWorkItem item) {
|
|
|
59
|
+ DraftWorkerGroupItem group = new DraftWorkerGroupItem();
|
|
|
60
|
+ if (item == null) {
|
|
|
61
|
+ return group;
|
|
|
62
|
+ }
|
|
|
63
|
+ group.setGroupId(item.getGroupNo());
|
|
|
64
|
+ group.setJobType(item.getJobType());
|
|
|
65
|
+ group.setWorkerCount(item.getWorkerCount());
|
|
|
66
|
+ group.setWorkDays(item.getWorkDays());
|
|
|
67
|
+ group.setRegion(item.getWorkLocation());
|
|
|
68
|
+ group.setSettlementCycle(item.getSettlementCycle());
|
|
|
69
|
+ group.setUnitAmount(item.getUnitAmount());
|
|
|
70
|
+ group.setTotalAmount(item.getTotalAmount());
|
|
|
71
|
+ group.setWorkContent(item.getWorkContent());
|
|
|
72
|
+ group.setWorkStartDate(item.getWorkStartDate());
|
|
|
73
|
+ group.setWorkEndDate(item.getWorkEndDate());
|
|
|
74
|
+ return group;
|
|
|
75
|
+ }
|
|
|
76
|
+
|
|
39
|
77
|
/**
|
|
40
|
78
|
* 草稿确认时将用工明细复制到订单快照表。
|
|
41
|
79
|
*/
|