Skip to content

yangxiujun / paidan_demo

Go to a project
Commit f1bdd4b3 by Ren Ping
Options

fix:工作队详情增加group类型

1 parent 808f6e4c
Inline Side-by-side
Showing with 6 additions and 1 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamDetailDTO.java
...@@ -21,6 +21,10 @@ public class BusinessTeamDetailDTO { ...@@ -21,6 +21,10 @@ public class BusinessTeamDetailDTO {
private String teamName; private String teamName;
private String groupId; private String groupId;
private String groupName; private String groupName;
/**
* group类型（1自有分站，2加盟网点）
*/
private Integer groupCategory;
private String warehouseId; private String warehouseId;
private List<String> workdays; private List<String> workdays;
/** /**
...@@ -39,7 +43,7 @@ public class BusinessTeamDetailDTO { ...@@ -39,7 +43,7 @@ public class BusinessTeamDetailDTO {
private String engineerCode; private String engineerCode;
private String engineerName; private String engineerName;
public Engineer(String engineerCode, String engineerName){ public Engineer(String engineerCode, String engineerName) {
this.engineerCode = engineerCode; this.engineerCode = engineerCode;
this.engineerName = engineerName; this.engineerName = engineerName;
} }
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessTeamServiceImpl.java
...@@ -284,6 +284,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService { ...@@ -284,6 +284,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
.setTeamName(teamEntity.getTeamName()) .setTeamName(teamEntity.getTeamName())
.setGroupId(g.getGroupId()) .setGroupId(g.getGroupId())
.setGroupName(g.getGroupName()) .setGroupName(g.getGroupName())
.setGroupCategory(g.getCategory())
.setWarehouseId(teamEntity.getWarehouseId()) .setWarehouseId(teamEntity.getWarehouseId())
.setWorkOff(teamEntity.getWorkOff()) .setWorkOff(teamEntity.getWorkOff())
.setWorkOn(teamEntity.getWorkOn()) .setWorkOn(teamEntity.getWorkOn())
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!