修改项目信息

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;
 }

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;
 }

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<EnterpriseProjectVo> enterpriseProjectVoList;
+    private String useLimit;
+    private String loanDate;
+    private String useDate;
 }

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;
 }

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<LoanBankInformatio
     List<BankManagerVo> getBankManager(@Param("sid") String sid);
     //根据sid下级
     List<LoanBankInformationVo> bankList(@Param("sid") String sid);
-
+    @Select("select DISTINCT bankName from loan_bank_information")
+    List<LoanBankInformationVo> selectBankName();
 }

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<LoanBankInfor
         baseMapper.delete(new QueryWrapper<LoanBankInformation>().eq("sid",sid));
         return rb.success().setMsg("删除贷款银行信息成功");
     }
+
+    public ResultBean selectBankNameList(){
+        ResultBean rb = ResultBean.fireFail();
+        List<LoanBankInformationVo> strings = baseMapper.selectBankName();
+        return rb.success().setData(strings);
+    }
 }

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<ProjectInformation>
     @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<ProjectInformationVo> getProjectByUser( @Param("sid") String sid);
     void insertFiles(List<Map<String, String>> maps);
+
 }

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();
+    }
 }

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<ProjectInforma
     UserProjectService userProjectService;
     @Autowired
     StoreHouseProjectService storeHouseProjectService;
+    @Autowired
+    ProjectTypeDictionaryService projectTypeDictionaryService;
     public PagerVo<ProjectInformationVo> listPageVo(PagerQuery<ProjectInformationQuery> pq) {
         ProjectInformationQuery query = pq.getParams();
         QueryWrapper<ProjectInformation> 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<ProjectInformation> page = PagerUtil.queryToPage(pq);
         IPage<ProjectInformationVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ProjectInformationVo> p = PagerUtil.pageToVo(pagging, null);
@@ -168,4 +177,12 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         }
         return sysUserFeign.getUserByType(userType);
     }
+
+    public ResultBean getBankName(){
+        return bankInformationService.selectBankNameList();
+    }
+
+    public ResultBean getProjectType(){
+        return projectTypeDictionaryService.getProjectTypeList();
+    }
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryMapper.java

@@ -8,6 +8,7 @@ import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionary;
 import com.yxt.supervise.crm.api.projecttypedictionary.ProjectTypeDictionaryVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -20,5 +21,6 @@ public interface ProjectTypeDictionaryMapper extends BaseMapper<ProjectTypeDicti
     IPage<ProjectTypeDictionaryVo> selectPageVo(IPage<ProjectTypeDictionary> page, @Param(Constants.WRAPPER) Wrapper<ProjectTypeDictionary> qw);
     List<ProjectTypeDictionaryVo> typeList();
     ProjectTypeDictionaryVo getProjectTypeBySid( @Param("sid") String sid);
-
+    @Select("select DISTINCT projectType from project_type_dictionary")
+    List<ProjectTypeDictionaryVo> selectProjectType();
 }

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<ProjectType
         baseMapper.delete(new QueryWrapper<ProjectTypeDictionary>().eq("sid",sid));
         return rb.success().setMsg("删除项目类型成功");
     }
+
+    public ResultBean getProjectTypeList(){
+        ResultBean rb=new ResultBean();
+        List<ProjectTypeDictionaryVo> strings = baseMapper.selectProjectType();
+        return rb.success().setData(strings);
+    }
 }