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 index 93880ee2..c1bf9925 100644 --- 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 @@ -6,6 +6,8 @@ import com.yxt.common.core.domain.EntityWithId; import io.swagger.annotations.ApiModel; import lombok.Data; +import java.math.BigDecimal; + /** * @author wangpengfei * @date 2023/10/17 9:06 @@ -20,6 +22,6 @@ public class ProjectAccount extends EntityWithId { private String accountNumber; private String bank; private String affiliateBank; - private String balance; + private BigDecimal 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 index 3fb97801..3d3caa77 100644 --- 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 @@ -3,6 +3,8 @@ package com.yxt.supervise.crm.biz.projectaccount; import com.yxt.common.core.dto.Dto; import lombok.Data; +import java.math.BigDecimal; + /** * @author wangpengfei * @date 2023/10/17 9:06 @@ -21,7 +23,7 @@ public class ProjectAccountDto implements Dto { private String bank; // private String affiliateBank; - private String balance; + private BigDecimal 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 index 98654298..97805999 100644 --- 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 @@ -4,10 +4,12 @@ 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.biz.projectinformation.ProjectInformationVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.math.BigDecimal; import java.util.List; /** @@ -23,7 +25,10 @@ public interface ProjectAccountMapper extends BaseMapper { @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} ") + @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); + @Select("select sum(balance) as balance from project_account where projectSid=#{projectSid} ") + BigDecimal getBalanceByProjectSid(@Param("projectSid")String projectSid); } 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 index a3c0e13a..1c54fa4d 100644 --- 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 @@ -16,7 +16,7 @@ import java.util.List; */ @Api(tags = "项目账户关联表") @RestController -@RequestMapping("ProjectAccount") +@RequestMapping("projectAccount") public class ProjectAccountRest { @Autowired ProjectAccountService ProjectAccountService; @@ -51,8 +51,21 @@ public class ProjectAccountRest { } @ApiOperation("根据sid查询") @GetMapping("/getProjectAccountBySid/{sid}") - public ResultBean selectStoreBySid (@PathVariable String sid){ + public ResultBean getProjectAccountBySid (@PathVariable String sid){ ResultBean r=ProjectAccountService.getProjectAccountBySid(sid); return r; } + @ApiOperation("根据项目sid查询账户信息") + @GetMapping("/getAccountByProjectSid/{projectSid}") + public ResultBean getAccountByProjectSid (@PathVariable("projectSid") String projectSid){ + ResultBean r=ProjectAccountService.getAccountByProjectSid(projectSid); + return r; + } + @ApiOperation("根据项目sid查询账户余额") + @GetMapping("/getBalanceByProjectSid/{projectSid}") + public ResultBean getBalanceByProjectSid (@PathVariable("projectSid") String projectSid){ + ResultBean r=ProjectAccountService.getBalanceByProjectSid(projectSid); + 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 index d69b874c..c8fa2388 100644 --- 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 @@ -12,6 +12,8 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -83,6 +85,17 @@ public class ProjectAccountService extends MybatisBaseService> getAccountByProjectSid(String projectSid) { ResultBean rb=new ResultBean(); List projectStateBySid=baseMapper.getAccountByProjectSid(projectSid); + if(projectStateBySid.size()<0){ + return rb.success().setData(new ArrayList<>()); + } return rb.success().setData(projectStateBySid); } + public ResultBean getBalanceByProjectSid(String projectSid) { + ResultBean rb=new ResultBean(); + BigDecimal balance=baseMapper.getBalanceByProjectSid(projectSid); + if (null==balance){ + balance=new BigDecimal(0); + } + return rb.success().setData(balance); + } } 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 index c835e8d2..28f70e79 100644 --- 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 @@ -3,6 +3,8 @@ package com.yxt.supervise.crm.biz.projectaccount; import com.yxt.common.core.query.Query; import lombok.Data; +import java.math.BigDecimal; + /** * @author wangpengfei * @date 2023/10/17 9:06 @@ -16,7 +18,7 @@ public class ProjectAccountVo implements Query { private String accountNumber; private String bank; private String affiliateBank; - private String balance; + private BigDecimal balance=new BigDecimal(0); 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/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index c09611f4..5937e20e 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 @@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; /** @@ -91,6 +92,8 @@ public class ProjectInformationService extends MybatisBaseService listAll() { List pagging = baseMapper.listAll(); + for(ProjectInformationVo projectInformationVo:pagging){ + BigDecimal balance=projectAccountService.getBalanceByProjectSid(projectInformationVo.getSid()).getData(); + projectInformationVo.setBalance(balance); + } return pagging; } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java index 98d5eed7..bd3f1729 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationVo.java @@ -14,6 +14,7 @@ import com.yxt.supervise.system.sysuser.SysUser; import io.swagger.annotations.ApiModel; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -60,7 +61,7 @@ public class ProjectInformationVo implements Vo { private String engaDate; private String url; private List enterpriseProjectVoList; - private String useLimit; + private BigDecimal useLimit; private String loanDate; private String useDate; private String bankPledgeRate; @@ -69,18 +70,11 @@ public class ProjectInformationVo implements Vo { private String stateSid; //状态说明 private String stateRemarks; + private BigDecimal balance=new BigDecimal(0); //项目银行人 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-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java index 8244e3ed..da01da13 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.EntityWithId; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -50,7 +51,6 @@ public class ProjectDaily extends EntityWithId { private String state="2";//质押状态 @TableField(exist = false) private double creditLimit;//授信额度 - @TableField(exist = false) private double useLimit;//用信额度 /** diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyDto.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyDto.java index ee10250a..0d9cded7 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyDto.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyDto.java @@ -1,8 +1,10 @@ package com.yxt.supervise.report.biz.projectdaily; import com.yxt.common.core.dto.Dto; +import com.yxt.supervise.report.biz.projectdailyaccount.ProjectDailyAccountDto; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @Data @@ -24,5 +26,7 @@ public class ProjectDailyDto implements Dto { private double transitAmount = 0; // 在途货值', private double advancePayment = 0; // 预付款', private double pledgeRate = 0; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）', + private BigDecimal useLimit=new BigDecimal(0);//用信总额 private List fileList; + private List bankList; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index 600861b7..082e915a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -12,6 +12,8 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.biz.projectdailyaccount.ProjectDailyAccountDto; +import com.yxt.supervise.report.biz.projectdailyaccount.ProjectDailyAccountService; import com.yxt.supervise.report.biz.wechat.WechatRest; import com.yxt.supervise.report.biz.wechat.WechatService; import com.yxt.supervise.report.ds.crm.CrmMapper; @@ -44,6 +46,8 @@ public class ProjectDailyService extends ServiceImpl selectListPage(PagerQuery pq) { ProjectDailyQuery params = pq.getParams(); QueryWrapper wq = new QueryWrapper<>(); @@ -143,6 +147,15 @@ public class ProjectDailyService extends ServiceImpl { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml new file mode 100644 index 00000000..e5d9c0b5 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountQuery.java new file mode 100644 index 00000000..935cb0ee --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountQuery.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.report.biz.projectdailyaccount; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/20 13:38 + */ +@Data +public class ProjectDailyAccountQuery implements Query { + private String id; + private String sid; + private String createTime; + private String modifyTime; + private String remarks; + private String orderDate; + private String projectDailySid; + private String accountSid; + private String balance; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountRest.java new file mode 100644 index 00000000..699aebde --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountRest.java @@ -0,0 +1,63 @@ +package com.yxt.supervise.report.biz.projectdailyaccount; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.FileUploadResult; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +/** + * @author wangpengfei + * @date 2023/10/20 13:38 + */ +@RestController("com.yxt.supervise.report.biz.ProjectDailyAccount.ProjectDailyAccountRest") +@RequestMapping("/ProjectDailyAccount") +public class ProjectDailyAccountRest { + + @Autowired + private ProjectDailyAccountService ProjectDailyAccountService; + + + @ApiOperation("查询项目监管报表信息") + @PostMapping("/listPage") + public ResultBean> selectListPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); +// PagerVo ProjectDailyAccountVoPagerVo = ProjectDailyAccountService.selectListPage(pq); + IPage iPage = ProjectDailyAccountService.listPage(pq); + return rb.success().setData(iPage); + } + @ApiOperation("查询条件项目监管报表信息") + @PostMapping("/selectList") + public ResultBean> selectList(@RequestBody ProjectDailyAccountQuery params) { + ResultBean rb = ResultBean.fireFail(); +// PagerVo ProjectDailyAccountVoPagerVo = ProjectDailyAccountService.selectListPage(pq); + Map list = ProjectDailyAccountService.selectList(params); + return rb.success().setData(list); + } + @ApiOperation("添加项目监管报表信息账户余额") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectDailyAccountDto dto) { + return ProjectDailyAccountService.save(dto); + } + + + + @ApiOperation("查询项目监管报表信息APP") + @PostMapping("/selectListPage") + public ResultBean ListPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo ProjectDailyAccountVoPagerVo = ProjectDailyAccountService.selectListPage(pq); + return rb.success().setData(ProjectDailyAccountVoPagerVo); + } + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountService.java new file mode 100644 index 00000000..f1b22fdf --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountService.java @@ -0,0 +1,92 @@ +package com.yxt.supervise.report.biz.projectdailyaccount; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; + +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.ds.crm.CrmMapper; +import com.yxt.supervise.report.ds.crm.ProjectAccount; +import com.yxt.supervise.report.ds.crm.ProjectInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import java.util.*; +/** + * @author wangpengfei + * @date 2023/10/20 13:38 + */ +@Service +public class ProjectDailyAccountService extends ServiceImpl { + @Autowired + CrmMapper crmMapper; + + public PagerVo selectListPage(PagerQuery pq) { + ProjectDailyAccountQuery params = pq.getParams(); + QueryWrapper wq = new QueryWrapper<>(); +// if (params != null) { +// if (params.getDataDateStart() != null && !params.getDataDateStart().equals("")) { +// wq.ge("orderDate", params.getDataDateStart()); +// } +// if (params.getDataDateEnd() != null && !params.getDataDateEnd().equals("")) { +// wq.le("orderDate", params.getDataDateEnd()); +// } +// if (params.getProjectName() != null && !params.getProjectName().equals("")) { +// wq.like("projectName", params.getProjectName()); +// } +// } + IPage page = PagerUtil.queryToPage(pq); + IPage ProjectDailyAccountVoIPage = baseMapper.selectPageVo(page, wq); + PagerVo objectPagerVo = PagerUtil.pageToVo(ProjectDailyAccountVoIPage, null); + return objectPagerVo; + } + + public IPage listPage(PagerQuery pq) { + ProjectDailyAccountQuery params = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// qw.gt("id", 0); +// if (StrUtil.isNotBlank(params.getDataDateStart())) { +// qw.ge("orderDate", params.getDataDateStart()); +// } +// if (StrUtil.isNotBlank(params.getDataDateEnd())) { +// qw.le("orderDate", params.getDataDateEnd()); +// } +// if (StrUtil.isNotBlank(params.getProjectSid())) { +// qw.eq("projectSid", params.getProjectSid()); +// } +// qw.orderByDesc("orderDate", "createTime"); + + IPage iPage = PagerUtil.queryToPage(pq); + IPage page = baseMapper.selectPage(iPage, qw); + return page; + } + public Map selectList(ProjectDailyAccountQuery params) { + + return new HashMap<>(); + } + public ResultBean save(ProjectDailyAccountDto dto) { + ResultBean rb = ResultBean.fireFail(); + ProjectDailyAccount entity=new ProjectDailyAccount(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + //先删除之前的 + baseMapper.delete(new QueryWrapper().eq("orderDate",dto.getOrderDate()).eq("projectSid",dto.getProjectSid())); + baseMapper.insert(entity); + ProjectAccount projectInfo=crmMapper.getAccountBySid(dto.getAccountSid()); + if(null!=projectInfo){ + projectInfo.setBalance(dto.getBalance()); + crmMapper.updateBalanceBySid(projectInfo.getBalance(),projectInfo.getSid()); + } + return rb.success().setMsg("添加成功"); + } + + public ProjectDailyAccount fetchByProjectAndDay(String projectSid, String orderDate) { + + return new ProjectDailyAccount(); + } + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountVo.java new file mode 100644 index 00000000..f3e6293a --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountVo.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.report.biz.projectdailyaccount; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/10/20 13:38 + */ +@Data +public class ProjectDailyAccountVo implements Vo { + private String id; + private String sid; + private String createTime; + private String modifyTime; + private String remarks; + private String orderDate; + private String projectDailySid; + private String accountSid; + private String balance; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index f4030bed..69750e14 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java @@ -6,7 +6,9 @@ import com.yxt.supervise.report.ds.warehouse.StoreHouse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; +import java.math.BigDecimal; import java.util.List; @DS("crm") @@ -30,6 +32,8 @@ public interface CrmMapper extends BaseMapper { List listStoreHouseByProjectSid(@Param("projectSid") String projectSid); @Select("select * from project_information where sid = #{sid}") ProjectInfo getProjectBySid(@Param("sid") String sid); + @Update("update project_information set useLimit=#{useLimit} where sid=#{sid}") + int updateUseLimitBySid(@Param("useLimit") BigDecimal useLimit, @Param("sid")String sid); @Select("select * from user_project where projectSid = #{sid}") List getAllByProjectSid(@Param("sid") String sid); @@ -39,4 +43,10 @@ public interface CrmMapper extends BaseMapper { @Select("select * from user_project where userSid=#{userSid}") List getProjectByUserSid(@Param("userSid") String userSid); + // + @Select("select * from project_account where sid=#{sid}") + ProjectAccount getAccountBySid(@Param("sid")String sid ); + @Update("update project_account set balance=#{balance} where sid=#{sid}") + int updateBalanceBySid(@Param("balance") BigDecimal balance, @Param("sid")String sid); + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectAccount.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectAccount.java new file mode 100644 index 00000000..863f0b9a --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectAccount.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.report.ds.crm; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.EntityWithId; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @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 BigDecimal balance; + private String enterpriseSid; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java index 63d20335..ea8debd6 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java @@ -3,9 +3,12 @@ package com.yxt.supervise.report.ds.crm; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.math.BigDecimal; + @Data @TableName("project_information") public class ProjectInfo { + private String id; private String sid; private String entryName; private String regulatoryLeader;