修改预约工单增加科目

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBill.java

@@ -96,5 +96,8 @@ public class AsBusreserveBill extends BaseEntity {
     private String deptName; // 制单部门
     @ApiModelProperty("客户单位")
     private String customerOrg; // 客户单位
-
+    @ApiModelProperty("科目sid")
+    private String subjectSid;
+    @ApiModelProperty("科目")
+    private String subject;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java

@@ -102,4 +102,8 @@ public class AsBusreserveBillDetailsVo implements Vo {
     private List<TrackLogsVo> trackLogs = new ArrayList<>(); // 跟踪记录
     @ApiModelProperty("跟踪记录")
     private String trackLog;
+    @ApiModelProperty("科目sid")
+    private String subjectSid;
+    @ApiModelProperty("科目")
+    private String subject;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java

@@ -102,4 +102,8 @@ public class AsBusreserveBillDto implements Dto {
     private List<TrackLogsVo> trackLogs = new ArrayList<>(); // 跟踪记录
     @ApiModelProperty("跟踪记录")
     private String trackLog;
+    @ApiModelProperty("科目sid")
+    private String subjectSid;
+    @ApiModelProperty("科目")
+    private String subject;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@@ -376,6 +376,12 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             billDto.setOperator(bill.getCreateByName());
             billDto.setDeptName(bill.getDeptName());
             billDto.setDeptSid(bill.getDeptSid());
+            if (StringUtils.isNotBlank(bill.getSubject())) {
+                billDto.setSubject(bill.getSubject());
+            }
+            if (StringUtils.isNotBlank(bill.getSubjectSid())) {
+                billDto.setSubjectSid(bill.getSubjectSid());
+            }
             if (StringUtils.isNotBlank(bill.getCustomerSid())) {
                 billDto.setCustomerSid(bill.getCustomerSid());
             }