diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalance.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalance.java index cec99ae8..9ef0a88c 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalance.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalance.java @@ -70,5 +70,10 @@ public class ProjectCreditBalance extends BaseEntity { private String yxmoney; @ApiModelProperty("余额") private String yemoney="0"; + private String expectedCompletionDate;//预计完工时间 + private String expectedDeliveryDate;//预计到货时间 + private String creditNature;//用信性质 + private String creditStage;//用信阶段 + private String pSid;//psid } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceDetailsVo.java index 1110c91d..13aab996 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceDetailsVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceDetailsVo.java @@ -71,5 +71,10 @@ public class ProjectCreditBalanceDetailsVo implements Vo { private String money; // 金额 @ApiModelProperty("凭证图片") private List pzfiles; // 凭证图片 - + private String expectedCompletionDate;//预计完工时间 + private String expectedDeliveryDate;//预计到货时间 + private String creditNature;//用信性质 + private String creditStage;//用信阶段 + private String pSid;//psid + private String remarks; } \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceDto.java index 6e3aff91..c9f7e0c8 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceDto.java @@ -71,5 +71,9 @@ public class ProjectCreditBalanceDto implements Dto { private String usersid; // 用户sid @ApiModelProperty("摘要") private String remarks; - + private String expectedCompletionDate;//预计完工时间 + private String expectedDeliveryDate;//预计到货时间 + private String creditNature;//用信性质 + private String creditStage;//用信阶段 + private String pSid;//psid } \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java index ce6e5962..ff47c089 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceQuery.java @@ -52,7 +52,7 @@ import java.util.List; public class ProjectCreditBalanceQuery implements Query { @ApiModelProperty("项目sid") - private String projectsid; // 项目sid + private String projectSid; // 项目sid @ApiModelProperty("填报日期结束") private String tbdateend; // 填报日期结束 @ApiModelProperty("填报日期开始") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceVo.java index e0ef112c..67cb6f0f 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditbalance/ProjectCreditBalanceVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: project_credit(企业用信登记)
* File: ProjectCreditBalanceVo.java
@@ -75,4 +77,12 @@ public class ProjectCreditBalanceVo implements Vo { private String yxmoney; @ApiModelProperty("余额") private String yemoney; + private String expectedCompletionDate;//预计完工时间 + private String expectedDeliveryDate;//预计到货时间 + private String creditNature;//用信性质 + private String creditStage;//用信阶段 + private String pSid;//psid + @ApiModelProperty("凭证图片") + private List pzfiles; // 凭证图片 + private String remarks; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFile.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFile.java index 9647dfa0..9e79aee3 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFile.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFile.java @@ -51,9 +51,9 @@ public class ProjectCreditFile extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("创建者") - private String createSid; // 创建者 + private String createBySid; // 创建者 @ApiModelProperty("更新者") - private String modifySid; // 更新者 + private String updateBySid; // 更新者 @ApiModelProperty("主表sid") private String mainsid; // 主表sid @ApiModelProperty("凭证图片") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileDetailsVo.java index 503d597c..ec4844f7 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileDetailsVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileDetailsVo.java @@ -51,10 +51,10 @@ public class ProjectCreditFileDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("创建者") - private String createSid; // 创建者 - @ApiModelProperty("更新者") - private String modifySid; // 更新者 + @ApiModelProperty("创建者") + private String createBySid; // 创建者 + @ApiModelProperty("更新者") + private String updateBySid; // 更新者 @ApiModelProperty("主表sid") private String mainsid; // 主表sid @ApiModelProperty("凭证图片") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileDto.java index 0d4c9db7..7e41bb68 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileDto.java @@ -51,10 +51,10 @@ public class ProjectCreditFileDto implements Dto { private String sid; // sid - @ApiModelProperty("创建者") - private String createSid; // 创建者 - @ApiModelProperty("更新者") - private String modifySid; // 更新者 + @ApiModelProperty("创建者") + private String createBySid; // 创建者 + @ApiModelProperty("更新者") + private String updateBySid; // 更新者 @ApiModelProperty("主表sid") private String mainsid; // 主表sid @ApiModelProperty("凭证图片") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileFeign.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileFeign.java index b1feb19e..d80e2c04 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileFeign.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileFeign.java @@ -59,10 +59,10 @@ public interface ProjectCreditFileFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody ProjectCreditFileDto dto); +// @ApiOperation("新增或修改") +// @PostMapping("/save") +// @ResponseBody +// public ResultBean save(@RequestBody ProjectCreditFileDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileFeignFallback.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileFeignFallback.java index 6eebb732..f5064717 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileFeignFallback.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileFeignFallback.java @@ -52,10 +52,10 @@ public class ProjectCreditFileFeignFallback implements ProjectCreditFileFeign { return rb.setMsg("接口project_credit/projectcreditfile/listPage无法访问"); } - @Override - public ResultBean save(ProjectCreditFileDto dto){ - return ResultBean.fireFail().setMsg("接口project_credit/projectcreditfile/save无法访问"); - } +// @Override +// public ResultBean save(ProjectCreditFileDto dto){ +// return ResultBean.fireFail().setMsg("接口project_credit/projectcreditfile/save无法访问"); +// } @Override public ResultBean delBySids( String[] sids){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileVo.java index 369c2086..f9cb0df4 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectcreditfile/ProjectCreditFileVo.java @@ -51,10 +51,10 @@ public class ProjectCreditFileVo implements Vo { private String sid; // sid - @ApiModelProperty("创建者") - private String createSid; // 创建者 - @ApiModelProperty("更新者") - private String modifySid; // 更新者 + @ApiModelProperty("创建者") + private String createBySid; // 创建者 + @ApiModelProperty("更新者") + private String updateBySid; // 更新者 @ApiModelProperty("主表sid") private String mainsid; // 主表sid @ApiModelProperty("凭证图片") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProg.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProg.java index 59ed37aa..962d76cf 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProg.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProg.java @@ -11,13 +11,10 @@ import lombok.Data; */ @Data @ApiModel(value = "项目阶段 ", description = "项目阶段") -@TableName("project_supervision_log") +@TableName("project_engineering_progress") public class ProjectEnginProg extends BaseEntity { private String projectSid; - private String logTypeKey; - private String logTypeValue; - private String logText; + private String progressDescription; + private String nextStage; private String orderDate; - private String regulatoryWork; - private String workArrangement;// } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgDto.java index 953e57fb..1398d784 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgDto.java @@ -11,11 +11,9 @@ import lombok.Data; public class ProjectEnginProgDto implements Dto { private String sid; private String projectSid; - private String logTypeKey; - private String logTypeValue; - private String logText; + private String progressDescription; + private String nextStage; private String orderDate; - private String regulatoryWork; - private String workArrangement;// private String [] urls; + private String remarks; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgVo.java index f9c0c430..d19a81c1 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprog/ProjectEnginProgVo.java @@ -9,11 +9,12 @@ import lombok.Data; */ @Data public class ProjectEnginProgVo implements Vo { + private String sid; private String projectSid; - private String logTypeKey; - private String logTypeValue; - private String logText; + private String projectName; + private String progressDescription; + private String nextStage; private String orderDate; - private String regulatoryWork; - private String workArrangement;// + private String [] urls; + private String remarks; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFile.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFile.java index 66fc0172..3dfda946 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFile.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFile.java @@ -12,10 +12,10 @@ import lombok.Data; */ @Data @ApiModel(value = "项目阶段 ", description = "项目阶段") -@TableName("project_phase") +@TableName("project_engin_prog_file") public class ProjectEnginProgFile extends BaseEntity { @ApiModelProperty("主表sid") - private String mainsid; // 主表sid + private String mainSid; // 主表sid @ApiModelProperty("项目附件链接") private String url; // 项目附件链接 private String absolutePath; // 项目附件链接 diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileDto.java index 52ba3e84..ad70b266 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileDto.java @@ -16,11 +16,11 @@ import java.util.List; public class ProjectEnginProgFileDto implements Dto { private String sid; @ApiModelProperty("主表sid") - private String mainsid; // 主表sid + private String mainSid; // 主表sid @ApiModelProperty("项目附件链接") private String url; // 项目附件链接 private String absolutePath; // 项目附件链接 private String name; // 项目附件链接 - List reportList=new ArrayList<>(); + List reportList=new ArrayList<>(); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileVo.java index 1d155690..9e745586 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectenginprogfile/ProjectEnginProgFileVo.java @@ -11,7 +11,7 @@ import lombok.Data; @Data public class ProjectEnginProgFileVo implements Vo { @ApiModelProperty("主表sid") - private String mainsid; // 主表sid + private String mainSid; // 主表sid @ApiModelProperty("项目附件链接") private String url; // 项目附件链接 private String absolutePath; // 项目附件链接 diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogDto.java index 444ffce7..39c56bcd 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogDto.java @@ -18,4 +18,5 @@ public class ProjectSupervisionLogDto implements Dto { private String regulatoryWork; private String workArrangement;// private String [] urls; + private String remarks; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogVo.java index 52eb03ce..8f28dcff 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlog/ProjectSupervisionLogVo.java @@ -9,11 +9,15 @@ import lombok.Data; */ @Data public class ProjectSupervisionLogVo implements Vo { + private String sid; private String projectSid; + private String projectName; private String logTypeKey; private String logTypeValue; private String logText; private String orderDate; private String regulatoryWork; private String workArrangement;// + private String [] urls; + private String remarks; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFile.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFile.java index 855fc149..3bb8e204 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFile.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFile.java @@ -12,10 +12,10 @@ import lombok.Data; */ @Data @ApiModel(value = "项目阶段 ", description = "项目阶段") -@TableName("project_phase") +@TableName("project_supervision_log_file") public class ProjectSupervisionLogFile extends BaseEntity { @ApiModelProperty("主表sid") - private String mainsid; // 主表sid + private String mainSid; // 主表sid @ApiModelProperty("项目附件链接") private String url; // 项目附件链接 private String absolutePath; // 项目附件链接 diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileDto.java index 710af977..b9c1cb89 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileDto.java @@ -16,11 +16,11 @@ import java.util.List; public class ProjectSupervisionLogFileDto implements Dto { private String sid; @ApiModelProperty("主表sid") - private String mainsid; // 主表sid + private String mainSid; // 主表sid @ApiModelProperty("项目附件链接") private String url; // 项目附件链接 private String absolutePath; // 项目附件链接 private String name; // 项目附件链接 - List reportList=new ArrayList<>(); + List reportList=new ArrayList<>(); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileVo.java index effc25f5..8eb26138 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectsupervisionlogfile/ProjectSupervisionLogFileVo.java @@ -11,9 +11,10 @@ import lombok.Data; @Data public class ProjectSupervisionLogFileVo implements Vo { @ApiModelProperty("主表sid") - private String mainsid; // 主表sid + private String mainSid; // 主表sid @ApiModelProperty("项目附件链接") private String url; // 项目附件链接 private String absolutePath; // 项目附件链接 private String name; // 项目附件链接 + } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceRest.java index 050b96e9..674498ca 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceRest.java @@ -32,6 +32,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.crm.api.projectcreditbalance.*; +import com.yxt.supervise.crm.biz.projectcreditfile.ProjectCreditFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -68,16 +69,18 @@ public class ProjectCreditBalanceRest implements ProjectCreditBalanceFeign { @Autowired private ProjectCreditBalanceService projectCreditBalanceService; + @Autowired + private ProjectCreditFileService projectCreditFileService; @Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - String userSid = pq.getParams().getUserSid(); - if(StringUtils.isBlank(userSid)){ - return rb.setMsg("userSid不能为空"); - } +// String userSid = pq.getParams().getUserSid(); +// if(StringUtils.isBlank(userSid)){ +// return rb.setMsg("userSid不能为空"); +// } PagerVo pv = projectCreditBalanceService.listPageVo(pq); return rb.success().setData(pv); } @@ -115,10 +118,13 @@ public class ProjectCreditBalanceRest implements ProjectCreditBalanceFeign { @Override @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); projectCreditBalanceService.delBySids(sids); + for (String sid : sids) { + projectCreditFileService.deleteByMainSid(sid); + } return rb.success(); } @@ -131,6 +137,7 @@ public class ProjectCreditBalanceRest implements ProjectCreditBalanceFeign { return rb.success().setData(vo); } + @Value("${image.upload.path}") public String fileRootPath; diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java index 42242746..bc29056c 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditbalance/ProjectCreditBalanceService.java @@ -28,6 +28,7 @@ package com.yxt.supervise.crm.biz.projectcreditbalance; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.crm.api.projectcreditbalance.*; import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFile; @@ -71,13 +72,15 @@ public class ProjectCreditBalanceService extends MybatisBaseService createQueryWrapper(ProjectCreditBalanceQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); qw.eq("isDelete",0); - if(StringUtils.isNotBlank(query.getProjectsid())){ - qw.eq("projectsid",query.getProjectsid()); + if(StringUtils.isNotBlank(query.getProjectSid())){ + qw.eq("projectsid",query.getProjectsids()); } if(StringUtils.isNotBlank(query.getTbdateend())){ qw.le("tbdate",query.getTbdateend()); @@ -86,17 +89,17 @@ public class ProjectCreditBalanceService extends MybatisBaseService projectByUserSid = projectInformationService.getProjectByUserSid(query.getUserSid()); - List sids=new ArrayList<>(); - sids.add("-1"); - if(projectByUserSid!=null&&projectByUserSid.size()>0){ - for (ProjectInformationVo projectInformationVo : projectByUserSid) { - sids.add(projectInformationVo.getSid()); - } - qw.in("projectsid",sids); - }else{ - qw.in("projectsid",sids); - } +// List projectByUserSid = projectInformationService.getProjectByUserSid(query.getUserSid()); +// List sids=new ArrayList<>(); +// sids.add("-1"); +// if(projectByUserSid!=null&&projectByUserSid.size()>0){ +// for (ProjectInformationVo projectInformationVo : projectByUserSid) { +// sids.add(projectInformationVo.getSid()); +// } +// qw.in("projectsid",sids); +// }else{ +// qw.in("projectsid",sids); +// } return qw; } @@ -106,6 +109,15 @@ public class ProjectCreditBalanceService extends MybatisBaseService qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + for (ProjectCreditBalanceVo record : pagging.getRecords()) { + List urls=new ArrayList<>(); + List projectCreditFiles=projectCreditFileService.list(new QueryWrapper().eq("mainsid",record.getSid())); + for (ProjectCreditFile projectCreditFile : projectCreditFiles) { + urls.add(urlPrefix+projectCreditFile.getPzfile()); + } + record.setPzfiles(urls); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -116,8 +128,7 @@ public class ProjectCreditBalanceService extends MybatisBaseService dtos=new ArrayList<>(); for (String pzfile : pzfiles) { ProjectCreditFileDto projectCreditFileDto=new ProjectCreditFileDto(); projectCreditFileDto.setMainsid(sid); - projectCreditFileDto.setPzfile(pzfile); - projectCreditFileService.insertByDto(projectCreditFileDto); + String path = pzfile.substring(urlPrefix.length()); + projectCreditFileDto.setPzfile(path); + dtos.add(projectCreditFileDto); } + projectCreditFileService.insertByDto(dtos); //TODO 推送到项目信息 修改授信额度。 ProjectInformation projectInformation=projectInformationService.getOne(new QueryWrapper().eq("sid",dto.getProjectsid())); @@ -224,6 +238,16 @@ public class ProjectCreditBalanceService extends MybatisBaseService dtos=new ArrayList<>(); + for (String pzfile : dto.getPzfiles()) { + ProjectCreditFileDto projectCreditFileDto=new ProjectCreditFileDto(); + projectCreditFileDto.setMainsid(entity.getSid()); + String path = pzfile.substring(urlPrefix.length()); + projectCreditFileDto.setPzfile(path); + dtos.add(projectCreditFileDto); + } + projectCreditFileService.insertByDto(dtos); } public ProjectCreditBalanceDetailsVo fetchDetailsVoBySid(String sid){ @@ -242,7 +266,6 @@ public class ProjectCreditBalanceService extends MybatisBaseService exportExcel(ProjectCreditBalanceQuery pq) { List projectByUserSid = projectInformationService.getProjectByUserSid(pq.getUserSid()); List sids=new ArrayList<>(); diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileRest.java index 1ff4278e..6afb2cbc 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileRest.java @@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: project_credit(企业用信登记)
@@ -65,14 +67,14 @@ public class ProjectCreditFileRest implements ProjectCreditFileFeign { return rb.success().setData(pv); } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ProjectCreditFileDto dto){ - ResultBean rb = ResultBean.fireFail(); - projectCreditFileService.saveOrUpdateDto(dto); - return rb.success(); - } +// @Override +// @ApiOperation("新增或修改") +// @PostMapping("/save") +// public ResultBean save(@RequestBody ProjectCreditFileDto dto){ +// ResultBean rb = ResultBean.fireFail(); +// projectCreditFileService.saveOrUpdateDto(dto); +// return rb.success(); +// } @Override @ApiOperation("根据sid批量删除") @@ -82,6 +84,13 @@ public class ProjectCreditFileRest implements ProjectCreditFileFeign { projectCreditFileService.delBySids(sids); return rb.success(); } + @ApiOperation("获取url") + @PostMapping("/getUrlsByMainsid") + public ResultBean> getUrlsByMainsid(@RequestBody List sids){ + ResultBean rb = ResultBean.fireFail(); + + return projectCreditFileService.getUrlsByMainsid(sids); + } @Override @ApiOperation("根据SID获取一条记录") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java index 54d1d37e..efde1194 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectcreditfile/ProjectCreditFileService.java @@ -28,6 +28,8 @@ package com.yxt.supervise.crm.biz.projectcreditfile; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.crm.api.projectcreditfile.*; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -35,8 +37,10 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -70,19 +74,23 @@ public class ProjectCreditFileService extends MybatisBaseService dtos){ + baseMapper.delete(new QueryWrapper().eq("mainsid", dtos.get(0).getMainsid())); + for (ProjectCreditFileDto dto : dtos) { + ProjectCreditFile entity = new ProjectCreditFile(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + } public void updateByDto(ProjectCreditFileDto dto){ @@ -94,7 +102,19 @@ public class ProjectCreditFileService extends MybatisBaseService> getUrlsByMainsid(List sids){ + List s=new ArrayList<>(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + List vo=baseMapper.selectList(new QueryWrapper().in("mainsid",sids)); + for (ProjectCreditFile projectCreditFile : vo) { + s.add(urlPrefix+projectCreditFile.getPzfile()); + } + return new ResultBean().setData(s); + } public ProjectCreditFileDetailsVo fetchDetailsVoBySid(String sid){ ProjectCreditFile entity = fetchBySid(sid); ProjectCreditFileDetailsVo vo = new ProjectCreditFileDetailsVo(); @@ -105,4 +125,7 @@ public class ProjectCreditFileService extends MybatisBaseService entitys = baseMapper.fetchByMainSid(sid); return entitys; } + public void deleteByMainSid(String sid){ + baseMapper.delete(new QueryWrapper().eq("mainsid",sid)); + } } \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgMapper.xml index 667bf560..77c62e11 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgMapper.xml @@ -3,9 +3,10 @@ - + SELECT cct.*,c.entryName as projectName + FROM project_engineering_progress cct + left join project_information c on c.sid =cct.projectSid ${ew.sqlSegment} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgRest.java index f5673975..8b3d51f0 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgRest.java @@ -7,6 +7,7 @@ import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgDto; import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgQuery; import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgVo; import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileVo; +import com.yxt.supervise.crm.biz.projectenginprogfile.ProjectEnginProgFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -18,14 +19,16 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "银行负责人信息") @RestController -@RequestMapping("v1/ProjectEnginProg") +@RequestMapping("v1/projectenginprog") public class ProjectEnginProgRest { @Autowired private ProjectEnginProgService ProjectEnginProgService; + @Autowired + private ProjectEnginProgFileService projectEnginProgFileService; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = ProjectEnginProgService.listPageVo(pq); return rb.success().setData(pv); @@ -44,17 +47,10 @@ public class ProjectEnginProgRest { public ResultBean del(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); ProjectEnginProgService.delBySids(sids); - return rb.success(); - } - @ApiOperation("根据sid查询") - @GetMapping("/getManagerBySid/{sid}") - public ResultBean getManagerBySid(@PathVariable String sid) { - ResultBean rb = ResultBean.fireFail(); - ProjectEnginProgVo vo = ProjectEnginProgService.getManagerBySid(sid); - if (vo == null) { - return rb.setMsg("该银行联系人不存在"); + for (String sid : sids) { + projectEnginProgFileService.deleteByMainSid(sid); } - return rb.success().setData(vo); + return rb.success(); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgService.java index d4814acc..7981579a 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprog/ProjectEnginProgService.java @@ -3,6 +3,7 @@ package com.yxt.supervise.crm.biz.projectenginprog; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -13,11 +14,18 @@ import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProg; import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgDto; import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgQuery; import com.yxt.supervise.crm.api.projectenginprog.ProjectEnginProgVo; +import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFile; import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileDto; +import com.yxt.supervise.crm.api.projectsupervisionlog.ProjectSupervisionLogVo; +import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFile; import com.yxt.supervise.crm.biz.projectenginprogfile.ProjectEnginProgFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + /** * @author wangpengfei * @date 2023/4/23 11:49 @@ -26,18 +34,25 @@ import org.springframework.stereotype.Service; public class ProjectEnginProgService extends MybatisBaseService { @Autowired ProjectEnginProgFileService projectEnginProgFileService; - + @Autowired + private FileUploadComponent fileUploadComponent; public PagerVo listPageVo(PagerQuery pq) { ProjectEnginProgQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); -// if(StringUtils.isNotBlank(query.getEnterpriseName())){ -// qw.like("enterpriseName",query.getEnterpriseName()); -// } + if(StringUtils.isNotBlank(query.getProjectSid())){ + qw.like("cct.projectSid",query.getProjectSid()); + } // if(StringUtils.isNotBlank(query.getTelephone())){ // qw.like("telephone",query.getTelephone()); // } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + for (ProjectEnginProgVo record : pagging.getRecords()) { + List sa=projectEnginProgFileService.list(new QueryWrapper().eq("mainSid",record.getSid())); + List list=sa.stream().map(i->urlPrefix+i.getUrl()).collect(Collectors.toList()); + record.setUrls(list.stream().toArray(String[]::new)); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -55,27 +70,19 @@ public class ProjectEnginProgService extends MybatisBaseService().eq("sid",entity.getSid())); ProjectEnginProgFileDto dto1=new ProjectEnginProgFileDto(); - dto1.setMainsid(entity.getSid()); + dto1.setMainSid(entity.getSid()); + dto1.setReportList(Arrays.stream(dto.getUrls()).collect(Collectors.toList())); projectEnginProgFileService.saveProjectEnginProgFile(dto1); } return rb.success(); } - - - - public ProjectEnginProgVo getManagerBySid(String sid) { - ProjectEnginProgVo vo = new ProjectEnginProgVo(); - ProjectEnginProg ProjectEnginProg = this.fetchBySid(sid); - BeanUtil.copyProperties(ProjectEnginProg, vo); - return vo; - } - } \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprogfile/ProjectEnginProgFileService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprogfile/ProjectEnginProgFileService.java index b3d8b55b..b36ba2ea 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprogfile/ProjectEnginProgFileService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectenginprogfile/ProjectEnginProgFileService.java @@ -14,6 +14,7 @@ import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileDto; import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileQuery; import com.yxt.supervise.crm.api.projectenginprogfile.ProjectEnginProgFileVo; import com.yxt.supervise.crm.api.projectfiles.UrlVo; +import com.yxt.supervise.crm.api.projectsupervisionlogfile.ProjectSupervisionLogFile; import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,19 +58,21 @@ public class ProjectEnginProgFileService extends MybatisBaseService().eq("mainsid",dto.getMainsid())); - for (UrlVo urlVo : dto.getReportList()) { + baseMapper.delete(new QueryWrapper().eq("mainsid",dto.getMainSid())); + for (String urlVo : dto.getReportList()) { BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setAbsolutePath(urlVo.getUrl()); - String path = urlVo.getUrl().substring(urlPrefix.length()); - urlVo.setUrl(path); - entity.setName(urlVo.getFileSrcName()); - entity.setUrl(urlVo.getUrl()); + entity.setAbsolutePath(urlVo); + String path = urlVo.substring(urlPrefix.length()); + entity.setUrl(path); baseMapper.insert(entity); } return rb.success(); } - + public ResultBean deleteByMainSid(String mainSid) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.delete(new QueryWrapper().eq("mainSid",mainSid)); + return rb.success(); + } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlog/ProjectSupervisionLogMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlog/ProjectSupervisionLogMapper.xml index 3a2617a5..d375120d 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlog/ProjectSupervisionLogMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlog/ProjectSupervisionLogMapper.xml @@ -4,8 +4,9 @@ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlogfile/ProjectSupervisionLogFileService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlogfile/ProjectSupervisionLogFileService.java index 0b447a4b..569dfa4d 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlogfile/ProjectSupervisionLogFileService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectsupervisionlogfile/ProjectSupervisionLogFileService.java @@ -60,20 +60,22 @@ public class ProjectSupervisionLogFileService extends MybatisBaseService().eq("mainsid",dto.getMainsid())); - for (UrlVo urlVo : dto.getReportList()) { + baseMapper.delete(new QueryWrapper().eq("mainsid",dto.getMainSid())); + for (String urlVo : dto.getReportList()) { BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setAbsolutePath(urlVo.getUrl()); - String path = urlVo.getUrl().substring(urlPrefix.length()); - urlVo.setUrl(path); - entity.setName(urlVo.getFileSrcName()); - entity.setUrl(urlVo.getUrl()); + entity.setAbsolutePath(urlVo); + String path = urlVo.substring(urlPrefix.length()); + entity.setUrl(path); baseMapper.insert(entity); } return rb.success(); } - + public ResultBean deleteByMainSid(String mainSid) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.delete(new QueryWrapper().eq("mainSid",mainSid)); + return rb.success(); + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java index 492a01b6..26839f77 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java @@ -22,6 +22,8 @@ import com.yxt.supervise.report.biz.projectinformation.WarehouseInfoVo; import com.yxt.supervise.report.biz.projectphaserecord.ProjectPhaseRecordDto; import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherService; import com.yxt.supervise.report.ds.crm.*; +import com.yxt.supervise.report.feign.crm.projectcreditbalance.ProjectCreditBalanceFeign; +import com.yxt.supervise.report.feign.crm.projectcreditfile.ProjectCreditFileFeign; import com.yxt.supervise.report.feign.crm.projectphaserecord.ProjectPhaseRecordFeign; import com.yxt.supervise.report.feign.crm.projectshgm.ProjectShGmDto; import com.yxt.supervise.report.feign.monitor.YDeviceFeign; @@ -61,6 +63,10 @@ public class DataCenterRest { CrmMapper crmMapper; @Autowired ProjectPhaseRecordFeign projectPhaseRecordFeign; + @Autowired + private ProjectCreditBalanceFeign projectCreditBalanceFeign; + @Autowired + private ProjectCreditFileFeign projectCreditFileFeign; //数据总览 /*********************************************36524演示************************************/ @@ -210,25 +216,57 @@ public class DataCenterRest { List projectDetailsVos=c.getList(new RestTemplate().postForEntity(a, sendBodyMM, String.class),ProjectDetailsVo.class); for (ProjectDetailsVo projectDetailsVo : projectDetailsVos) { ProjectInfo info= crmMapper.getProjectByShSid(projectDetailsVo.getSid()); + if(info!=null){ + String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); + projectDetailsVo.setCreditStage(nodde); + } if(null!=info){ List vos=crmMapper.getBalanceByProjectSid(info.getProjectSid()); + List s=new ArrayList<>(); for (ShCreditBalanceCrmVo vo : vos) { if(vo.getType().equals("1")){ - String nodde=crmMapper.getNodeValueByProjectSid(info.getSid()); +// String nodde=crmMapper.getNodeValueByProjectSid(info.getSid()); projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate()); projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate()); - projectDetailsVo.setCreditStage(nodde); +// projectDetailsVo.setCreditStage(nodde); projectDetailsVo.setCreditNature(vo.getCreditNature()); projectDetailsVo.setTbdate(vo.getTbdate()); projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney())); }else{ projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney())); } + s.add(vo.getSid()); + } + if(s.size()!=0){ + List vos9=projectCreditFileFeign.getUrlsByMainsid(s).getData(); + projectDetailsVo.setUrls(vos9); } List vos1=crmMapper.getEngineeringByProject(info.getProjectSid()); projectDetailsVo.setProjectEngineeringList(vos1); List vo33=crmMapper.getLogByProject(info.getProjectSid()); projectDetailsVo.setProjectSupervisionLogList(vo33); + for (ProjectSupervisionLogVo projectSupervisionLogVo : vo33) { + List urlVos=crmMapper.getSupervisionLogFile(projectSupervisionLogVo.getSid()); + projectSupervisionLogVo.setUrls(urlVos); + } + for (ProjectEngineeringProgressVo projectEngineeringProgressVo : vos1) { + List urlVos=crmMapper.getEnginProgFile(projectEngineeringProgressVo.getSid()); + projectEngineeringProgressVo.setUrls(urlVos); + } + } + IndexQuery query1=new IndexQuery(); + query1.setLimit("20"); + query1.setPage("1"); + query1.setSearch_no(projectDetailsVo.getWarehouseCode()); + BaseResponseListObj indexVoBaseResponseListObj =ShRequester.get_order_list(query1).getData(); + if(indexVoBaseResponseListObj.getCount()!=0){ + projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); + } + if(info!=null){ + List list=crmMapper.getProjectFilesByMainSid(info.getProjectSid()); + if(list.size()!=0){ + projectDetailsVo.setUrlsVos(list); + } } } @@ -259,7 +297,6 @@ public class DataCenterRest { List projectInfoLists=crmMapper.getNodeValue(projectInfo.get(0).getEnterpriseSid()); int b=0; for (ProjectInfo info : projectInfoList) { - System.out.println(b++); shDateCenterVo.setTotalSxLimit(shDateCenterVo.getTotalSxLimit().add(info.getCreditLimitN())); shDateCenterVo.setTotalYxLimit(shDateCenterVo.getTotalYxLimit().add(info.getUseLimitN())); } @@ -468,7 +505,8 @@ public class DataCenterRest { List ztz=new ArrayList<>(); for(int k=0;k vos=crmMapper.getBalanceByProjectSid(info.getProjectSid()); + if(info!=null){ + String nodde=crmMapper.getNodeValueByProjectSid(info.getProjectSid()); + projectDetailsVo.setCreditStage(nodde); + } + List s=new ArrayList<>(); for (ShCreditBalanceCrmVo vo : vos) { if(vo.getType().equals("1")){ - String nodde=crmMapper.getNodeValueByProjectSid(info.getSid()); projectDetailsVo.setExpectedCompletionDate(vo.getExpectedCompletionDate()); projectDetailsVo.setExpectedDeliveryDate(vo.getExpectedDeliveryDate()); - projectDetailsVo.setCreditStage(nodde); projectDetailsVo.setCreditNature(vo.getCreditNature()); projectDetailsVo.setMoney(projectDetailsVo.getMoney().add(vo.getMoney())); projectDetailsVo.setTbdate(vo.getTbdate()); }else{ projectDetailsVo.setHkMoney(projectDetailsVo.getMoney().add(vo.getMoney())); } + s.add(vo.getSid()); + } + if(s.size()!=0){ + List vos9=projectCreditFileFeign.getUrlsByMainsid(s).getData(); + projectDetailsVo.setUrls(vos9); } List vos1=crmMapper.getEngineeringByProject(info.getProjectSid()); for (ProjectEngineeringProgressVo projectEngineeringProgressVo : vos1) { @@ -583,7 +629,20 @@ public class DataCenterRest { projectDetailsVo.setProjectSupervisionLog(vo33.get(0)); } } - + IndexQuery query1=new IndexQuery(); + query1.setLimit("20"); + query1.setPage("1"); + query1.setSearch_no(projectDetailsVo.getWarehouseCode()); + BaseResponseListObj indexVoBaseResponseListObj =ShRequester.get_order_list(query1).getData(); + if(indexVoBaseResponseListObj.getCount()!=0){ + projectDetailsVo.setTotalDayPower(indexVoBaseResponseListObj.getList().get(0).getTotal_day_power()); + } + if(info!=null){ + List list=crmMapper.getProjectFilesByMainSid(info.getProjectSid()); + if(list.size()!=0){ + projectDetailsVo.setUrlsVos(list); + } + } } js1.setRecords(projectDetailsVos); js2.setData(js1); @@ -600,7 +659,7 @@ public class DataCenterRest { @ApiOperation("dingshi") @GetMapping("/rr") - @Scheduled(cron = "1 0 0 * * ? ") + @Scheduled(cron = "0 0 0 1 * ? ") public void rr(){ //山海系统 String a ="63_17_0_2069_1,63_17_0_2048_1,63_17_0_2049_1,63_17_0_2070_1,63_17_0_2073_1,63_17_0_2075_1,63_17_0_2078_1,63_17_0_2080_1,63_17_0_2087_1,63_17_0_2090_1"; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java index 5dc343ef..63030f29 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ProjectDetailsVo.java @@ -18,6 +18,7 @@ import java.util.List; @Data public class ProjectDetailsVo { private String sid; + private String remarks;//仓库备注 private String warehouseName;//仓库名称 private String warehouseCode;//仓库编码 private String contacts;//联系人 @@ -46,4 +47,7 @@ public class ProjectDetailsVo { ProjectEngineeringProgressVo projectEngineeringProgress=new ProjectEngineeringProgressVo(); List projectSupervisionLogList=new ArrayList<>(); ProjectSupervisionLogVo projectSupervisionLog=new ProjectSupervisionLogVo(); + List urls=new ArrayList<>(); + private String totalDayPower; //发电量 + List urlsVos=new ArrayList<>(); //监管报告 } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/UrlsVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/UrlsVo.java index e62cceba..46575a7a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/UrlsVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/UrlsVo.java @@ -1,7 +1,10 @@ package com.yxt.supervise.report.biz.datacenter; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + /** * @author wangpengfei * @date 2024/10/21 10:39 @@ -12,4 +15,10 @@ public class UrlsVo { private String absolutePath; private String url; private String mainSid; + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss", + timezone = "GMT+8" + ) + private Date createTime; + private String typeKey; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectcreditbalance/ProjectCreditBalanceRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectcreditbalance/ProjectCreditBalanceRest.java index 875fc0be..2e768e93 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectcreditbalance/ProjectCreditBalanceRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectcreditbalance/ProjectCreditBalanceRest.java @@ -31,9 +31,8 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.report.feign.crm.projectcreditbalance.ProjectCreditBalanceDetailsVo; -import com.yxt.supervise.report.feign.crm.projectcreditbalance.ProjectCreditBalanceDto; -import com.yxt.supervise.report.feign.crm.projectcreditbalance.ProjectCreditBalanceFeign; +import com.yxt.supervise.report.ds.crm.ProjectRecordVo; +import com.yxt.supervise.report.feign.crm.projectcreditbalance.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -70,7 +69,12 @@ public class ProjectCreditBalanceRest implements ProjectCreditBalanceFeign { private ProjectCreditBalanceFeign projectCreditBalanceFeign; - + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return projectCreditBalanceFeign.listPage(pq); + } @ApiOperation("新增或修改") @PostMapping("/save") @@ -86,7 +90,18 @@ public class ProjectCreditBalanceRest implements ProjectCreditBalanceFeign { ResultBean rb = ResultBean.fireFail(); return projectCreditBalanceFeign.fetchDetailsBySid(sid); } - - + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + projectCreditBalanceFeign.delBySids(sids); + return rb.success(); + } + @ApiOperation("根据sid批量删除") + @PostMapping("/getUrlsByMainsid") + public ResultBean getUrlsByMainsid(@RequestBody List sids){ + ResultBean rb = ResultBean.fireFail(); + return projectCreditBalanceFeign.getUrlsByMainsid(sids); + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProg.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProg.java new file mode 100644 index 00000000..372221a3 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProg.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.report.biz.projectenginprog; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +@ApiModel(value = "项目阶段 ", description = "项目阶段") +@TableName("project_supervision_log") +public class ProjectEnginProg extends BaseEntity { + private String projectSid; + private String progressDescription; + private String nextStage; + private String orderDate; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgDto.java new file mode 100644 index 00000000..a48bddbe --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgDto.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.report.biz.projectenginprog; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectEnginProgDto implements Dto { + private String sid; + private String projectSid; + private String progressDescription; + private String nextStage; + private String orderDate; + private String [] urls; + private String remarks; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgQuery.java new file mode 100644 index 00000000..42a14b75 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgQuery.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.report.biz.projectenginprog; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectEnginProgQuery implements Query { + private String id; + private String sid; + private String shSid; + private String projectSid; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgRest.java new file mode 100644 index 00000000..deeb914f --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgRest.java @@ -0,0 +1,47 @@ +package com.yxt.supervise.report.biz.projectenginprog; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.feign.crm.projectenginprog.ProjectEnginProgFeign; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Api(tags = "银行负责人信息") +@RestController +@RequestMapping("v1/ProjectEnginProg") +public class ProjectEnginProgRest { + + @Autowired + private ProjectEnginProgFeign projectEnginProgFeign; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return projectEnginProgFeign.listPage(pq); + } + + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectEnginProgDto dto) { + return projectEnginProgFeign.save(dto); + } + + + @ApiOperation("删除") + @DeleteMapping("/delete") + public ResultBean del(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + projectEnginProgFeign.del(sids); + return rb.success(); + } + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgVo.java new file mode 100644 index 00000000..234784e5 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectenginprog/ProjectEnginProgVo.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.report.biz.projectenginprog; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectEnginProgVo implements Vo { + private String sid; + private String projectSid; + private String projectName; + private String progressDescription; + private String nextStage; + private String orderDate; + private String [] urls; + private String remarks; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLog.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLog.java new file mode 100644 index 00000000..7005717c --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLog.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.report.biz.projectsupervisionlog; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +@ApiModel(value = "项目阶段 ", description = "项目阶段") +@TableName("project_supervision_log") +public class ProjectSupervisionLog extends BaseEntity { + private String projectSid; + private String logTypeKey; + private String logTypeValue; + private String logText; + private String orderDate; + private String regulatoryWork; + private String workArrangement;// +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogDto.java new file mode 100644 index 00000000..76416346 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogDto.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.report.biz.projectsupervisionlog; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectSupervisionLogDto implements Dto { + private String sid; + private String projectSid; + private String logTypeKey; + private String logTypeValue; + private String logText; + private String orderDate; + private String regulatoryWork; + private String workArrangement;// + private String [] urls; + private String remarks; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogQuery.java new file mode 100644 index 00000000..1d3da835 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogQuery.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.report.biz.projectsupervisionlog; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectSupervisionLogQuery implements Query { + private String id; + private String sid; + private String shSid; + private String projectSid; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogRest.java new file mode 100644 index 00000000..24a531f4 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogRest.java @@ -0,0 +1,48 @@ +package com.yxt.supervise.report.biz.projectsupervisionlog; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.feign.crm.projectsupervisionlog.ProjectSupervisionLogFeign; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Api(tags = "银行负责人信息") +@RestController +@RequestMapping("v1/ProjectSupervisionLog") +public class ProjectSupervisionLogRest { + + @Autowired + private ProjectSupervisionLogFeign projectSupervisionLogFeign; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return projectSupervisionLogFeign.listPage(pq); + } + + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectSupervisionLogDto dto) { + return projectSupervisionLogFeign.save(dto); + } + + + @ApiOperation("删除") + @DeleteMapping("/delete") + public ResultBean del(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + projectSupervisionLogFeign.del(sids); + return rb.success(); + } + + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogVo.java new file mode 100644 index 00000000..b375e2be --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectsupervisionlog/ProjectSupervisionLogVo.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.report.biz.projectsupervisionlog; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectSupervisionLogVo implements Vo { + private String sid; + private String projectSid; + private String projectName; + private String logTypeKey; + private String logTypeValue; + private String logText; + private String orderDate; + private String regulatoryWork; + private String workArrangement;// + private String [] urls; + private String remarks; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index 57381e13..a2198644 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java @@ -167,6 +167,18 @@ public interface CrmMapper extends BaseMapper { "WHERE\n" + "\ta.enterpriseSid = #{enterpriseSid} and url is not NULL") List getPhaseFilesByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid); + @Select({ + "" + }) + List getPhaseFilesByMainsid(@Param("ids") Object[] ids); @Select("select * from enterprise_project where projectSid=#{projectSid}") List getEnterByProjetSid(@Param("projectSid") String projectSid); @Select("select * from storehouse_project where shSid=#{shSid}") @@ -188,4 +200,6 @@ public interface CrmMapper extends BaseMapper { List getSupervisionLogFile(@Param("mainSid") String mainSid); @Select("select * from project_engin_prog_file where mainSid=#{mainSid}") List getEnginProgFile(@Param("mainSid") String mainSid); + @Select("select * from project_files where mainSid=#{mainSid}") + List getProjectFilesByMainSid(@Param("mainSid") String mainSid); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java index d01d64f2..bcd5b6b2 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java @@ -17,4 +17,5 @@ public class ProjectRecordVo { private String url; private String name; private String entryName; + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalance.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalance.java new file mode 100644 index 00000000..a60cd4fb --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalance.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.feign.crm.projectcreditbalance; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditBalance.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditbalance.ProjectCreditBalance
+ * Description: 用还信登记.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-28 22:51:09
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "用还信登记", description = "用还信登记") +@TableName("project_credit_balance") +public class ProjectCreditBalance extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("项目sid") + private String projectsid; // 项目sid + @ApiModelProperty("项目名称") + private String projectname; // 项目名称 + @ApiModelProperty("填报日期") + private String tbdate; // 填报日期 + @ApiModelProperty("用还信类型:1借方用信,2贷方还信") + private String type; // 用还信类型:1借方用信,2贷方还信 + @ApiModelProperty("用还信名称:1借方用信,2贷方还信") + private String typename; // 用还信名称:1借方用信,2贷方还信 + @ApiModelProperty("金额") + private String money; // 金额 + @ApiModelProperty("凭证图片") + private String pzfile; // 凭证图片 + @ApiModelProperty("还信金额") + private String hxmoney; + @ApiModelProperty("用信金额") + private String yxmoney; + @ApiModelProperty("余额") + private String yemoney="0"; + private String expectedCompletionDate;//预计完工时间 + private String expectedDeliveryDate;//预计到货时间 + private String creditNature;//用信性质 + private String creditStage;//用信阶段 + private String pSid;//psid + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDetailsVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDetailsVo.java index 740ba668..05f4cb75 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDetailsVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDetailsVo.java @@ -70,5 +70,10 @@ public class ProjectCreditBalanceDetailsVo implements Vo { private String money; // 金额 @ApiModelProperty("凭证图片") private List pzfiles; // 凭证图片 - + private String expectedCompletionDate;//预计完工时间 + private String expectedDeliveryDate;//预计到货时间 + private String creditNature;//用信性质 + private String creditStage;//用信阶段 + private String pSid;//psid + private String remarks; } \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDto.java index e69d175c..6cb5a322 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDto.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDto.java @@ -70,5 +70,9 @@ public class ProjectCreditBalanceDto implements Dto { private String usersid; // 用户sid @ApiModelProperty("摘要") private String remarks; - + private String expectedCompletionDate;//预计完工时间 + private String expectedDeliveryDate;//预计到货时间 + private String creditNature;//用信性质 + private String creditStage;//用信阶段 + private String pSid;//psid } \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceFeign.java index ccafa828..71103ae9 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceFeign.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceFeign.java @@ -31,6 +31,7 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.ds.crm.ProjectRecordVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -66,8 +67,9 @@ import java.util.List; public interface ProjectCreditBalanceFeign { - - + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") @@ -80,5 +82,10 @@ public interface ProjectCreditBalanceFeign { @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + @ApiOperation("获取url") + @PostMapping("/getUrlsByMainsid") + public ResultBean> getUrlsByMainsid(@RequestBody List sids); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java new file mode 100644 index 00000000..195b6bb9 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceQuery.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.feign.crm.projectcreditbalance; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditBalanceQuery.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditbalance.ProjectCreditBalanceQuery
+ * Description: 用还信登记 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-28 22:51:09
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "用还信登记 查询条件", description = "用还信登记 查询条件") +public class ProjectCreditBalanceQuery implements Query { + + @ApiModelProperty("项目sid") + private String projectSid; // 项目sid + @ApiModelProperty("填报日期结束") + private String tbdateend; // 填报日期结束 + @ApiModelProperty("填报日期开始") + private String tbdatestart; // 填报日期开始 + @ApiModelProperty("用还信类型:1借方用信,2贷方还信") + private String type; // 用还信类型:1借方用信,2贷方还信 + @ApiModelProperty("金额") + private String money; // 金额 + private String userSid; + private List projectsids; + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceVo.java new file mode 100644 index 00000000..902fa51f --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceVo.java @@ -0,0 +1,87 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.feign.crm.projectcreditbalance; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditBalanceVo.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditbalance.ProjectCreditBalanceVo
+ * Description: 用还信登记 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-28 22:51:09
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "用还信登记 视图数据对象", description = "用还信登记 视图数据对象") +public class ProjectCreditBalanceVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("项目sid") + private String projectsid; // 项目sid + @ApiModelProperty("项目名称") + private String projectname; // 项目名称 + @ApiModelProperty("填报日期") + private String tbdate; // 填报日期 + @ApiModelProperty("用还信类型:1借方用信,2贷方还信") + private String type; // 用还信类型:1借方用信,2贷方还信 + @ApiModelProperty("用还信名称:1借方用信,2贷方还信") + private String typename; // 用还信名称:1借方用信,2贷方还信 + @ApiModelProperty("金额") + private String money; // 金额 + @ApiModelProperty("凭证图片") + private String pzfile; // 凭证图片 + @ApiModelProperty("还信金额") + private String hxmoney; + @ApiModelProperty("用信金额") + private String yxmoney; + @ApiModelProperty("余额") + private String yemoney; + private String expectedCompletionDate;//预计完工时间 + private String expectedDeliveryDate;//预计到货时间 + private String creditNature;//用信性质 + private String creditStage;//用信阶段 + private String pSid;//psid + @ApiModelProperty("凭证图片") + private List pzfiles; // 凭证图片 + private String remarks; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditfile/ProjectCreditFileFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditfile/ProjectCreditFileFeign.java new file mode 100644 index 00000000..cc49a9db --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditfile/ProjectCreditFileFeign.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.feign.crm.projectcreditfile; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditFileFeignFallback.java
+ * Class: com.yxt.supervise.enterprisecentre.biz.projectcreditfile.ProjectCreditFileRest
+ * Description: 用还信登记附件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-28 22:51:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ + +@FeignClient( + contextId = "supervise-crm-ProjectCreditFile", + name = "supervise-crm", + path = "v1/projectcreditfile") +public interface ProjectCreditFileFeign { + + @ApiOperation("获取url") + @PostMapping("/getUrlsByMainsid") + public ResultBean> getUrlsByMainsid(@RequestBody List sids); +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectenginprog/ProjectEnginProgFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectenginprog/ProjectEnginProgFeign.java new file mode 100644 index 00000000..5ec02090 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectenginprog/ProjectEnginProgFeign.java @@ -0,0 +1,41 @@ +package com.yxt.supervise.report.feign.crm.projectenginprog; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.biz.projectenginprog.ProjectEnginProgDto; +import com.yxt.supervise.report.biz.projectenginprog.ProjectEnginProgQuery; +import com.yxt.supervise.report.biz.projectenginprog.ProjectEnginProgVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@FeignClient( + contextId = "supervise-crm-ProjectEnginProg", + name = "supervise-crm", + path = "v1/projectenginprog") +public interface ProjectEnginProgFeign { + + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectEnginProgDto dto); + + + @ApiOperation("删除") + @DeleteMapping("/delete") + public ResultBean del(@RequestBody String[] sids); + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectsupervisionlog/ProjectSupervisionLogFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectsupervisionlog/ProjectSupervisionLogFeign.java new file mode 100644 index 00000000..7fc3631f --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectsupervisionlog/ProjectSupervisionLogFeign.java @@ -0,0 +1,40 @@ +package com.yxt.supervise.report.feign.crm.projectsupervisionlog; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.biz.projectsupervisionlog.ProjectSupervisionLogDto; +import com.yxt.supervise.report.biz.projectsupervisionlog.ProjectSupervisionLogQuery; +import com.yxt.supervise.report.biz.projectsupervisionlog.ProjectSupervisionLogVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@FeignClient( + contextId = "supervise-crm-ProjectSupervisionLog", + name = "supervise-crm", + path = "v1/projectsupervisionlog") +public interface ProjectSupervisionLogFeign { + + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectSupervisionLogDto dto); + + + @ApiOperation("删除") + @DeleteMapping("/delete") + public ResultBean del(@RequestBody String[] sids); + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java index 8df41d36..bf8979fe 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/ShRequester.java @@ -18,6 +18,7 @@ public class ShRequester { private static String screen$enterprise$index = "/api/screen/enterprise/index"; //工商业数据大屏 private static String system$order$index = "/api/system/order/index"; //工商业数据大屏 private static String system$index$login = "/api/system/index/login"; //工商业数据大屏 + private static String get_order_list = "/api/screen/enterprise/get_order_list"; //工商业数据大屏 /** * 1.工商业数据大屏 * @@ -53,6 +54,25 @@ public class ShRequester { resp.setData(respObj); return resp; } + public static BaseResponse> get_order_list(IndexQuery reqParams) { + BaseResponse> resp = new BaseResponse<>(); + BaseResponseListObj respObj = new BaseResponseListObj<>(); + Map param = null; + if (reqParams != null) + param = BeanUtil.beanToMap(reqParams); + String s = ShHttp.doGet(get_order_list, param); + BaseResponse> baseResponse = toBean(s, resp, respObj); + List list = baseResponse.getData().getList(); + List outStocks = new ArrayList<>(); + for (JSONObject jsonObject : list) { + OrderIndexVo outStock = JSONUtil.toBean(jsonObject, OrderIndexVo.class); + outStocks.add(outStock); + } + respObj.setList(outStocks); + resp.setData(respObj); + return resp; + } + // BaseResponse> resp = new BaseResponse<>(); // BaseResponseListObj respObj = new BaseResponseListObj<>(); // Map param = null; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java index 9842c5b4..ef9a8e20 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/req/IndexQuery.java @@ -23,4 +23,6 @@ public class IndexQuery implements Query { private String address; private String warehouseCode; private String creditNature; +// ------------------------------------ + private String search_no; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java index 01b4a90e..7cc0fcc6 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/shanhai/resp/OrderIndexVo.java @@ -9,4 +9,5 @@ import lombok.Data; @Data public class OrderIndexVo { private String all_power; + private String total_day_power; }