diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java index 95a6584e..ce85228a 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/enterpriseproject/EnterpriseProjectVo.java @@ -15,5 +15,9 @@ public class EnterpriseProjectVo implements Vo { private String projectSid; private String enterpriseName; private String enterpriseSid; + private String type="担保企业"; + private String telephone; + private String contacts; + } diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectVo.java index b8ed0041..b1a3c005 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/storehouseproject/StoreHouseProjectVo.java @@ -1,6 +1,7 @@ package com.yxt.supervise.crm.api.storehouseproject; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -15,5 +16,8 @@ public class StoreHouseProjectVo implements Vo { private String projectSid; //仓库名称 private String name; + private String address; + private String linkerName; // 联系人姓名 + private String linkerPhone; // 联系人电话 private String picUrl; // 图片访问url } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml index e313d1d1..3cd73bdf 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectMapper.xml @@ -17,7 +17,7 @@ WHERE sid=#{sid} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectRest.java index 2d774de1..44967a83 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectRest.java @@ -41,13 +41,13 @@ public class EnterpriseProjectRest { } @ApiOperation("保存") @PostMapping("/save") - public ResultBean save(@RequestBody EnterpriseProjectDto dto) { - return EnterpriseProjectService.save(dto); + public ResultBean save(@RequestBody List dtos) { + return EnterpriseProjectService.save(dtos); } @ApiOperation("修改") @PostMapping("/update") - public ResultBean update(@RequestBody EnterpriseProjectDto dto) { - return EnterpriseProjectService.update(dto); + public ResultBean update(@RequestBody List dtos) { + return EnterpriseProjectService.update(dtos); } @ApiOperation("根据sid查询数据") @GetMapping("/getEnterpriseBySid/{sid}") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java index b7f0b397..c2aefb67 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/enterpriseproject/EnterpriseProjectService.java @@ -38,21 +38,23 @@ public class EnterpriseProjectService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean save(EnterpriseProjectDto dto) { + public ResultBean save(List dto) { ResultBean rb=new ResultBean(); - for(String sid:dto.getEnterpriseSids()){ + //新增先删除 + baseMapper.delete(new QueryWrapper().eq("projectSid",dto.get(0).getProjectSid())); + for(EnterpriseProjectDto EnterpriseProjectDto:dto){ EnterpriseProject entity=new EnterpriseProject(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setEnterpriseSid(sid); + BeanUtil.copyProperties(EnterpriseProjectDto, entity, "id", "sid"); +// entity.setEnterpriseSid(sid); baseMapper.insert(entity); } return rb.success().setMsg("保存企业信息成功"); } - public ResultBean update(EnterpriseProjectDto dto) { + public ResultBean update(List dtos) { ResultBean rb=new ResultBean(); //直接删除关联信息重新添加 - baseMapper.delete(new QueryWrapper().eq("projectSid",dto.getProjectSid())); - this.save(dto); + baseMapper.delete(new QueryWrapper().eq("projectSid",dtos.get(0).getProjectSid())); + this.save(dtos); return rb.success().setMsg("修改企业信息成功"); } public List getEnterpriseByProjectSid(String sid){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccount.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccount.java new file mode 100644 index 00000000..93880ee2 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccount.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.crm.biz.projectaccount; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.domain.EntityWithId; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Data +@ApiModel(value = "项目信息", description = "项目信息") +@TableName("project_account") +public class ProjectAccount extends EntityWithId { + private String sid ; + private String projectSid; + private String accountType; + private String accountNumber; + private String bank; + private String affiliateBank; + private String balance; + private String enterpriseSid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountDto.java new file mode 100644 index 00000000..3fb97801 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountDto.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.crm.biz.projectaccount; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Data +public class ProjectAccountDto implements Dto { + private String id; + private String sid; + //项目 + private String projectSid; + //类型 + private String accountType; + //账号 + private String accountNumber; + //开户行 + private String bank; + // + private String affiliateBank; + private String balance; + //企业 + private String enterpriseSid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountMapper.java new file mode 100644 index 00000000..98654298 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountMapper.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.crm.biz.projectaccount; + +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/17 9:06 + */ +@Mapper +public interface ProjectAccountMapper 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}") + ProjectAccountVo getProjectStateBySid(@Param("sid")String sid); + @Select("select p.*,e.enterpriseName as enterpriseName from project_account p left join enterprise_information e on e.sid =p.enterpriseSid where projectSid=#{projectSid} ") + List getAccountByProjectSid(@Param("projectSid")String projectSid); + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountMapper.xml new file mode 100644 index 00000000..31e7c382 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountMapper.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/projectaccount/ProjectAccountQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountQuery.java new file mode 100644 index 00000000..adcf98e9 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountQuery.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.crm.biz.projectaccount; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Data +public class ProjectAccountQuery implements Query { + private String id; + private String sid; + private String projectSid; + private String accountType; + private String accountNumber; + private String bank; + private String affiliateBank; + private String balance; + private String enterpriseSid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java new file mode 100644 index 00000000..a3c0e13a --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java @@ -0,0 +1,58 @@ +package com.yxt.supervise.crm.biz.projectaccount; + +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/17 9:06 + */ +@Api(tags = "项目账户关联表") +@RestController +@RequestMapping("ProjectAccount") +public class ProjectAccountRest { + @Autowired + ProjectAccountService ProjectAccountService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = ProjectAccountService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody List dtos) { + return ProjectAccountService.save(dtos); + } + @ApiOperation("查询全部") + @GetMapping("/listAll") + public ResultBean> listAll() { + ResultBean rb = ResultBean.fireFail(); + List list =ProjectAccountService.listAll(); + return rb.success().setData(list); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody ProjectAccountDto dto) { + return ProjectAccountService.update(dto); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid) { + return ProjectAccountService.delete(sid); + } + @ApiOperation("根据sid查询") + @GetMapping("/getProjectAccountBySid/{sid}") + public ResultBean selectStoreBySid (@PathVariable String sid){ + ResultBean r=ProjectAccountService.getProjectAccountBySid(sid); + return r; + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java new file mode 100644 index 00000000..8dfa6646 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java @@ -0,0 +1,82 @@ +package com.yxt.supervise.crm.biz.projectaccount; + +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.List; +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Service +public class ProjectAccountService extends MybatisBaseService { + + public PagerVo listPageVo(PagerQuery pq) { + ProjectAccountQuery 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(List dtos) { + ResultBean rb=new ResultBean(); + //新增先删除 + baseMapper.delete(new QueryWrapper().eq("projectSid",dtos.get(0).getProjectSid()).eq("enterpriseSid",dtos.get(0).getEnterpriseSid())); + for(ProjectAccountDto dto:dtos){ + ProjectAccount entity=new ProjectAccount(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setSid(UUID.randomUUID().toString()); + baseMapper.insert(entity); + } + return rb.success().setMsg("保存项目信息成功"); + } + @Transactional + public ResultBean update(ProjectAccountDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + ProjectAccount 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 getProjectAccountBySid(String sid) { + ResultBean rb=new ResultBean(); + ProjectAccountVo projectStateBySid=baseMapper.getProjectStateBySid(sid); + return rb.success().setData(projectStateBySid); + } + public ResultBean> getAccountByProjectSid(String projectSid) { + ResultBean rb=new ResultBean(); + List projectStateBySid=baseMapper.getAccountByProjectSid(projectSid); + return rb.success().setData(projectStateBySid); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountVo.java new file mode 100644 index 00000000..c835e8d2 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountVo.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.crm.biz.projectaccount; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Data +public class ProjectAccountVo implements Query { + private String id; + private String sid; + private String projectSid; + private String accountType; + private String accountNumber; + private String bank; + private String affiliateBank; + private String balance; + private String enterpriseSid; + private String enterpriseName; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInfoDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInfoDto.java new file mode 100644 index 00000000..c5060aed --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInfoDto.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.crm.biz.projectinformation; + +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto; +import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; +import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountDto; +import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesDto; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/10/17 16:14 + */ +@Data +public class ProjectInfoDto { + private String sid; + private ProjectInformationDto baseInfo; + //章证 + private List idCardList; + //仓库信息dto + private List warehouse; + //企业 + private List enterpriseList; + //账户 + private List bankList; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInfoVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInfoVo.java new file mode 100644 index 00000000..bf0639be --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInfoVo.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.crm.biz.projectinformation; + +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto; +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo; +import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; +import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectVo; +import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountDto; +import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountVo; +import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesDto; +import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesVo; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/10/18 8:47 + */ +@Data +public class ProjectInfoVo { + private String sid; + private ProjectInformationVo baseInfo; + //章证 + private List idCardList; + //仓库信息dto + private List warehouse; + //企业 + private List enterpriseList; + //账户 + private List bankList; +} 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-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformation.java similarity index 91% rename from yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformation.java rename to yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformation.java index c8fdc3d6..7713a225 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-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformation.java @@ -1,4 +1,4 @@ -package com.yxt.supervise.crm.api.projectinformation; +package com.yxt.supervise.crm.biz.projectinformation; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; @@ -19,6 +19,7 @@ public class ProjectInformation extends BaseEntity { private String signingDate; private String endDate; private String regulatoryLeader; + private String regulatorySupervisor; private String generalManager; private String fillInDate; private String bankSid; diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDetailsVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDetailsVo.java similarity index 83% rename from yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDetailsVo.java rename to yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDetailsVo.java index 7695c399..2f6ab5b9 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDetailsVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDetailsVo.java @@ -1,4 +1,4 @@ -package com.yxt.supervise.crm.api.projectinformation; +package com.yxt.supervise.crm.biz.projectinformation; import io.swagger.annotations.ApiModel; import lombok.Data; 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-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDto.java similarity index 69% rename from yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationDto.java rename to yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDto.java index b8a14656..d62abf0b 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-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationDto.java @@ -1,12 +1,11 @@ -package com.yxt.supervise.crm.api.projectinformation; +package com.yxt.supervise.crm.biz.projectinformation; import com.yxt.common.core.dto.Dto; -import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto; -import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; -import com.yxt.supervise.crm.api.userproject.UserProjectDto; import io.swagger.annotations.ApiModel; import lombok.Data; +import java.util.List; + /** * @author wangpengfei * @date 2023/4/25 9:28 @@ -28,6 +27,8 @@ public class ProjectInformationDto implements Dto { private String endDate; //监管负责人 private String regulatoryLeader; + //监管主管 + private String regulatorySupervisor; //事业部总经理 private String generalManager; //填表日期 @@ -44,15 +45,6 @@ public class ProjectInformationDto implements Dto { private String typeSid; //项目说明 private String remarks; - private String [] imageFiles; - //仓库信息dto - private StoreHouseProjectDto storeHouseProjectDto; - //企业 - private EnterpriseProjectDto enterpriseProjectDto; - //银行 - private UserProjectDto bankUserProjectDto; - //员工 - private UserProjectDto userProjectDto; //用信总额 private String useLimit; //放款日期 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 0824513e..2ee15f71 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 @@ -4,8 +4,6 @@ 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.projectinformation.ProjectInformation; -import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; 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 256751a9..af5efe22 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 @@ -3,7 +3,7 @@ - SELECT info.entryName, id.industryName, @@ -27,9 +27,11 @@ ${ew.sqlSegment} - SELECT info.entryName, + info.sid as sid, + info.stateSid as stateSid, id.industryName, td.projectType as typeName, info.creditLimit, @@ -42,8 +44,7 @@ info.regulatoryLeader,info.*, info.bankPledgeRate, sd.name as stateName, - sd.remarks as stateRemarks, - p.url + sd.remarks as stateRemarks FROM project_information info LEFT JOIN project_type_dictionary td on td.sid=info.typeSid @@ -51,7 +52,6 @@ left join loan_bank_information bank on bank.sid=info.bankSid 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} @@ -66,7 +66,7 @@ - select p.sid,p.entryName from user_project u right join project_information p on u.projectSid = p.sid where userSid = #{userSid} \ No newline at end of file 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-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java similarity index 94% rename from yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationQuery.java rename to yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java index 4d6152aa..2dc453ab 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-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationQuery.java @@ -1,4 +1,4 @@ -package com.yxt.supervise.crm.api.projectinformation; +package com.yxt.supervise.crm.biz.projectinformation; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; 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 33a2c0db..85b29664 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 @@ -55,22 +55,22 @@ public class ProjectInformationRest implements ProjectInformationFeign { } @ApiOperation("保存") @PostMapping("/save") - public ResultBean save(@RequestBody ProjectInformationDto dto) { + public ResultBean save(@RequestBody ProjectInfoDto dto) { return ProjectInformationService.save(dto); } - @ApiOperation("修改") - @PostMapping("/update") - public ResultBean update(@RequestBody ProjectInformationDto dto) { - return ProjectInformationService.update(dto); - } +// @ApiOperation("修改") +// @PostMapping("/update") +// public ResultBean update(@RequestBody ProjectInfoDto dto) { +// return ProjectInformationService.update(dto); +// } - @ApiOperation("根据sid查询企业信息") - @GetMapping("/getEnterpriseBySid/{sid}") + @ApiOperation("根据sid查项目等相关信息") + @GetMapping("/getProjectBySid/{sid}") public ResultBean getEnterpriseBySid(@PathVariable String sid){ ResultBean rb = ResultBean.fireFail(); - ProjectInformationVo ProjectInformationVo=ProjectInformationService.getEnterpriseBySid(sid); - return rb.success().setData(ProjectInformationVo); + ProjectInfoVo projectInfoVo=ProjectInformationService.getProjectBySid(sid); + return rb.success().setData(projectInfoVo); } @ApiOperation("根据sid查询仓库信息") @GetMapping("/getStorehouseBySid/{sid}") @@ -132,7 +132,7 @@ public class ProjectInformationRest implements ProjectInformationFeign { @ApiOperation("根据userSid查询该人的项目") @PostMapping("/getProjectSidByUserSid") - public ResultBean> getProjectSidByUserSid(@RequestParam("userSid") String userSid){ + public ResultBean> getProjectSidByUserSid(@RequestParam("userSid") String userSid){ ResultBean rb = ResultBean.fireFail(); List projectSidListByUserSid = ProjectInformationService.getProjectListByUserSid(userSid); return rb.success().setData(projectSidListByUserSid); 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 22c12310..98fc318d 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 @@ -10,16 +10,28 @@ 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.bankmanager.BankManager; +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProject; +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto; import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo; import com.yxt.supervise.crm.api.projectinformation.*; +import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; +import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectVo; 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.projectaccount.ProjectAccountDto; +import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountService; +import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountVo; import com.yxt.supervise.crm.biz.projecttypedictionary.ProjectTypeDictionaryService; +import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesDto; +import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesService; +import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesVo; import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService; import com.yxt.supervise.crm.biz.userproject.UserProjectService; +import com.yxt.supervise.crm.feign.system.SysOrganizationFeign; import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign; +import com.yxt.supervise.system.sysorganization.SysOrganizationVo; import com.yxt.supervise.system.sysuser.SysUser; import com.yxt.supervise.system.sysuser.SysUserVo; import org.junit.Test; @@ -49,133 +61,262 @@ 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.getEntryName())) { + qw.like("info.entryName", query.getEntryName()); } - if(StringUtils.isNotBlank(query.getProjectType())){ - qw.like("td.projectType",query.getProjectType()); + if (StringUtils.isNotBlank(query.getProjectType())) { + qw.like("td.projectType", query.getProjectType()); } - if(StringUtils.isNotBlank(query.getBankName())){ - qw.like("bank.bankName",query.getBankName()); + 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; } + @Transactional - public ResultBean save(ProjectInformationDto dto) { - ResultBean rb=new ResultBean(); - ProjectInformation entity=new ProjectInformation(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - String [] file=dto.getImageFiles(); - if(file!=null){ - List> maps=new ArrayList<>(); - for(String s:file){ - Mapm=new HashMap<>(); - m.put("mainSid",entity.getSid()); - m.put("url",s); - m.put("sid", UUID.randomUUID().toString()); - maps.add(m); + public ResultBean save(ProjectInfoDto dto) { + ResultBean rb = new ResultBean(); + ProjectInformation entity = new ProjectInformation(); + if (null != dto.getSid()) { + baseMapper.delete(new QueryWrapper().eq("sid", dto.getSid())); + } + BeanUtil.copyProperties(dto.getBaseInfo(), entity, "id", "sid"); + String projectSid = entity.getSid(); + //企业 + if (dto.getEnterpriseList().size() != 0) { + for (EnterpriseProjectDto enterpriseProjectDto : dto.getEnterpriseList()) { + enterpriseProjectDto.setProjectSid(projectSid); + } + enterpriseProjectService.save(dto.getEnterpriseList()); + } + //资金账户 + if (dto.getBankList().size() != 0) { + for (ProjectAccountDto projectAccountDto : dto.getBankList()) { + projectAccountDto.setProjectSid(projectSid); + } + projectAccountService.save(dto.getBankList()); + } + //关联章证 + if (dto.getIdCardList().size() > 0) { + List> maps = new ArrayList<>(); + for (ProjectZzFilesDto projectZzFilesDto : dto.getIdCardList()) { + String[] zzFile = projectZzFilesDto.getUrls(); + if (zzFile != null) { + for (String s : zzFile) { + Map m = new HashMap<>(); + m.put("projectSid", projectSid); + m.put("enterpriseSid", projectZzFilesDto.getEnterpriseSid()); + m.put("url", s); + m.put("sid", UUID.randomUUID().toString()); + m.put("idCardType", projectZzFilesDto.getIdCardType()); + m.put("idCardName", projectZzFilesDto.getIdCardName()); + maps.add(m); + } + } } - if(maps.size()>0){ - baseMapper.insertFiles(maps); + if (maps.size() > 0) { + projectZzFilesService.insertFiles(maps); } } //绑定仓库 - dto.getStoreHouseProjectDto().setProjectSid(entity.getSid()); - storeHouseProjectService.saveOrUpdateDto(dto.getStoreHouseProjectDto()); - //绑定企业 - if(null!=dto.getEnterpriseProjectDto()){ - dto.getEnterpriseProjectDto().setProjectSid(entity.getSid()); - enterpriseProjectService.save(dto.getEnterpriseProjectDto()); + if (dto.getIdCardList().size() > 0) { + for (StoreHouseProjectDto storeHouseProjectDto : dto.getWarehouse()) { + storeHouseProjectDto.setProjectSid(projectSid); + } + storeHouseProjectService.saveOrUpdateDto(dto.getWarehouse()); } + + +// String [] file=dto.getImageFiles(); +// if(file!=null){ +// List> maps=new ArrayList<>(); +// for(String s:file){ +// Mapm=new HashMap<>(); +// m.put("mainSid",entity.getSid()); +// m.put("url",s); +// m.put("sid", UUID.randomUUID().toString()); +// maps.add(m); +// } +// if(maps.size()>0){ +// baseMapper.insertFiles(maps); +// } +// } baseMapper.insert(entity); return rb.success().setMsg("保存项目信息成功"); } + @Transactional - public ResultBean update(ProjectInformationDto dto) { - ResultBean rb=new ResultBean(); - String dtoSid = dto.getSid(); - ProjectInformation entity=fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - //修改绑定的仓库 - dto.getStoreHouseProjectDto().setProjectSid(entity.getSid()); - storeHouseProjectService.saveOrUpdateDto(dto.getStoreHouseProjectDto()); - //绑定企业 - if(null!=dto.getEnterpriseProjectDto()){ - dto.getEnterpriseProjectDto().setProjectSid(dto.getSid()); - enterpriseProjectService.update(dto.getEnterpriseProjectDto()); - } - //银行 -// dto.getBankUserProjectDto().setType("3"); -// userProjectService.save(dto.getBankUserProjectDto()); - //员工 -// dto.getUserProjectDto().setType("1"); -// userProjectService.save(dto.getUserProjectDto()); - baseMapper.updateById(entity); - return rb.success().setMsg("修改项目信息成功"); - } - public ProjectInformationVo getEnterpriseBySid(String sid){ - ProjectInformationVo bank=baseMapper.getProjectBySid(sid); - if(null!=bank){ - List enterpriseProjectVoList=enterpriseProjectService.getEnterpriseByProjectSid(sid); +// public ResultBean update(ProjectInfoDto dto) { +// ResultBean rb=new ResultBean(); +// String dtoSid = dto.getSid(); +// ProjectInformation entity=fetchBySid(dtoSid); +// BeanUtil.copyProperties(dto, entity, "id", "sid"); +// +// //绑定企业 +// if(dto.getEnterpriseProjectDtos().size()!=0){ +// for(EnterpriseProjectDto enterpriseProjectDto:dto.getEnterpriseProjectDtos()){ +// enterpriseProjectDto.setProjectSid(entity.getSid()); +// enterpriseProjectService.update(enterpriseProjectDto); +// } +// } +// //资金账户 +// for(ProjectAccountDto projectAccountDto:dto.getProjectAccountDtos()){ +// projectAccountService.update(projectAccountDto); +// } +// +// //章证 +// for(ProjectZzFilesDto projectZzFilesDto:dto.getProjectZzFilesDtos()){ +// String [] zzFile=projectZzFilesDto.getUrls(); +// if(zzFile!=null){ +// List> maps=new ArrayList<>(); +// for(String s:zzFile){ +// Mapm=new HashMap<>(); +// m.put("projectSid",entity.getSid()); +// m.put("enterpriseSid",projectZzFilesDto.getEnterpriseSid()); +// m.put("url",s); +// m.put("sid", UUID.randomUUID().toString()); +// maps.add(m); +// } +// if(maps.size()>0){ +// projectZzFilesService.insertFiles(maps); +// } +// } +// } +// //修改绑定的仓库 +// for(StoreHouseProjectDto storeHouseProjectDto:dto.getStoreHouseProjectDtos()){ +// storeHouseProjectDto.setProjectSid(entity.getSid()); +// storeHouseProjectService.saveOrUpdateDto(storeHouseProjectDto); +// } +// baseMapper.updateById(entity); +// return rb.success().setMsg("修改项目信息成功"); +// } + public ProjectInformationVo getEnterpriseBySid(String sid) { + ProjectInformationVo bank = baseMapper.getProjectBySid(sid); + if (null != bank) { + List enterpriseProjectVoList = enterpriseProjectService.getEnterpriseByProjectSid(sid); bank.setEnterpriseProjectVoList(enterpriseProjectVoList); return bank; } return new ProjectInformationVo(); } - public List getProjectByUserSid(String sid){ - SysUser s =sysUserFeign.getUserBySid(sid).getData(); + + public ProjectInfoVo getProjectBySid(String sid) { + ProjectInfoVo projectInfoVo = new ProjectInfoVo(); + ProjectInformationVo bank = baseMapper.getProjectBySid(sid); + if (null != bank) { + //主体 + SysUser sysUser = sysUserFeign.getUserBySid(bank.getManagerSid()).getData(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(bank.getBankSid()).getData(); + bank.setSysUser(sysUser); + bank.setSysOrganizationVo(sysOrganizationVo); + projectInfoVo.setBaseInfo(bank); + projectInfoVo.setSid(bank.getSid()); + //企业 + List enterpriseProjectVoList = enterpriseProjectService.getEnterpriseByProjectSid(sid); + projectInfoVo.setEnterpriseList(enterpriseProjectVoList); + //章证 + List zzFilesVos = new ArrayList<>(); + enterpriseProjectVoList.forEach(s -> { + ProjectZzFilesVo projectZzFilesVo = new ProjectZzFilesVo(); + List> maps =new ArrayList<>(); + List projectZzFilesVos = projectZzFilesService.getZzFilesByProjectSid(bank.getSid(), s.getEnterpriseSid()).getData(); + if (projectZzFilesVos.size() != 0) { + projectZzFilesVos.forEach(j -> { + Map map=new HashMap<>(); + map.put("url",j.getUrl()); +// if (StringUtils.isEmpty(projectZzFilesVo.getUrl())) { +// projectZzFilesVo.setUrl(j.getUrl()); +// } else { +// projectZzFilesVo.setUrl(projectZzFilesVo.getUrl() + "," + j.getUrl()); +// } + maps.add(map); + }); + projectZzFilesVo.setProjectSid(projectZzFilesVos.get(0).getProjectSid()); + projectZzFilesVo.setEnterpriseSid(projectZzFilesVos.get(0).getEnterpriseSid()); + projectZzFilesVo.setIdCardType(projectZzFilesVos.get(0).getIdCardType()); + projectZzFilesVo.setIdCardName(projectZzFilesVos.get(0).getIdCardName()); + projectZzFilesVo.setEnterpriseName(projectZzFilesVos.get(0).getEnterpriseName()); + projectZzFilesVo.setUrls(maps); + zzFilesVos.add(projectZzFilesVo); + } + }); + projectInfoVo.setIdCardList(zzFilesVos); + //账户 + List ProjectAccountVos = projectAccountService.getAccountByProjectSid(bank.getSid()).getData(); + projectInfoVo.setBankList(ProjectAccountVos); + //仓库 +// sh + List storeHouseProjectVos = storeHouseProjectService.selectStoreBySid(bank.getSid()); + projectInfoVo.setWarehouse(storeHouseProjectVos); + return projectInfoVo; + } + return new ProjectInfoVo(); + } + + public List getProjectByUserSid(String sid) { + SysUser s = sysUserFeign.getUserBySid(sid).getData(); //银行人员 - if(s.getUserType()==3){ - BankManager b=bankManagerService.getOne(new QueryWrapper().eq("sid",s.getStaffSid())); + if (s.getUserType() == 3) { + BankManager b = bankManagerService.getOne(new QueryWrapper().eq("sid", s.getStaffSid())); // bankInformationService. - if(s.getRoleNames().size()>0){ - for(String name:s.getRoleNames()){ - if(name.equals("银行行长")){ - List bank=baseMapper.getProjectByBankSid(b.getBankSid()); + if (s.getRoleNames().size() > 0) { + for (String name : s.getRoleNames()) { + if (name.equals("银行行长")) { + List bank = baseMapper.getProjectByBankSid(b.getBankSid()); return bank; } } } - List bank=baseMapper.getProjectByUserSid(s.getSid()); + List bank = baseMapper.getProjectByUserSid(s.getSid()); return bank; - }else if(s.getUserType()==1){ + } else if (s.getUserType() == 1) { //监管人员 - List projectSidListByUserSid = userProjectService.getProjectSidListByUserSid(sid); + List projectSidListByUserSid = userProjectService.getProjectSidListByUserSid(sid); List list = new ArrayList<>(); for (UserProject userProject : projectSidListByUserSid) { ProjectInformationVo project = getEnterpriseBySid(userProject.getProjectSid()); - if(StringUtils.isNotBlank(project.getSid())){ + if (StringUtils.isNotBlank(project.getSid())) { list.add(project); } } return list; } - List bank=baseMapper.getProjectByUser(s.getStaffSid()); + List bank = baseMapper.getProjectByUser(s.getStaffSid()); return bank; } + public ResultBean delete(String sid) { - ResultBean rb=new ResultBean(); - baseMapper.delete(new QueryWrapper().eq("sid",sid)); + ResultBean rb = new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid", sid)); return rb.success().setMsg("删除项目信息成功"); } - public ResultBean getUserByType(String userType){ - ResultBean rb=new ResultBean(); - if(userType.equals("3")){ - List sysUserVos =sysUserFeign.getUserByType(userType).getData(); - for(SysUserVo sysUserVo:sysUserVos){ - BankManager bankManager=bankManagerService.getOne(new QueryWrapper().eq("sid",sysUserVo.getStaffSid())); - if(null!=bankManager) { + + public ResultBean getUserByType(String userType) { + ResultBean rb = new ResultBean(); + if (userType.equals("3")) { + List sysUserVos = sysUserFeign.getUserByType(userType).getData(); + for (SysUserVo sysUserVo : sysUserVos) { + BankManager bankManager = bankManagerService.getOne(new QueryWrapper().eq("sid", sysUserVo.getStaffSid())); + if (null != bankManager) { sysUserVo.setName(bankManager.getName()); } } @@ -184,15 +325,15 @@ public class ProjectInformationService extends MybatisBaseService getProjectListByUserSid(String sid){ + public List getProjectListByUserSid(String sid) { List projectByUserSid = baseMapper.getProjectListByUserSid(sid); return projectByUserSid; } 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 new file mode 100644 index 00000000..98d5eed7 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java @@ -0,0 +1,86 @@ +package com.yxt.supervise.crm.biz.projectinformation; + +import com.yxt.common.core.vo.Vo; +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto; +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo; +import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; +import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectVo; +import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountDto; +import com.yxt.supervise.crm.biz.projectaccount.ProjectAccountVo; +import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesDto; +import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesVo; +import com.yxt.supervise.system.sysorganization.SysOrganizationVo; +import com.yxt.supervise.system.sysuser.SysUser; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/25 9:29 + */ +@ApiModel(value = "项目信息 视图数据对象", description = "项目信息 视图数据对象") +@Data +public class ProjectInformationVo implements Vo { + private String id ; + private String sid; + //项目名称 + private String entryName; + //所属行业 + private String industryName; + //项目类型 + private String typeName; + //授信额度 + private String creditLimit; + //贷款行 + private String bankName; + //客户经理 + private String bManagerName; + //签约日期 + private String signingDate; + //结束日期 + private String endDate; + //企业名称 + private String enterpriseName; + //联系人 + private String eContacts; + //监管负责人 + private String regulatoryLeader; + private String regulatorySupervisor; + + private String generalManager; + private String fillInDate; + private String bankSid; + private String managerSid; + private String enterpriseSid; + private String industrySid; + private String typeSid; + private String remarks; + private String engaDate; + private String url; + private List enterpriseProjectVoList; + private String useLimit; + private String loanDate; + private String useDate; + private String bankPledgeRate; + //状态名称 + private String stateName; + private String stateSid; + //状态说明 + private String stateRemarks; + + + //项目银行人 + private SysUser sysUser; + //银行 + private SysOrganizationVo sysOrganizationVo; +// //章证 +// private List> projectZzFilesVos; +// //仓库信息dto +// private List storeHouseProjectVos; +// //企业 +// private List enterpriseProjectVos; +// //账户 +// private List> projectAccountVos; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFiles.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFiles.java new file mode 100644 index 00000000..d8f0f355 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFiles.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.crm.biz.projectzzfiles; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.domain.EntityWithId; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/17 9:49 + */ +@Data +@ApiModel(value = "项目章证关联", description = "项目章证关联") +@TableName("project_zz_files") +public class ProjectZzFiles extends EntityWithId { + private String sid; + private String url; + private String projectSid; + private String enterpriseSid; + private String idCardType; + private String idCardName; + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesDto.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesDto.java new file mode 100644 index 00000000..9600ad72 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesDto.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.crm.biz.projectzzfiles; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Data +public class ProjectZzFilesDto implements Dto { + private String id; + private String sid; + private String url; + private String projectSid; + private String enterpriseSid; + private String idCardType; + private String idCardName; + private String [] urls; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.java new file mode 100644 index 00000000..79596a96 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.crm.biz.projectzzfiles; + +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; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Mapper +public interface ProjectZzFilesMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + void insertFiles(List> maps); + @Select("select * from project_state_dictionary where sid=#{sid}") + ProjectZzFilesVo getProjectStateBySid(@Param("sid")String sid); + @Select("select p.*,e.enterpriseName as enterpriseName from project_zz_files p left join enterprise_information e on e.sid =p.enterpriseSid where projectSid=#{projectSid} and enterpriseSid=#{enterpriseSid}") + List getZzFilesByProjectSid(@Param("projectSid")String projectSid,@Param("enterpriseSid")String enterpriseSid); + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.xml new file mode 100644 index 00000000..286ec2b8 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + insert into project_zz_files (sid, url, projectSid,enterpriseSid,idCardName,idCardType) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.projectSid,jdbcType=VARCHAR}, + #{item.enterpriseSid,jdbcType=VARCHAR}, + #{item.idCardName,jdbcType=VARCHAR}, + #{item.idCardType,jdbcType=VARCHAR} + ) + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesQuery.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesQuery.java new file mode 100644 index 00000000..638189be --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesQuery.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.biz.projectzzfiles; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Data +public class ProjectZzFilesQuery implements Query { + private String id; + private String sid; + private String url; + private String projectSid; + private String enterpriseSid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesRest.java new file mode 100644 index 00000000..766b1d65 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesRest.java @@ -0,0 +1,58 @@ +package com.yxt.supervise.crm.biz.projectzzfiles; + +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/17 9:06 + */ +@Api(tags = "项目账户关联表") +@RestController +@RequestMapping("ProjectZzFiles") +public class ProjectZzFilesRest { + @Autowired + ProjectZzFilesService ProjectZzFilesService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = ProjectZzFilesService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectZzFilesDto dto) { + return ProjectZzFilesService.save(dto); + } +// @ApiOperation("查询全部") +// @GetMapping("/listAll") +// public ResultBean> listAll() { +// ResultBean rb = ResultBean.fireFail(); +// List list =ProjectZzFilesService.listAll(); +// return rb.success().setData(list); +// } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody ProjectZzFilesDto dto) { + return ProjectZzFilesService.update(dto); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid) { + return ProjectZzFilesService.delete(sid); + } + @ApiOperation("根据sid查询") + @GetMapping("/getProjectZzFilesBySid/{sid}") + public ResultBean selectStoreBySid (@PathVariable String sid){ + ResultBean r=ProjectZzFilesService.getProjectZzFilesBySid(sid); + return r; + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java new file mode 100644 index 00000000..eee177d3 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java @@ -0,0 +1,82 @@ +package com.yxt.supervise.crm.biz.projectzzfiles; + +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 org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Service +public class ProjectZzFilesService extends MybatisBaseService { + + public PagerVo listPageVo(PagerQuery pq) { + ProjectZzFilesQuery 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 ResultBean insertFiles(List> maps) { + ResultBean rb=new ResultBean(); + // + for(Map map: maps){ + baseMapper.delete(new QueryWrapper().eq("projectSid",map.get("projectSid").toString()).eq("enterpriseSid",map.get("enterpriseSid"))); + } + baseMapper.insertFiles(maps); + return rb.success(); + } + public ResultBean save(ProjectZzFilesDto dto) { + ResultBean rb=new ResultBean(); + ProjectZzFiles entity=new ProjectZzFiles(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("保存项目信息成功"); + } + @Transactional + public ResultBean update(ProjectZzFilesDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + ProjectZzFiles 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 getProjectZzFilesBySid(String sid) { + ResultBean rb=new ResultBean(); + ProjectZzFilesVo projectStateBySid=baseMapper.getProjectStateBySid(sid); + return rb.success().setData(projectStateBySid); + } + + public ResultBean> getZzFilesByProjectSid(String projectSid,String enterpriseSid) { + ResultBean rb=new ResultBean(); + List projectStateBySids=baseMapper.getZzFilesByProjectSid(projectSid,enterpriseSid); + return rb.success().setData(projectStateBySids); + } +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesVo.java new file mode 100644 index 00000000..8c3646df --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesVo.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.crm.biz.projectzzfiles; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/10/17 9:06 + */ +@Data +public class ProjectZzFilesVo implements Query { + private String id; + private String sid; + private String url; + private String projectSid; + private String enterpriseSid; + private String idCardType; + private String idCardName; + private String enterpriseName; + private List> urls; +// private String [] urls; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java index 84c8feba..e43ed0b5 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java @@ -29,9 +29,9 @@ public class StoreHouseProjectRest { // @ApiOperation("新增或修改") @PostMapping("/saveOrUpdateDto") - public ResultBean saveOrUpdateDto(@RequestBody StoreHouseProjectDto dto){ + public ResultBean saveOrUpdateDto(@RequestBody List dtos){ ResultBean rb = ResultBean.fireFail(); - storeHouseProjectService.saveOrUpdateDto(dto); + storeHouseProjectService.saveOrUpdateDto(dtos); return rb.success(); } @ApiOperation("根据项目sid查询仓库信息") 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 782e2691..e5711f18 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 @@ -26,30 +26,29 @@ public class StoreHouseProjectService extends MybatisBaseService dtos) { + //删除之前选择的仓库信息 + baseMapper.delete(new QueryWrapper().eq("projectSid",dtos.get(0).getProjectSid())); + for(StoreHouseProjectDto dto:dtos){ + StoreHouseProject entity = new StoreHouseProject(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setSid(UUID.randomUUID().toString()); + baseMapper.insert(entity); } - this.updateByDto(dto); + } public void insertByDto(StoreHouseProjectDto dto) { - - //删除之前选择的仓库信息 baseMapper.delete(new QueryWrapper().eq("projectSid",dto.getProjectSid())); StoreHouseProject entity = new StoreHouseProject(); BeanUtil.copyProperties(dto, entity, "id", "sid"); - for(String shSid:dto.getShSids()){ - - entity.setSid(UUID.randomUUID().toString()); - entity.setShSid(shSid); - baseMapper.insert(entity); - } +// for(String shSid:dto.getShSids()){ + entity.setSid(UUID.randomUUID().toString()); +// entity.setShSid(shSid); + baseMapper.insert(entity); +// } } public void updateByDto(StoreHouseProjectDto dto) { String dtoSid = dto.getSid(); @@ -74,6 +73,9 @@ public class StoreHouseProjectService extends MybatisBaseService> userList(); + @ApiOperation("获取一条记录 根据sid") + @ResponseBody + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.java index 5f2d6be7..6362688f 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.java @@ -77,6 +77,8 @@ public interface SysOrganizationMapper extends BaseMapper { SysOrganization selectByOrgCode(String substring); List selectChildernList(String sid); + SysOrganizationVo selectChildernListByOrg(@Param("psid") String psid,@Param("orgCode") String orgCode); + List selectUserList(String sid); /** * 根据业务员sid获取到分公司 diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml index 370c680b..e974a538 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml @@ -130,6 +130,12 @@ WHERE psid = #{psid} ORDER BY so.sort ASC +