diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java index a6eb3573..638cae10 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java @@ -53,4 +53,10 @@ public class ProjectInformationDto implements Dto { private UserProjectDto bankUserProjectDto; //员工 private UserProjectDto userProjectDto; + //用信总额 + private String useLimit; + //放款日期 + private String loanDate; + //用信日期 + private String useDate; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java index 1f56ef7f..4d6152aa 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java @@ -27,5 +27,6 @@ public class ProjectInformationQuery implements Query { private String industrySid; private String typeSid; private String remarks; - + private String projectType; + private String bankName; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java index a7092e84..a47c3781 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationVo.java @@ -50,4 +50,7 @@ public class ProjectInformationVo implements Vo { private String engaDate; private String url; private List enterpriseProjectVoList; + private String useLimit; + private String loanDate; + private String useDate; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java index e89f6be0..52de0c63 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryVo.java @@ -15,4 +15,5 @@ public class ProjectTypeDictionaryVo implements Vo { private String id; private String sid; private String remarks; + private String projectType; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java index 83ee6d75..505836e2 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationMapper.java @@ -12,6 +12,7 @@ import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformation; import com.yxt.supervise.crm.api.loanbankinformation.LoanBankInformationVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -28,5 +29,6 @@ public interface LoanBankInformationMapper extends BaseMapper getBankManager(@Param("sid") String sid); //根据sid下级 List bankList(@Param("sid") String sid); - + @Select("select DISTINCT bankName from loan_bank_information") + List selectBankName(); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java index d166f76f..588b9c0b 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/loanbankinformation/LoanBankInformationService.java @@ -86,4 +86,10 @@ public class LoanBankInformationService extends MybatisBaseService().eq("sid",sid)); return rb.success().setMsg("删除贷款银行信息成功"); } + + public ResultBean selectBankNameList(){ + ResultBean rb = ResultBean.fireFail(); + List strings = baseMapper.selectBankName(); + return rb.success().setData(strings); + } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java index e96cc7d1..9f2e1a2d 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java @@ -30,4 +30,5 @@ public interface ProjectInformationMapper extends BaseMapper @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid") List getProjectByUser( @Param("sid") String sid); void insertFiles(List> maps); + } 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 a35c0685..f2caed05 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 @@ -117,4 +117,14 @@ public class ProjectInformationRest implements ProjectInformationFeign { public ResultBean getUserByType (@PathVariable String type){ return ProjectInformationService.getUserByType(type); } + + @GetMapping("/getBankName") + public ResultBean getBankName(){ + return ProjectInformationService.getBankName(); + } + + @GetMapping("/getProjectType") + public ResultBean getProjectType(){ + return ProjectInformationService.getProjectType(); + } } 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 857321dc..5d58d09e 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 @@ -16,6 +16,7 @@ import com.yxt.supervise.crm.biz.bankmanager.BankManagerService; import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService; import com.yxt.supervise.crm.biz.loanbankinformation.LoanBankInformationService; import com.yxt.supervise.crm.api.userproject.UserProject; +import com.yxt.supervise.crm.biz.projecttypedictionary.ProjectTypeDictionaryService; import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService; import com.yxt.supervise.crm.biz.userproject.UserProjectService; import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign; @@ -46,12 +47,20 @@ public class ProjectInformationService extends MybatisBaseService listPageVo(PagerQuery pq) { ProjectInformationQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); if(StringUtils.isNotBlank(query.getEntryName())){ qw.like("info.entryName",query.getEntryName()); } + if(StringUtils.isNotBlank(query.getProjectType())){ + qw.like("td.projectType",query.getProjectType()); + } + if(StringUtils.isNotBlank(query.getBankName())){ + qw.like("bank.bankName",query.getBankName()); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -168,4 +177,12 @@ public class ProjectInformationService extends MybatisBaseService selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List typeList(); ProjectTypeDictionaryVo getProjectTypeBySid( @Param("sid") String sid); - + @Select("select DISTINCT projectType from project_type_dictionary") + List selectProjectType(); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java index 4ea4f4b6..8d32d4cd 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java @@ -64,4 +64,10 @@ public class ProjectTypeDictionaryService extends MybatisBaseService().eq("sid",sid)); return rb.success().setMsg("删除项目类型成功"); } + + public ResultBean getProjectTypeList(){ + ResultBean rb=new ResultBean(); + List strings = baseMapper.selectProjectType(); + return rb.success().setData(strings); + } }