1

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/bwdiffapply/AppBwdiffapplyDetailFile.java

@@ -30,7 +30,6 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 @Data
-@ApiModel(value = "保外工单开票申请 视图数据对象", description = "保外工单开票申请 视图数据对象")
 public class AppBwdiffapplyDetailFile implements Vo {
 
     private String url;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.terminal",
         "com.yxt.common.base.config"
 },exclude = {DataSourceAutoConfiguration.class})
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbwdiffapply/AsBwdiffapplyFegin.java

@@ -15,7 +15,7 @@ import java.util.List;
 @FeignClient(
         contextId = "yxt-as-AsBwdiffapply",
         name = "yxt-as",
-        path = "v1/asoldparthandleapply"
+        path = "v1/asbwdiffapply"
 )
 public interface AsBwdiffapplyFegin {
 

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApply.java

@@ -99,7 +99,9 @@ public class AsArrearsoutApply extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("承诺回款日期")
+    private Date promisePaymentDate;
     @ApiModelProperty("发起部门sid")
     private String deptSid;
     @ApiModelProperty("发起部门名称")

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java

@@ -113,6 +113,9 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("承诺回款日期")
+    private Date promisePaymentDate;
 
     @ApiModelProperty("发起部门sid")
     private String deptSid;

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java

@@ -107,6 +107,9 @@ public class AsArrearsoutApplyDto implements Dto {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("承诺回款日期")
+    private Date promisePaymentDate;
 
     @ApiModelProperty("发起部门sid")
     private String deptSid;

yxt-as/src/main/java/com/yxt/anrui/as/api/asbwdiffapplydetail/AsBwdiffapplyDetail.java

@@ -95,5 +95,6 @@ public class AsBwdiffapplyDetail extends BaseEntity {
     private BigDecimal diffOtherAmount; // 调整其他费用
 	@ApiModelProperty("调整费用合计")
     private BigDecimal diffTotalAmount; // 调整费用合计
-
+    @ApiModelProperty("调整说明")
+    private String adjustmentRemarks;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbwdiffapplydetail/AsBwdiffapplyDetailDetailsVo.java

@@ -101,6 +101,8 @@ public class AsBwdiffapplyDetailDetailsVo implements Vo {
     private BigDecimal diffOtherAmount; // 调整其他费用
 	@ApiModelProperty("调整费用合计")
     private BigDecimal diffTotalAmount; // 调整费用合计
+    @ApiModelProperty("调整说明")
+    private String adjustmentRemarks;
     @ApiModelProperty("附件")
     private List<AsBwdiffapplyDetailFile> fileList = new ArrayList<>();
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbwdiffapplydetail/AsBwdiffapplyDetailDto.java

@@ -102,6 +102,8 @@ public class AsBwdiffapplyDetailDto implements Dto {
     private BigDecimal diffOtherAmount; // 调整其他费用
 	@ApiModelProperty("调整费用合计")
     private BigDecimal diffTotalAmount; // 调整费用合计
+    @ApiModelProperty("调整说明")
+    private String adjustmentRemarks;
     @ApiModelProperty("附件")
     private List<AsBwdiffapplyDetailFile> fileList = new ArrayList<>();
 }