diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java index bc2e4a38..c8fdc3d6 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java @@ -26,4 +26,10 @@ public class ProjectInformation extends BaseEntity { private String enterpriseSid; private String industrySid; private String typeSid; + private String useLimit; + private String loanDate; + private String useDate; + //银行规定质押率 + private String bankPledgeRate; + private String stateSid; } 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 638cae10..b8a14656 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 @@ -59,4 +59,7 @@ public class ProjectInformationDto implements Dto { private String loanDate; //用信日期 private String useDate; + //质押率 + private String bankPledgeRate; + private String stateSid; } 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 a47c3781..dad65ad6 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 @@ -53,4 +53,9 @@ public class ProjectInformationVo implements Vo { private String useLimit; private String loanDate; private String useDate; + private String bankPledgeRate; + //状态名称 + private String stateName; + //状态说明 + private String stateRemarks; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml index b84f239c..6d130abf 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/pom.xml @@ -60,6 +60,12 @@ junit compile + + org.projectlombok + lombok + 1.18.24 + true + javax.servlet javax.servlet-api 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 83c3025c..256751a9 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 @@ -40,6 +40,9 @@ ei.enterpriseName, ei.contacts as eContacts, info.regulatoryLeader,info.*, + info.bankPledgeRate, + sd.name as stateName, + sd.remarks as stateRemarks, p.url FROM project_information info @@ -49,6 +52,7 @@ left join bank_manager bm on bm.sid =info.managerSid LEFT JOIN enterprise_information ei on ei.sid=info.enterpriseSid left join project_files p on p.mainSid=info.sid + left join project_state_dictionary sd on sd.sid=info.stateSid WHERE info.sid=#{sid} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionary.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionary.java new file mode 100644 index 00000000..184fc016 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionary.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.crm.biz.projectstatedictionary; + +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/10/16 10:04 + */ +@Data +@ApiModel(value = "项目状态字典", description = "项目状态字典") +@TableName("project_state_dictionary") +public class ProjectStateDictionary extends BaseEntity { + //状态名 + private String name; + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryDto.java new file mode 100644 index 00000000..d6888922 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryDto.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.crm.biz.projectstatedictionary; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/16 10:04 + */ +@Data +public class ProjectStateDictionaryDto implements Dto { + private String id; + private String sid; + //状态名 + private String name; + //状态说明 + private String remarks; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryMapper.java new file mode 100644 index 00000000..95b2be3c --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryMapper.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.crm.biz.projectstatedictionary; + +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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/10/16 10:05 + */ +@Mapper +public interface ProjectStateDictionaryMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from project_state_dictionary") + List listAll(); + + @Select("select * from project_state_dictionary where sid=#{sid}") + ProjectStateDictionaryVo getProjectStateBySid(@Param("sid")String sid); +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryMapper.xml new file mode 100644 index 00000000..f79a04fd --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryMapper.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryQuery.java new file mode 100644 index 00000000..a7503537 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryQuery.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.biz.projectstatedictionary; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/16 10:05 + */ +@Data +public class ProjectStateDictionaryQuery implements Query { + private String id; + private String sid; + private String name; + private String remarks; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryRest.java new file mode 100644 index 00000000..d5fec7b5 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryRest.java @@ -0,0 +1,58 @@ +package com.yxt.supervise.crm.biz.projectstatedictionary; + +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.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/10/16 10:06 + */ +@Api(tags = "项目状态字典") +@RestController +@RequestMapping("projectstatedictionary") +public class ProjectStateDictionaryRest { + @Autowired + ProjectStateDictionaryService projectStateDictionaryService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = projectStateDictionaryService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectStateDictionaryDto dto) { + return projectStateDictionaryService.save(dto); + } + @ApiOperation("查询全部") + @GetMapping("/listAll") + public ResultBean> listAll() { + ResultBean rb = ResultBean.fireFail(); + List list =projectStateDictionaryService.listAll(); + return rb.success().setData(list); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody ProjectStateDictionaryDto dto) { + return projectStateDictionaryService.update(dto); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid) { + return projectStateDictionaryService.delete(sid); + } + @ApiOperation("根据sid查询") + @GetMapping("/getProjectStateBySid/{sid}") + public ResultBean selectStoreBySid (@PathVariable String sid){ + ResultBean r=projectStateDictionaryService.getProjectStateBySid(sid); + return r; + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryService.java new file mode 100644 index 00000000..ff2560fe --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryService.java @@ -0,0 +1,72 @@ +package com.yxt.supervise.crm.biz.projectstatedictionary; + +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.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 org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * @author wangpengfei + * @date 2023/10/16 10:05 + */ +@Service +public class ProjectStateDictionaryService extends MybatisBaseService { + + public PagerVo listPageVo(PagerQuery pq) { + ProjectStateDictionaryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("name",query.getName()); + } +// 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); + return p; + } + public List listAll() { + List pagging = baseMapper.listAll(); + return pagging; + } + public ResultBean save(ProjectStateDictionaryDto dto) { + ResultBean rb=new ResultBean(); + ProjectStateDictionary entity=new ProjectStateDictionary(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("保存项目信息成功"); + } + @Transactional + public ResultBean update(ProjectStateDictionaryDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + ProjectStateDictionary entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改项目信息成功"); + } + public ResultBean delete(String sid) { + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除项目信息成功"); + } + public ResultBean getProjectStateBySid(String sid) { + ResultBean rb=new ResultBean(); + ProjectStateDictionaryVo projectStateBySid=baseMapper.getProjectStateBySid(sid); + return rb.success().setData(projectStateBySid); + } + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryVo.java new file mode 100644 index 00000000..71f845e9 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectstatedictionary/ProjectStateDictionaryVo.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.biz.projectstatedictionary; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/16 10:05 + */ +@Data +public class ProjectStateDictionaryVo implements Query { + private String id; + private String sid; + private String name; + private String remarks; +}