diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFiles.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFiles.java new file mode 100644 index 00000000..b5ad4852 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFiles.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.crm.api.projectfiles; + +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: ProjectCreditFile.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditfile.ProjectCreditFile
+ * 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 + */ +@Data +@ApiModel(value = "项目附件", description = "项目附件") +@TableName("project_files") +public class ProjectFiles extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主表sid") + private String mainsid; // 主表sid + @ApiModelProperty("项目附件链接") + private String url; // 项目附件链接 + private String absolutePath; // 项目附件链接 + private String name; // 项目附件链接 + + private String typeKey; // 项目附件类型 + private String typeValue; // 项目附件类型 + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesDetailsVo.java new file mode 100644 index 00000000..1d758a54 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesDetailsVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.crm.api.projectfiles; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditFileVo.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditfile.ProjectCreditFileVo
+ * 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 + */ +@Data +@ApiModel(value = "项目附件 视图数据详情", description = "项目附件 视图数据详情") +public class ProjectFilesDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("主表sid") + private String mainsid; // 主表sid + @ApiModelProperty("项目附件链接") + private String url; // 项目附件链接 + private String absolutePath; // 项目附件链接 + private String typeKey; // 项目附件类型 + private String typeValue; // 项目附件类型 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesDto.java new file mode 100644 index 00000000..78fe75e7 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesDto.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.crm.api.projectfiles; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditFileDto.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditfile.ProjectCreditFileDto
+ * 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 + */ +@Data +@ApiModel(value = "项目附件 数据传输对象", description = "项目附件 数据传输对象") +public class ProjectFilesDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("主表sid") + private String mainsid; // 主表sid + List reportList=new ArrayList<>(); + private String typeKey; // 项目附件类型 + private String typeValue; // 项目附件类型 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesQuery.java new file mode 100644 index 00000000..ccfc8526 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesQuery.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.crm.api.projectfiles; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditFileQuery.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditfile.ProjectCreditFileQuery
+ * 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 + */ +@Data +@ApiModel(value = "项目附件 查询条件", description = "项目附件 查询条件") +public class ProjectFilesQuery implements Query { + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("主表sid") + private String mainsid; // 主表sid + @ApiModelProperty("凭证图片") + private String pzfile; // 凭证图片 + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesVo.java new file mode 100644 index 00000000..de0368b1 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/ProjectFilesVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.crm.api.projectfiles; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditFileVo.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditfile.ProjectCreditFileVo
+ * 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 + */ +@Data +@ApiModel(value = "项目附件 视图数据对象", description = "项目附件 视图数据对象") +public class ProjectFilesVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("主表sid") + private String mainsid; // 主表sid + @ApiModelProperty("项目附件链接") + private String url; // 项目附件链接 + private String absolutePath; // 项目附件链接 + + private String typeKey; // 项目附件类型 + private String typeValue; // 项目附件类型 + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/UrlVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/UrlVo.java new file mode 100644 index 00000000..fadf8a7c --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectfiles/UrlVo.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.api.projectfiles; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/9/13 14:19 + */ +@Data +public class UrlVo { + @ApiModelProperty("项目附件链接") + private String url; // 项目附件链接 + private String absolutePath; // 绝对路径 + private String fileSrcName; // 绝对路径 +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhase.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhase.java new file mode 100644 index 00000000..27ac78e8 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhase.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.crm.api.projectphase; + +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_phase") +public class ProjectPhase extends BaseEntity { + private String projectSid; + private String nodeKey; + private String nodeValue; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseDto.java new file mode 100644 index 00000000..0bdd1034 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseDto.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.api.projectphase; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectPhaseDto implements Dto { + private String sid; + private String projectSid; + private String nodeKey; + private String nodeValue; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseQuery.java new file mode 100644 index 00000000..4003a5fb --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseQuery.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.api.projectphase; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectPhaseQuery implements Query { + private String id; + private String sid; + private String shSid; + private String projectSid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseVo.java new file mode 100644 index 00000000..9d73e604 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphase/ProjectPhaseVo.java @@ -0,0 +1,15 @@ +package com.yxt.supervise.crm.api.projectphase; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectPhaseVo implements Vo { + private String projectSid; + private String nodeKey; + private String nodeValue; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecord.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecord.java new file mode 100644 index 00000000..2558b6ae --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecord.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.crm.api.projectphaserecord; + +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_phase") +public class ProjectPhaseRecord extends BaseEntity { + private String projectSid; + private String nodeKey; + private String nodeValue; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordDto.java new file mode 100644 index 00000000..2cd5d967 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordDto.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.crm.api.projectphaserecord; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectPhaseRecordDto implements Dto { + private String sid; + private String enterpriseSid; + private String orderDate; + private String total; + private String nodeKey; + private String nodeValue; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordQuery.java new file mode 100644 index 00000000..0bf4ce6d --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordQuery.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.api.projectphaserecord; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectPhaseRecordQuery implements Query { + private String id; + private String sid; + private String shSid; + private String projectSid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordVo.java new file mode 100644 index 00000000..bb9e6ffc --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/projectphaserecord/ProjectPhaseRecordVo.java @@ -0,0 +1,15 @@ +package com.yxt.supervise.crm.api.projectphaserecord; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectPhaseRecordVo implements Vo { + private String projectSid; + private String nodeKey; + private String nodeValue; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProject.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProject.java index bf7b0087..d383ac31 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProject.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProject.java @@ -15,4 +15,5 @@ import lombok.Data; public class StoreHouseProject extends BaseEntity { private String shSid; private String projectSid; + private String type; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java index a9ca6aed..e9a75402 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectDto.java @@ -14,6 +14,8 @@ public class StoreHouseProjectDto implements Dto { private String id; private String sid; private String shSid;//仓库sid + private String warehouseSid;//仓库sid private String projectSid;//项目sid private List shSids; + private String type; } 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 78f52705..1fea595f 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 @@ -33,6 +33,7 @@ import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFile; import com.yxt.supervise.crm.api.projectcreditfile.ProjectCreditFileDto; import com.yxt.supervise.crm.biz.projectcreditfile.ProjectCreditFileService; import com.yxt.supervise.crm.biz.projectinformation.ProjectInfoVo; +import com.yxt.supervise.crm.biz.projectinformation.ProjectInformation; import com.yxt.supervise.crm.biz.projectinformation.ProjectInformationService; import com.yxt.supervise.crm.biz.projectinformation.ProjectInformationVo; import org.apache.commons.lang3.StringUtils; @@ -149,26 +150,26 @@ public class ProjectCreditBalanceService extends MybatisBaseService().eq("sid",dto.getProjectsid())); + if("2".equals(dto.getType())){ + BigDecimal bigDecimal=new BigDecimal(projectInformation.getUseLimit()); + bigDecimal=bigDecimal.subtract(new BigDecimal(dto.getMoney())); + projectInformation.setUseLimit(bigDecimal.toString()); + }else if("1".equals(dto.getType())){ + BigDecimal bigDecimal=new BigDecimal(projectInformation.getUseLimit()); + bigDecimal=bigDecimal.add(new BigDecimal(dto.getMoney())); + projectInformation.setUseLimit(bigDecimal.toString()); + } + projectInformationService.updateById(projectInformation); } /* public static void main(String[] args) { diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesMapper.java new file mode 100644 index 00000000..0994c794 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesMapper.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.crm.biz.projectfiles; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.projectfiles.ProjectFiles; +import com.yxt.supervise.crm.api.projectfiles.ProjectFilesVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectFilesMapper.java
+ * Class: com.yxt.supervise.enterprisecentre.biz.ProjectFiles.ProjectFilesMapper
+ * 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 + */ +@Mapper +public interface ProjectFilesMapper extends BaseMapper { + + //@Update("update project_credit_file set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from project_credit_file") + List selectListVo(); + @Select("select * from project_credit_file where mainsid=#{mainsid}") + List fetchByMainSid(@Param("mainsid") String 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/projectfiles/ProjectFilesMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesMapper.xml new file mode 100644 index 00000000..35c48130 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesRest.java new file mode 100644 index 00000000..bc933040 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesRest.java @@ -0,0 +1,99 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.crm.biz.projectfiles; + +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.projectfiles.ProjectFilesDetailsVo; +import com.yxt.supervise.crm.api.projectfiles.ProjectFilesDto; +import com.yxt.supervise.crm.api.projectfiles.ProjectFilesQuery; +import com.yxt.supervise.crm.api.projectfiles.ProjectFilesVo; +import com.yxt.supervise.crm.biz.projectfiles.ProjectFilesService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectFilesFeignFallback.java
+ * Class: com.yxt.supervise.enterprisecentre.biz.ProjectFiles.ProjectFilesRest
+ * 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 + */ +@Api(tags = "项目附件") +@RestController("com.yxt.supervise.enterprisecentre.biz.ProjectFiles.ProjectFilesRest") +@RequestMapping("v1/projectfiles") +public class ProjectFilesRest { + + @Autowired + private ProjectFilesService projectFilesService; + + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = projectFilesService.listPageVo(pq); + return rb.success().setData(pv); + } + + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectFilesDto dto){ + ResultBean rb = ResultBean.fireFail(); + projectFilesService.saveOrUpdateDto(dto); + return rb.success(); + } + + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + projectFilesService.delBySids(sids); + return rb.success(); + } + + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ProjectFilesDetailsVo vo = projectFilesService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesService.java new file mode 100644 index 00000000..ee1083dc --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectfiles/ProjectFilesService.java @@ -0,0 +1,120 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.crm.biz.projectfiles; + +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.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.projectfiles.*; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectFilesService.java
+ * Class: com.yxt.supervise.enterprisecentre.biz.ProjectFiles.ProjectFilesService
+ * 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 + */ +@Service +public class ProjectFilesService extends MybatisBaseService { + + @Autowired + private FileUploadComponent fileUploadComponent; + private QueryWrapper createQueryWrapper(ProjectFilesQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ProjectFilesQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ProjectFilesDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ProjectFilesDto dto){ + ProjectFiles entity = new ProjectFiles(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + for (UrlVo 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()); + baseMapper.insert(entity); + } + } + + public void updateByDto(ProjectFilesDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ProjectFiles entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ProjectFilesDetailsVo fetchDetailsVoBySid(String sid){ + ProjectFiles entity = fetchBySid(sid); + ProjectFilesDetailsVo vo = new ProjectFilesDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + public List fetchDetailsVoByMainSid(String sid){ + List entitys = baseMapper.fetchByMainSid(sid); + return entitys; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml index 4d734203..c788198f 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml @@ -16,7 +16,8 @@ ei.enterpriseName, ei.contacts as eContacts, info.regulatoryLeader, - sd.name as stateName ,info.* + sd.name as stateName ,info.*, + p.nodeKey,p.nodeValue FROM project_information info LEFT JOIN project_type_dictionary td on td.sid=info.typeSid @@ -25,6 +26,7 @@ left join bank_manager bm on bm.sid =info.managerSid LEFT JOIN enterprise_information ei on ei.sid=info.enterpriseSid left join project_state_dictionary sd on sd.sid = info.stateSid + left join project_phase p on p.projectSid=info.sid join user_project up on up.projectSid =info.sid ${ew.sqlSegment} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java index 989f9174..671f6f34 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java @@ -30,4 +30,6 @@ public class ProjectInformationQuery implements Query { private String projectType; private String bankName; private String stateSid; + private String nodeKey; + private String nodeValue; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java index 4580f100..b39a19d3 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java @@ -65,7 +65,23 @@ public class ProjectInformationRest implements ProjectInformationFeign { public ResultBean save(@RequestBody ProjectInfoDto dto) { return ProjectInformationService.save(dto); } - + @ApiOperation("保存") + @PostMapping("/saveSxt") + public ResultBean save1(@RequestBody ProjectInfoDto dto) { + return ProjectInformationService.save1(dto); + } + @ApiOperation("全部") + @PostMapping("/warehouseList") + public Object warehouseList(@RequestBody ProjectInformationQuery query) { + return ProjectInformationService.warehouseList(query); + } + @ApiOperation("保存") + @GetMapping("/getWarehouseBySid/{sid}") + public ResultBean save1(@PathVariable String sid) { + ResultBean rb = ResultBean.fireFail(); + ProjectInfoVo projectInfoVo=ProjectInformationService.getWarehouseBySid(sid); + return rb.success().setData(projectInfoVo); + } // @ApiOperation("修改") // @PostMapping("/update") // public ResultBean update(@RequestBody ProjectInfoDto dto) { @@ -158,4 +174,9 @@ public class ProjectInformationRest implements ProjectInformationFeign { List projectSidListByUserSid = ProjectInformationService.getProjectListByUserSid(userSid); return rb.success().setData(projectSidListByUserSid); } + @ApiOperation("修改项目阶段）") + @PostMapping("/updatePhase") + public ResultBean> updatePhase(@RequestBody ProjectInformationQuery query){ + return ProjectInformationService.updatePhase(query); + } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index d952018c..9c99af55 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java @@ -1,6 +1,9 @@ package com.yxt.supervise.crm.biz.projectinformation; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; @@ -12,6 +15,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.crm.api.bankmanager.BankManager; import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto; import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo; +import com.yxt.supervise.crm.api.projectphase.ProjectPhase; import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectVo; import com.yxt.supervise.crm.biz.bankmanager.BankManagerService; @@ -21,6 +25,7 @@ import com.yxt.supervise.crm.api.userproject.UserProject; import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountDto; import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountService; import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountVo; +import com.yxt.supervise.crm.biz.projectphase.ProjectPhaseService; import com.yxt.supervise.crm.biz.projecttypedictionary.ProjectTypeDictionaryService; import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesDto; import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesService; @@ -32,8 +37,11 @@ import com.yxt.supervise.system.sysorganization.SysOrganizationVo; import com.yxt.supervise.system.sysuser.SysUser; import com.yxt.supervise.system.sysuser.SysUserVo; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; @@ -65,6 +73,8 @@ public class ProjectInformationService extends MybatisBaseService listPageVo(PagerQuery pq,String token) { ProjectInformationQuery query = pq.getParams(); @@ -164,6 +174,7 @@ public class ProjectInformationService extends MybatisBaseService 0) { for (StoreHouseProjectDto storeHouseProjectDto : dto.getWarehouse()) { storeHouseProjectDto.setProjectSid(projectSid); + storeHouseProjectDto.setType("1"); } storeHouseProjectService.saveOrUpdateDto(dto.getWarehouse()); }else{ @@ -196,8 +207,64 @@ public class ProjectInformationService extends MybatisBaseService 0) { + for (StoreHouseProjectDto storeHouseProjectDto : dto.getWarehouse()) { + storeHouseProjectDto.setProjectSid(projectSid); + storeHouseProjectDto.setType("2"); + } + storeHouseProjectService.saveOrUpdateDto(dto.getWarehouse()); + }else{ + storeHouseProjectService.deleteByProjectSid(projectSid); + } +// if(StringUtils.isNotBlank(dto.getSid())){ +// System.out.println(entity); +// ProjectInformation projectInformation=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); +// BeanUtil.copyProperties(dto.getBaseInfo(), projectInformation, "id", "sid"); +// baseMapper.updateById(projectInformation); +// }else{ +// baseMapper.insert(entity); +// } + + return rb.success().setMsg("保存项目信息成功"); + } @Transactional + public Object warehouseList(ProjectInformationQuery query) { + String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/list"; + RestTemplate restTemplate = new RestTemplate(); + Map sendBodyMM = new HashMap<>(); + ProjectInformation projectInformation=baseMapper.selectOne(new QueryWrapper().eq("sid",query.getSid())); + List s =storeHouseProjectService.selectStoreBySid2(projectInformation.getEnterpriseSid(),"2"); + sendBodyMM.put("orgPath",projectInformation.getEnterpriseSid()); + ResponseEntity forEntity = restTemplate.postForEntity(a, sendBodyMM,String.class); + com.alibaba.fastjson.JSONObject jsonObject=new com.alibaba.fastjson.JSONObject(); + jsonObject = com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()); + JSONArray jsonArray=com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()).getJSONArray("data"); + List warehouseInfos=new ArrayList<>(); + for (int i = 0; i < jsonArray.size(); i++) { + WarehouseInfo vo= JSON.toJavaObject(jsonArray.getJSONObject(i),WarehouseInfo.class); + for (StoreHouseProjectVo storeHouseProjectVo : s) { + if(vo.getSid()!=storeHouseProjectVo.getShSid()){ + warehouseInfos.add(vo); + } + } + } + + return warehouseInfos; + } + +// @Transactional // public ResultBean update(ProjectInfoDto dto) { // ResultBean rb=new ResultBean(); // String dtoSid = dto.getSid(); @@ -251,7 +318,41 @@ public class ProjectInformationService extends MybatisBaseService storeHouseProjectVos = storeHouseProjectService.selectStoreBySid1(bank.getSid(),"2"); + for (StoreHouseProjectVo storeHouseProjectVo : storeHouseProjectVos) { + String a ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/initialization/"+storeHouseProjectVo.getShSid(); + RestTemplate restTemplate = new RestTemplate(); + ResponseEntity forEntity = restTemplate.getForEntity(a,String.class); + com.alibaba.fastjson.JSONObject jsonObject=new com.alibaba.fastjson.JSONObject(); + jsonObject = com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()).getJSONObject("data"); + WarehouseInfoVo vo=JSON.toJavaObject(jsonObject, WarehouseInfoVo.class); + storeHouseProjectVo.setAddress(vo.getAddress()); + storeHouseProjectVo.setName(vo.getWarehouseName()); + storeHouseProjectVo.setLinkerName(vo.getContacts()); + storeHouseProjectVo.setLinkerPhone(vo.getTelephone()); + } + projectInfoVo.setWarehouse(storeHouseProjectVos); + return projectInfoVo; + } + return new ProjectInfoVo(); + } public ProjectInfoVo getProjectBySid(String sid) { ProjectInfoVo projectInfoVo = new ProjectInfoVo(); ProjectInformationVo bank = baseMapper.getProjectBySid(sid); @@ -435,4 +536,11 @@ public class ProjectInformationService extends MybatisBaseService projectByUserSid = baseMapper.getProjectListByUserSid(sid); return projectByUserSid; } + public ResultBean updatePhase( ProjectInformationQuery query){ + ProjectPhase w=projectPhaseService.getOne(new QueryWrapper().eq("projectSid",query.getSid())); + w.setNodeKey(query.getNodeKey()); + w.setNodeValue(query.getNodeValue()); + projectPhaseService.updateById(w); + return new ResultBean<>().success(); + } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java index bd3f1729..0141d04b 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java @@ -77,4 +77,6 @@ public class ProjectInformationVo implements Vo { private SysUser sysUser; //银行 private SysOrganizationVo sysOrganizationVo; + private String nodeKey; + private String nodeValue; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/WarehouseInfo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/WarehouseInfo.java new file mode 100644 index 00000000..f926653b --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/WarehouseInfo.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.crm.biz.projectinformation; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class WarehouseInfo extends BaseEntity { + + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String lngAndLat;//经纬度 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private Integer usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private Integer sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/WarehouseInfoVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/WarehouseInfoVo.java new file mode 100644 index 00000000..73102e80 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/WarehouseInfoVo.java @@ -0,0 +1,48 @@ +package com.yxt.supervise.crm.biz.projectinformation; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInfoVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private Integer isEnable; + private Integer state; + private Integer isDelete; + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String lngAndLat;//经纬度 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private Integer usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private Integer sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + + private String userSid; + private String orgPath; + private String gsd; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.java new file mode 100644 index 00000000..4443cb1b --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.crm.biz.projectphase; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.projectphase.ProjectPhase; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Mapper +public interface ProjectPhaseMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + List getNodeByProjectSid(@Param("projectSid") String projectSid); + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.xml new file mode 100644 index 00000000..31de3e75 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseRest.java new file mode 100644 index 00000000..5e23d0d3 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseRest.java @@ -0,0 +1,78 @@ +package com.yxt.supervise.crm.biz.projectphase; + +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.projectphase.ProjectPhaseDto; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseQuery; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Api(tags = "银行负责人信息") +@RestController +@RequestMapping("v1/ProjectPhase") +public class ProjectPhaseRest { + + @Autowired + private ProjectPhaseService ProjectPhaseService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = ProjectPhaseService.listPageVo(pq); + return rb.success().setData(pv); + } + + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectPhaseDto dto) { + return ProjectPhaseService.saveProjectPhase(dto); + } + +// @ApiOperation("修改") +// @PostMapping("/update") +// public ResultBean update(@RequestBody ProjectPhaseDto dto) { +// ResultBean rb = ResultBean.fireFail(); +// +// ResultBean resultBean = ProjectPhaseService.updateProjectPhase(dto); +// if (!resultBean.getSuccess()) { +// return rb.setMsg(resultBean.getMsg()); +// } +// return rb.success().setMsg(resultBean.getMsg()); +// } + + @ApiOperation("删除") + @DeleteMapping("/delete") + public ResultBean del(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + ProjectPhaseService.delBySids(sids); + return rb.success(); + } + @ApiOperation("根据sid查询") + @GetMapping("/getManagerBySid/{sid}") + public ResultBean getManagerBySid(@PathVariable String sid) { + ResultBean rb = ResultBean.fireFail(); + ProjectPhaseVo vo = ProjectPhaseService.getManagerBySid(sid); + if (vo == null) { + return rb.setMsg("该银行联系人不存在"); + } + return rb.success().setData(vo); + } + @ApiOperation("根据sid查询") + @GetMapping("/getNodeByProjectSid") + public ResultBean> getNodeByProjectSid(@RequestParam("projectSid") String projectSid) { + return ProjectPhaseService.getNodeByProjectSid(projectSid); + } + + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseService.java new file mode 100644 index 00000000..6704b5fa --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphase/ProjectPhaseService.java @@ -0,0 +1,84 @@ +package com.yxt.supervise.crm.biz.projectphase; + +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.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +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.projectphase.ProjectPhase; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseDto; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseQuery; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Service +public class ProjectPhaseService extends MybatisBaseService { + @Autowired + com.yxt.supervise.crm.feign.system.SysUserFeign sysUserFeign; + + public PagerVo listPageVo(PagerQuery pq) { + ProjectPhaseQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// if(StringUtils.isNotBlank(query.getEnterpriseName())){ +// qw.like("enterpriseName",query.getEnterpriseName()); +// } +// if(StringUtils.isNotBlank(query.getTelephone())){ +// qw.like("telephone",query.getTelephone()); +// } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + + /** + * 新增 + * @param dto 数据传输对象 + * @return + */ + public ResultBean saveProjectPhase(ProjectPhaseDto dto) { + ResultBean rb = ResultBean.fireFail(); + ProjectPhase entity=new ProjectPhase(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success(); + } + + + /** + * 编辑保存银行负责人 + * @param dto 数据传输对象 + * @return + */ + public ResultBean updateProjectPhase(ProjectPhaseDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + ProjectPhase entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("更新成功"); + } + + public ProjectPhaseVo getManagerBySid(String sid) { + ProjectPhaseVo vo = new ProjectPhaseVo(); + ProjectPhase ProjectPhase = this.fetchBySid(sid); + BeanUtil.copyProperties(ProjectPhase, vo); + return vo; + } + public ResultBean> getNodeByProjectSid(String projectSid) { + ResultBean rb =new ResultBean().fail(); + List projectPhaseVoList=baseMapper.getNodeByProjectSid(projectSid); + return rb.success().setData(projectPhaseVoList); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordMapper.java new file mode 100644 index 00000000..7e92a0f9 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordMapper.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.crm.biz.projectphaserecord; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.projectphase.ProjectPhase; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Mapper +public interface ProjectPhaseRecordMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + List getNodeByProjectSid(@Param("projectSid") String projectSid); + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordMapper.xml new file mode 100644 index 00000000..397e5263 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordRest.java new file mode 100644 index 00000000..d793abd9 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordRest.java @@ -0,0 +1,40 @@ +package com.yxt.supervise.crm.biz.projectphaserecord; + +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.projectphase.ProjectPhaseDto; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseQuery; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Api(tags = "银行负责人信息") +@RestController +@RequestMapping("v1/ProjectPhaserecord") +public class ProjectPhaseRecordRest { + + @Autowired + private ProjectPhaseRecordService ProjectPhaseService; + + + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectPhaseDto dto) { + return ProjectPhaseService.saveProjectPhase(dto); + } + + + + + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordService.java new file mode 100644 index 00000000..423e9b50 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectphaserecord/ProjectPhaseRecordService.java @@ -0,0 +1,45 @@ +package com.yxt.supervise.crm.biz.projectphaserecord; + +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.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +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.projectphase.ProjectPhase; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseDto; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseQuery; +import com.yxt.supervise.crm.api.projectphase.ProjectPhaseVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Service +public class ProjectPhaseRecordService extends MybatisBaseService { + @Autowired + com.yxt.supervise.crm.feign.system.SysUserFeign sysUserFeign; + + + + /** + * 新增 + * @param dto 数据传输对象 + * @return + */ + public ResultBean saveProjectPhase(ProjectPhaseDto dto) { + ResultBean rb = ResultBean.fireFail(); + ProjectPhase entity=new ProjectPhase(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success(); + } + + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java index 0e2b8c6d..aff54515 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java @@ -17,6 +17,10 @@ import java.util.List; public interface StoreHouseProjectMapper extends BaseMapper { @Select("select * from storehouse_project where projectSid=#{sid}") List selectStoreBySid(@Param("sid")String sid); + @Select("select * from storehouse_project where projectSid=#{sid} and type =#{type}") + List selectStoreBySid1(@Param("sid")String sid,@Param("type")String type); + @Select("select * from storehouse_project a left join enterprise_project b on a.projectSid =b.projectSid where b.enterpriseSid=#{enterpriseSid} and a.type =#{type} ") + List selectStoreBySid2(@Param("enterpriseSid")String enterpriseSid,@Param("type")String type); @Select("select * from storehouse_project where shSid=#{sid}") StoreHouseProjectVo selectProjectByshSid(@Param("sid")String sid); @Select("select shSid from storehouse_project") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java index fa182d2f..56560967 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java @@ -31,7 +31,7 @@ public class StoreHouseProjectService extends MybatisBaseService dtos) { //删除之前选择的仓库信息 - baseMapper.delete(new QueryWrapper().eq("projectSid",dtos.get(0).getProjectSid())); + baseMapper.delete(new QueryWrapper().eq("projectSid",dtos.get(0).getProjectSid()).eq("type",dtos.get(0).getType())); for(StoreHouseProjectDto dto:dtos){ StoreHouseProject entity = new StoreHouseProject(); BeanUtil.copyProperties(dto, entity, "id", "sid"); @@ -86,6 +86,14 @@ public class StoreHouseProjectService extends MybatisBaseService selectStoreBySid1(String sid,String type) { + List pagging = baseMapper.selectStoreBySid1(sid,type); + return pagging; + } + public List selectStoreBySid2(String sid,String type) { + List pagging = baseMapper.selectStoreBySid2(sid,type); + return pagging; + } public StoreHouseProjectVo selectProjectByshSid(String sid) { StoreHouseProjectVo pagging = baseMapper.selectProjectByshSid(sid); return pagging; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java index 11e65798..06540efa 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java @@ -12,9 +12,10 @@ public class DataCenterQuery implements Query { //开始时间 private String startDate; //间隔时间 - private String intervalTime; + private String intervalTime="7"; // private String projectSid; + } 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 724847d0..a352bb4c 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 @@ -1,26 +1,33 @@ package com.yxt.supervise.report.biz.datacenter; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.yxt.common.base.utils.PinYinUtils; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; -import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; -import com.yxt.supervise.report.biz.projectdaily.ProjectDailyQuery; import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService; import com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos; import com.yxt.supervise.report.biz.projectdaily.ProjectDailys; +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.biz.reportinventory.ReportInventoryService; +import com.yxt.supervise.report.ds.crm.*; +import com.yxt.supervise.report.feign.crm.projectphaserecord.ProjectPhaseRecordFeign; import com.yxt.supervise.report.feign.monitor.YDeviceFeign; import com.yxt.supervise.report.feign.monitor.YDeviceImageFeign; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import org.springframework.web.client.RestTemplate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** * @author wangpengfei @@ -39,6 +46,10 @@ public class DataCenterRest { ReportInventoryDayGatherService reportInventoryDayGatherService; @Autowired DataCenterService dataCenterService; + @Autowired + CrmMapper crmMapper; + @Autowired + ProjectPhaseRecordFeign projectPhaseRecordFeign; //数据总览 /*********************************************36524演示************************************/ @@ -188,4 +199,206 @@ public class DataCenterRest { // String b=jsonObject.get("date"); return jsonObject; } + + + + //@Todo 山海光伏大屏数据接口 + + @ApiOperation("项目概况") + @PostMapping("/projectOverview") + public ResultBean projectOverview(@RequestBody DataCenterQuery query){ + ResultBean rb=new ResultBean(); + ShDateCenterVo shDateCenterVo=new ShDateCenterVo(); + ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + String a1 ="https://wms.yxtsoft.com/apiv1/external/v1/crmcustomertemp/getCustomerByOrgSid?orgSid="+projectInfo.getEnterpriseSid(); + String b2 ="https://wms.yxtsoft.com/apiv1/external/apiadmin/supplierinfo/getSupplierCountByOrgSid?orgSid="+projectInfo.getEnterpriseSid(); + RestTemplate restTemplate = new RestTemplate(); + ResponseEntity forEntity = restTemplate.getForEntity(a1,String.class); + ResponseEntity forEntity1 = restTemplate.getForEntity(b2,String.class); + Integer jsonObject = JSONObject.parseObject(forEntity.getBody()).getInteger("data"); + Integer jsonObject1 = JSONObject.parseObject(forEntity1.getBody()).getInteger("data"); + shDateCenterVo.setDownstreamEnterprises(jsonObject); + shDateCenterVo.setUpstreamEnterprises(jsonObject1); +// shDateCenterVo.setDownstreamEnterprises(1); +// shDateCenterVo.setUpstreamEnterprises(1); + List projectInfoList=crmMapper.getProjectcs(projectInfo.getEnterpriseSid()); + List projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid()); + + for (ProjectInfo info : projectInfoList) { + shDateCenterVo.setTotalSxLimit(shDateCenterVo.getTotalSxLimit().add(info.getCreditLimitN())); + shDateCenterVo.setTotalYxLimit(shDateCenterVo.getTotalYxLimit().add(info.getUseLimitN())); + } + List shValueVoList=new ArrayList<>(); + for (int i = 0; i getCreditBalance(@RequestBody DataCenterQuery query){ + ResultBean rb=new ResultBean(); + ShCreditBalanceVo shCreditBalanceVo=new ShCreditBalanceVo(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + String start =sdf.format(DateUtil.offsetDay(DateUtil.parse(query.getStartDate()), -7)); + List projectInfo1=crmMapper.sumMoney(projectInfo.getEnterpriseSid(), start,query.getStartDate()); + List shCreditBalanceVos=crmMapper.getRecordByEnterpriseSid(projectInfo.getEnterpriseSid(), start,query.getStartDate()); + + for (ProjectInfo info : projectInfo1) { + if (info.getType().equals("1")){ + shCreditBalanceVo.setUseLimit(info.getSumMoney()); + }else if(info.getType().equals("2")){ + shCreditBalanceVo.setRepayment(info.getSumMoney()); + } + } + shCreditBalanceVo.setList(shCreditBalanceVos); + return rb.success().setData(shCreditBalanceVo); + } + @ApiOperation("单位信息") + @PostMapping("/getEnterpriseInfo") + public ResultBean> getEnterpriseInfo(@RequestBody DataCenterQuery query){ + ResultBean rb=new ResultBean(); + Map map=new HashMap<>(); + ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + List projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid()); + Integer w=crmMapper.getEnterpirseCount(projectInfo.getEnterpriseSid()); + map.put("loanEnterprise","1"); + map.put("ensureEnterprise","1"); + map.put("bank","1"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(query.getStartDate()),-Integer.parseInt(query.getIntervalTime())+1)); + long i=DateUtil.between(DateUtil.parse(query.getStartDate()),DateUtil.parse(EndDate), DateUnit.DAY); + List a=new ArrayList<>(); + for(int k=0;k b=new ArrayList<>(); + ShListVo v=new ShListVo(); + v.setName(infoList.getNodeValue()); + for (String s : a) { + ShPhaseRecordVo creditBalanceCrmVos=crmMapper.getPhaseRecordByProject(projectInfo.getEnterpriseSid(), s,infoList.getNodeValue()); + if(creditBalanceCrmVos!=null){ + b.add(creditBalanceCrmVos.getTotal().intValue()); + }else{ + b.add(0); + } + } + v.setList(b.toArray()); + map.put(PinYinUtils.getPinYinName(infoList.getNodeValue()),v); + } + map.put("date",a.stream().distinct()); + return rb.success().setData(map); + } + @ApiOperation("项目概况(地图)") + @PostMapping("/projectOverviewMap") + public ResultBean> projectOverviewMap(@RequestBody DataCenterQuery query){ + ResultBean rb=new ResultBean(); + Map map=new HashMap<>(); + ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + List projectInfoList=crmMapper.getProjectcs(projectInfo.getEnterpriseSid()); + List projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid()); + String a1 ="https://wms.yxtsoft.com/apiv1/external/apiadmin/warehouseinfo/getWarehouseCountByOrgSid?orgSid="+projectInfo.getEnterpriseSid(); + RestTemplate restTemplate = new RestTemplate(); + ResponseEntity forEntity = restTemplate.getForEntity(a1,String.class); + JSONArray jsonArray=com.alibaba.fastjson.JSONObject.parseObject(forEntity.getBody()).getJSONArray("data"); + List vos=new ArrayList<>(); + for (int i = 0; i < jsonArray.size(); i++) { + WarehouseInfoVoSheng vo= JSON.toJavaObject(jsonArray.getJSONObject(i),WarehouseInfoVoSheng.class); + vos.add(vo); + } + int dd=0; + int zj=0; + int jg=0; + for (ProjectInfo infoList : projectInfoList) { +// int a=crmMapper.getPhaseByProject(projectInfo.getSid(),infoList.getNodeValue()); + if (infoList.getNodeValue().equals("在途")){ + dd++; + } + if (infoList.getNodeValue().equals("在建")){ + zj++; + } + if (infoList.getNodeValue().equals("竣工")){ + jg++; + } + } + List warehouseInfoVoSheng1s=new ArrayList<>(); + for (WarehouseInfoVoSheng vo : vos) { + List c=crmMapper.getPhaseByProject(vo.getList().stream().map(WarehouseInfoVo::getSid).toArray()); + for (ShPhaseRecordVo shPhaseRecordVo : c) { + if (shPhaseRecordVo.getNodeValue().equals("在途")){ + vo.setDd(vo.getDd()+1); + } + if (shPhaseRecordVo.getNodeValue().equals("在建")){ + vo.setZj(vo.getDd()+1); + } + if (shPhaseRecordVo.getNodeValue().equals("竣工")){ + vo.setJg(vo.getDd()+1); + } + } + if(c.size()!=0){ + WarehouseInfoVoSheng1 warehouseInfoVoSheng1=new WarehouseInfoVoSheng1(); + warehouseInfoVoSheng1.setName(vo.getBelongingPlace()); + warehouseInfoVoSheng1.setJg(vo.getJg()); + warehouseInfoVoSheng1.setDd(vo.getDd()); + warehouseInfoVoSheng1.setZj(vo.getZj()); + warehouseInfoVoSheng1.setValue(warehouseInfoVoSheng1.getDd()+warehouseInfoVoSheng1.getJg()+warehouseInfoVoSheng1.getZj()); + warehouseInfoVoSheng1s.add(warehouseInfoVoSheng1); + } + } + map.put("dd",dd); + map.put("zj",zj); + map.put("jg",jg); + map.put("zs",projectInfoList.size()); + map.put("map",warehouseInfoVoSheng1s); + return rb.success().setData(map); + } + + @ApiOperation("项目报告") + @PostMapping("/projectReport") + public ResultBean> projectReport(@RequestBody DataCenterQuery query){ + ResultBean rb=new ResultBean(); + Map map=new HashMap<>(); + ProjectInfo projectInfo=crmMapper.getProject(query.getProjectSid()); + List projectInfoList=crmMapper.getProjectcs(projectInfo.getEnterpriseSid()); + List projectInfoLists=crmMapper.getNodeValue(projectInfo.getEnterpriseSid()); + for (ProjectInfo infoList : projectInfoLists) { + Integer i= crmMapper.getPhaseFilesCount(projectInfo.getEnterpriseSid(),infoList.getNodeValue()); + map.put(PinYinUtils.getPinYinName(infoList.getNodeValue()),i.toString()); + } + List projectRecordVos=crmMapper.getPhaseFilesByEnterpriseSid(projectInfo.getEnterpriseSid()); + map.put("list",projectRecordVos); + return rb.success().setData(map); + } +// @Scheduled(cron = "57 * * * * ?") + public void rr(){ + List projectInfoLists=crmMapper.getProjectcs("0d19bc72-9370-45d3-bfda-5662eab34e4b"); + List projectInfo1=crmMapper.getNodeValue("0d19bc72-9370-45d3-bfda-5662eab34e4b"); + for (ProjectInfo info : projectInfo1) { + ProjectPhaseRecordDto dto=new ProjectPhaseRecordDto(); + dto.setOrderDate(new Date().toString()); + dto.setEnterpriseSid(info.getEnterpriseSid()); + dto.setNodeKey(info.getNodeKey()); + dto.setNodeValue(info.getNodeValue()); + for (ProjectInfo projectInfoList : projectInfoLists) { + if(info.getNodeValue().equals(projectInfoList.getNodeValue())){ + dto.setTotal(dto.getTotal().add(projectInfoList.getUseLimitN())); + } + } + projectPhaseRecordFeign.save(dto); + } + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShCreditBalanceRecordVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShCreditBalanceRecordVo.java new file mode 100644 index 00000000..99f1a080 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShCreditBalanceRecordVo.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.report.biz.datacenter; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/9/11 11:08 + */ +@Data +public class ShCreditBalanceRecordVo { + private String sid; + private String tddate; + private String type; + private String typename; + private String money; + private String pzfile; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShCreditBalanceVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShCreditBalanceVo.java new file mode 100644 index 00000000..3c466497 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShCreditBalanceVo.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.yxt.supervise.report.ds.crm.ShCreditBalanceCrmVo; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/9/10 9:31 + */ +@Data +public class ShCreditBalanceVo { + private BigDecimal useLimit=new BigDecimal(0); + private BigDecimal repayment=new BigDecimal(0); + List List=new ArrayList<>(); +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShDateCenterVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShDateCenterVo.java new file mode 100644 index 00000000..23127cbc --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShDateCenterVo.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.report.biz.datacenter; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/9/10 9:24 + */ +@Data +public class ShDateCenterVo { + + private Integer upstreamEnterprises;//上游 + private Integer downstreamEnterprises;//下游 + private BigDecimal totalSxLimit=new BigDecimal(0);//授信 + private BigDecimal totalYxLimit=new BigDecimal(0);//用信 + private List shValueVoList; + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShListVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShListVo.java new file mode 100644 index 00000000..2e888592 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShListVo.java @@ -0,0 +1,15 @@ +package com.yxt.supervise.report.biz.datacenter; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2024/9/11 15:07 + */ +@Data +public class ShListVo { + private String name; + private Object [] list; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShProjectDateCenterVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShProjectDateCenterVo.java new file mode 100644 index 00000000..e32eac1e --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShProjectDateCenterVo.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.report.biz.datacenter; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/9/10 9:24 + */ +@Data +public class ShProjectDateCenterVo { + + private Integer LoanEnterprise;//上游 + private Integer ensureEnterprise;//下游 + private Integer bank;//授信 + private String[] dateList; + private ShListVo list1; + private ShListVo list2; + private ShListVo list3; + + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShValueVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShValueVo.java new file mode 100644 index 00000000..4fb10acb --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/ShValueVo.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.report.biz.datacenter; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2024/9/10 9:31 + */ +@Data +public class ShValueVo { + private String name; + private BigDecimal value=new BigDecimal(0); +// private String value; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng.java new file mode 100644 index 00000000..e6b51c67 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.yxt.supervise.report.biz.projectinformation.WarehouseInfoVo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/9/12 14:08 + */ +@Data +public class WarehouseInfoVoSheng { + private String belongingPlace;//归属地 + List list=new ArrayList<>(); + private Integer dd=0; + private Integer zj=0; + private Integer jg=0; + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng1.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng1.java new file mode 100644 index 00000000..4956d367 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/WarehouseInfoVoSheng1.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.report.biz.datacenter; + +import com.yxt.supervise.report.biz.projectinformation.WarehouseInfoVo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/9/12 14:08 + */ +@Data +public class WarehouseInfoVoSheng1 { + private String name;//归属地 + private Integer value=0;//归属地 + private Integer dd=0; + private Integer zj=0; + private Integer jg=0; + +} 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 new file mode 100644 index 00000000..875fc0be --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectcreditbalance/ProjectCreditBalanceRest.java @@ -0,0 +1,92 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.biz.projectcreditbalance; + +import cn.hutool.core.lang.Assert; +import com.alibaba.excel.EasyExcel; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditBalanceFeignFallback.java
+ * Class: com.yxt.supervise.enterprisecentre.biz.projectcreditbalance.ProjectCreditBalanceRest
+ * 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 + */ +@Api(tags = "用还信登记") +@RestController("com.yxt.supervise.enterprisecentre.biz.projectcreditbalance.ProjectCreditBalanceRest") +@RequestMapping("v1/projectcreditbalance") +public class ProjectCreditBalanceRest implements ProjectCreditBalanceFeign { + + @Autowired + private ProjectCreditBalanceFeign projectCreditBalanceFeign; + + + + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectCreditBalanceDto dto){ + ResultBean rb = ResultBean.fireFail(); + projectCreditBalanceFeign.save(dto); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + return projectCreditBalanceFeign.fetchDetailsBySid(sid); + } + + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/ProjectFilesDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/ProjectFilesDto.java new file mode 100644 index 00000000..8d511e19 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/ProjectFilesDto.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.biz.projectfiles; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditFileDto.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditfile.ProjectCreditFileDto
+ * 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 + */ +@Data +@ApiModel(value = "项目附件 数据传输对象", description = "项目附件 数据传输对象") +public class ProjectFilesDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("主表sid") + private String mainsid; // 主表sid + List reportList=new ArrayList<>(); + private String typeKey; // 项目附件类型 + private String typeValue; // 项目附件类型 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/ProjectFilesRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/ProjectFilesRest.java new file mode 100644 index 00000000..67d15284 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/ProjectFilesRest.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.biz.projectfiles; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.report.feign.crm.projectfiles.ProjectFilesFeign; +import io.swagger.annotations.Api; +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(企业用信登记)
+ * File: ProjectFilesFeignFallback.java
+ * Class: com.yxt.supervise.enterprisecentre.biz.ProjectFiles.ProjectFilesRest
+ * 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 + */ +@Api(tags = "项目附件") +@RestController("com.yxt.supervise.enterprisecentre.biz.ProjectFiles.ProjectFilesRest") +@RequestMapping("v1/ProjectFiles") +public class ProjectFilesRest { + + @Autowired + private ProjectFilesFeign projectFilesFeign; + + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectFilesDto dto){ + ResultBean rb = ResultBean.fireFail(); + return projectFilesFeign.save(dto); + } + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/UrlVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/UrlVo.java new file mode 100644 index 00000000..c5b42fec --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectfiles/UrlVo.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.report.biz.projectfiles; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/9/13 14:19 + */ +@Data +public class UrlVo { + @ApiModelProperty("项目附件链接") + private String url; // 项目附件链接 + private String absolutePath; // 绝对路径 + private String fileSrcName; // 绝对路径 +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInfoDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInfoDto.java new file mode 100644 index 00000000..6c2a38a5 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInfoDto.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.report.biz.projectinformation; + +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/10/17 16:14 + */ +@Data +public class ProjectInfoDto { + private String id; + private String sid; + + //仓库信息dto + private List warehouse; + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java index d9f8357e..fd37e484 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java @@ -37,4 +37,25 @@ public class ProjectInformationRest { public ResultBean> listAllNew(@RequestHeader("token") String token){ return projectInformationFeign.listAllNew(token); } + @ApiOperation("修改项目阶段）") + @PostMapping("/updatePhase") + public ResultBean> updatePhase(@RequestBody ProjectInformationQuery query){ + return projectInformationFeign.updatePhase(query); + } + @ApiOperation("保存") + @PostMapping("/saveSxt") + public ResultBean save1(@RequestBody ProjectInfoDto dto) { + return projectInformationFeign.save1(dto); + } + + @ApiOperation("全部") + @PostMapping("/warehouseList") + public Object warehouseList(@RequestBody ProjectInformationQuery query) { + return projectInformationFeign.warehouseList(query); + } + @ApiOperation("保存") + @GetMapping("/getWarehouseBySid/{sid}") + public ResultBean save1(@PathVariable("sid") String sid) { + return projectInformationFeign.getWarehouseBySid(sid); + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/StoreHouseProjectDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/StoreHouseProjectDto.java new file mode 100644 index 00000000..e7a867b2 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/StoreHouseProjectDto.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.report.biz.projectinformation; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class StoreHouseProjectDto implements Dto { + private String id; + private String sid; + private String shSid;//仓库sid + private String warehouseSid;//仓库sid + private String projectSid;//项目sid + private List shSids; + private String type; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/WarehouseInfoVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/WarehouseInfoVo.java new file mode 100644 index 00000000..f61df203 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/WarehouseInfoVo.java @@ -0,0 +1,49 @@ +package com.yxt.supervise.report.biz.projectinformation; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInfoVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private Integer isEnable; + private Integer state; + private Integer isDelete; + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String lngAndLat;//经纬度 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private Integer usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private Integer sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid + + private String userSid; + private String orgPath; + private String gsd; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphase/ProjectPhaseRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphase/ProjectPhaseRest.java new file mode 100644 index 00000000..38f3c92d --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphase/ProjectPhaseRest.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.report.biz.projectphase; + +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.projectphase.ProjectPhaseFeign; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Api(tags = "银行负责人信息") +@RestController +@RequestMapping("v1/projectphase") +public class ProjectPhaseRest { + + @Autowired + private ProjectPhaseFeign projectPhaseFeign; + + @ApiOperation("根据sid查询") + @GetMapping("/getNodeByProjectSid") + public ResultBean> getNodeByProjectSid(@RequestParam("projectSid") String projectSid) { + return projectPhaseFeign.getNodeByProjectSid(projectSid); + } + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphase/ProjectPhaseVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphase/ProjectPhaseVo.java new file mode 100644 index 00000000..f9099a91 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphase/ProjectPhaseVo.java @@ -0,0 +1,15 @@ +package com.yxt.supervise.report.biz.projectphase; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectPhaseVo implements Vo { + private String projectSid; + private String nodeKey; + private String nodeValue; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphaserecord/ProjectPhaseRecordDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphaserecord/ProjectPhaseRecordDto.java new file mode 100644 index 00000000..67fa320f --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphaserecord/ProjectPhaseRecordDto.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.report.biz.projectphaserecord; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2023/7/19 15:37 + */ +@Data +public class ProjectPhaseRecordDto implements Dto { + private String sid; + private String enterpriseSid; + private String orderDate; + private BigDecimal total; + private String nodeKey; + private String nodeValue; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphaserecord/ProjectPhaseRecordRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphaserecord/ProjectPhaseRecordRest.java new file mode 100644 index 00000000..9418a9a0 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectphaserecord/ProjectPhaseRecordRest.java @@ -0,0 +1,37 @@ +package com.yxt.supervise.report.biz.projectphaserecord; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.report.feign.crm.projectphaserecord.ProjectPhaseRecordFeign; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@Api(tags = "银行负责人信息") +@RestController +@RequestMapping("v1/projectphaserecord") +public class ProjectPhaseRecordRest { + + @Autowired + private ProjectPhaseRecordFeign projectPhaseRecordFeign; + + + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectPhaseRecordDto dto) { + return projectPhaseRecordFeign.save(dto); + } + + + + + +} 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 e01d9d5e..9a8f06d0 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 @@ -3,10 +3,7 @@ package com.yxt.supervise.report.ds.crm; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.supervise.report.ds.warehouse.StoreHouse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.*; import java.math.BigDecimal; import java.util.List; @@ -58,6 +55,8 @@ public interface CrmMapper extends BaseMapper { List getAccountByProjectSid(@Param("projectSid")String projectSid); @Select("select * from project_information") List getProjects(); + @Select("select * from project_information where sid =#{sid}") + ProjectInfo getProject(@Param("sid") String sid); @Select("select sid,projectType from project_type_dictionary") List getProjectType(); @Select({ @@ -90,4 +89,61 @@ public interface CrmMapper extends BaseMapper { " left join project_state_dictionary sd on sd.sid=info.stateSid\n" + " WHERE info.sid=#{sid}") ProjectInfo fetchProjectBySid(@Param("sid") String sid); + @Select("select b.*,c.nodeKey,c.nodeValue,b.useLimit as useLimitN,b.creditLimit as creditLimitN, d.shSid as shSid from enterprise_project a " + + "left join project_information b on b.sid =a.projectSid " + + "left join project_phase c on c.projectSid =b.sid " + + "left join storehouse_project d on d.projectSid=b.sid and d.type='2'"+ + "where a.enterpriseSid=#{enterpriseSid}") + List getProjectcs(@Param("enterpriseSid") String enterpriseSid); + @Select("select a.* from project_phase_dictionary a " + + "where a.enterpriseSid=#{enterpriseSid}") + List getNodeValue(@Param("enterpriseSid") String enterpriseSid); + + @Select("select count(sid) from enterprise_project where enterpriseSid=#{enterpriseSid}") + Integer getEnterpirseCount(@Param("enterpriseSid") String enterpriseSid); + @Select("select type,sum(money) as sumMoney from project_credit_balance a left join project_information b on b.sid=a.projectSid where b.enterpriseSid=#{enterpriseSid} and tbdate>=#{start} and tbdate<=#{end} GROUP BY a.type ") + List sumMoney(@Param("enterpriseSid") String enterpriseSid,@Param("start")String start,@Param("end")String end); + @Select("select a.*,b.sid as enterpriseSid,c.enterpriseName as enterpriseName from project_credit_balance a left join project_information b on b.sid=a.projectSid left join enterprise_information c on c.sid=b.enterpriseSid where b.enterpriseSid=#{enterpriseSid} and tbdate>=#{start} and tbdate<=#{end} ") + List getRecordByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid, @Param("start")String start, @Param("end")String end); + + @Select("select * from project_phase_record a where a.enterpriseSid=#{enterpriseSid} and orderDate=#{orderDate} and nodeKey=#{nodeKey} ") + ShPhaseRecordVo getPhaseRecordByProject(@Param("enterpriseSid") String enterpriseSid, @Param("orderDate")String orderDate,@Param("nodeKey")String nodeKey); + + + @Select({ + "" + }) + List getPhaseByProject(@Param("ids") Object[] ids); + @Select("SELECT\n" + + "\tcount(c.sid) \n" + + "FROM\n" + + "\tenterprise_project a\n" + + "\tLEFT JOIN project_information b ON b.sid = a.projectSid \n" + + "\tleft join project_files c on c.mainSid=b.sid\n" + + "\tleft join project_phase d on d.projectSid =b.sid\n" + + "WHERE\n" + + "\ta.enterpriseSid = #{enterpriseSid} and d.nodeValue =#{nodeValue}") + Integer getPhaseFilesCount(@Param("enterpriseSid") String enterpriseSid,@Param("nodeValue")String nodeValue); + @Select("SELECT\n" + + "\tc.createTime,\n" + + "\tc.absolutePath,\n" + + "\tc.url,\n" + + "\tc.name,\n" + + "b.entryName \t\n" + + "FROM\n" + + "\tenterprise_project a\n" + + "\tLEFT JOIN project_information b ON b.sid = a.projectSid \n" + + "\tleft join project_files c on c.mainSid=b.sid\n" + + "\tleft join project_phase d on d.projectSid =b.sid\n" + + "WHERE\n" + + "\ta.enterpriseSid = #{enterpriseSid}") + List getPhaseFilesByEnterpriseSid(@Param("enterpriseSid") String enterpriseSid); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/PhaseRecord.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/PhaseRecord.java new file mode 100644 index 00000000..f3951aeb --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/PhaseRecord.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.report.ds.crm; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/9/11 17:15 + */ +@Data +public class PhaseRecord { + private String sid; + private String orderDate; + private String enterpriseSid; + private String total; + private String nodeKey; + private String nodeValue; + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java index 17f46941..68854be4 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java @@ -34,4 +34,18 @@ public class ProjectInfo { private String bankSid; @TableField(exist = false) private String typeSid; + @TableField(exist = false) + private String nodeKey; + @TableField(exist = false) + private String nodeValue; + @TableField(exist = false) + private String enterpriseSid; + @TableField(exist = false) + private BigDecimal creditLimitN=new BigDecimal(0); + @TableField(exist = false) + private BigDecimal useLimitN=new BigDecimal(0); + @TableField(exist = false) + private BigDecimal sumMoney=new BigDecimal(0); + private String type; + private String shSid; } 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 new file mode 100644 index 00000000..467d2327 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectRecordVo.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.report.ds.crm; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/9/13 15:10 + */ +@Data +public class ProjectRecordVo { + private String createTime; + private String absolutePath; + 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/ds/crm/ShCreditBalanceCrmVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java new file mode 100644 index 00000000..74de981a --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShCreditBalanceCrmVo.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.report.ds.crm; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2024/9/11 11:53 + */ +@Data +public class ShCreditBalanceCrmVo { + private String sid; + private String type; + private String tbdate; + private BigDecimal money; + private String projectsid; + private String projectname; + private String enterpriseSid; + private String enterpriseName; + private String pzfile; + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShPhaseRecordVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShPhaseRecordVo.java new file mode 100644 index 00000000..8a9501cd --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ShPhaseRecordVo.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.report.ds.crm; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2024/9/11 11:53 + */ +@Data +public class ShPhaseRecordVo { + private String sid; + private String orderDate; + private String enterpriseSid; + private BigDecimal total; + private String projectSid; + private String nodeKey; + private String nodeValue; + + +} 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 new file mode 100644 index 00000000..740ba668 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDetailsVo.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _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 ProjectCreditBalanceDetailsVo 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 List pzfiles; // 凭证图片 + +} \ 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 new file mode 100644 index 00000000..e69d175c --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceDto.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.feign.crm.projectcreditbalance; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditBalanceDto.java
+ * Class: com.yxt.supervise.enterprisecentre.api.projectcreditbalance.ProjectCreditBalanceDto
+ * 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 ProjectCreditBalanceDto implements Dto { + + private String sid; // sid + + @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 List pzfiles; // 凭证图片 + @ApiModelProperty("用户sid") + private String usersid; // 用户sid + @ApiModelProperty("摘要") + 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/ProjectCreditBalanceFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceFeign.java new file mode 100644 index 00000000..ccafa828 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectcreditbalance/ProjectCreditBalanceFeign.java @@ -0,0 +1,84 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.feign.crm.projectcreditbalance; + +import cn.hutool.core.lang.Assert; +import com.alibaba.excel.EasyExcel; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.util.List; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditBalanceFeignFallback.java
+ * Class: com.yxt.supervise.enterprisecentre.biz.projectcreditbalance.ProjectCreditBalanceRest
+ * 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 + */ +@FeignClient( + contextId = "supervise-crm-ProjectCreditBalance", + name = "supervise-crm", + path = "v1/projectcreditbalance") +public interface ProjectCreditBalanceFeign { + + + + + + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectCreditBalanceDto dto); + + + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectfiles/ProjectFilesFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectfiles/ProjectFilesFeign.java new file mode 100644 index 00000000..a5a9276d --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectfiles/ProjectFilesFeign.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.report.feign.crm.projectfiles; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.report.biz.projectfiles.ProjectFilesDto; +import com.yxt.supervise.report.feign.crm.projectcreditbalance.ProjectCreditBalanceDetailsVo; +import com.yxt.supervise.report.feign.crm.projectcreditbalance.ProjectCreditBalanceDto; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * Project: project_credit(企业用信登记)
+ * File: ProjectCreditBalanceFeignFallback.java
+ * Class: com.yxt.supervise.enterprisecentre.biz.projectcreditbalance.ProjectCreditBalanceRest
+ * 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 + */ +@FeignClient( + contextId = "supervise-crm-ProjectFiles", + name = "supervise-crm", + path = "v1/projectfiles") +public interface ProjectFilesFeign { + + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectFilesDto dto); + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java index 9382345f..f9e1e144 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java @@ -3,6 +3,7 @@ package com.yxt.supervise.report.feign.crm.projectinformation; 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.projectinformation.ProjectInfoDto; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -36,4 +37,16 @@ public interface ProjectInformationFeign { @ApiOperation("根据sid查项目等相关信息") @GetMapping("/getProjectBySidApp/{sid}") public ResultBean getEnterpriseBySidApp(@PathVariable("sid") String sid); + @ApiOperation("查询全部（没有权限控制）") + @GetMapping("/updatePhase") + public ResultBean> updatePhase(@RequestBody ProjectInformationQuery query); + @ApiOperation("保存") + @PostMapping("/saveSxt") + public ResultBean save1(@RequestBody ProjectInfoDto dto); + @ApiOperation("全部") + @PostMapping("/warehouseList") + public Object warehouseList(@RequestBody ProjectInformationQuery query); + @ApiOperation("保存") + @GetMapping("/getWarehouseBySid/{sid}") + public ResultBean getWarehouseBySid(@PathVariable("sid") String sid); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationQuery.java index 68f879d6..8869e30d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationQuery.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationQuery.java @@ -30,4 +30,6 @@ public class ProjectInformationQuery implements Query { private String projectType; private String bankName; private String stateSid; + private String nodeKey; + private String nodeValue; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationVo.java index 0c2107d8..2709c674 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationVo.java @@ -66,4 +66,6 @@ public class ProjectInformationVo implements Vo { private SysUser sysUser; //银行 private SysOrganizationVo sysOrganizationVo; + private String nodeKey; + private String nodeValue; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectphase/ProjectPhaseFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectphase/ProjectPhaseFeign.java new file mode 100644 index 00000000..52b68985 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectphase/ProjectPhaseFeign.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.report.feign.crm.projectphase; + +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.projectphase.ProjectPhaseVo; +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; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@FeignClient( + contextId = "supervise-crm-projectphase", + name = "supervise-crm", + path = "v1/ProjectPhase") +public interface ProjectPhaseFeign { + + + @ApiOperation("根据sid查询") + @GetMapping("/getNodeByProjectSid") + public ResultBean> getNodeByProjectSid(@RequestParam("projectSid") String projectSid); + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectphaserecord/ProjectPhaseRecordFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectphaserecord/ProjectPhaseRecordFeign.java new file mode 100644 index 00000000..2a031b0d --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectphaserecord/ProjectPhaseRecordFeign.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.report.feign.crm.projectphaserecord; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.report.biz.projectphaserecord.ProjectPhaseRecordDto; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author wangpengfei + * @date 2023/4/23 11:49 + */ +@FeignClient( + contextId = "supervise-crm-projectphaserecord", + name = "supervise-crm", + path = "v1/projectphaserecord") +public interface ProjectPhaseRecordFeign { + + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectPhaseRecordDto dto); + + +}