diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.java index 19b584c4..b91050d5 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.java @@ -24,14 +24,14 @@ public interface DailySalesReportMapper extends BaseMapper { List getSalesByDate(@Param("endDate")String endDate,@Param("startDate")String startDate); double lwlsdTotalSales(@Param("orderDate")String orderDate); - @Select("select lsnjnTotalSales from daily_sales_report where orderDate=#{orderDate} ") + @Select("select IFNULL(max(lsnjnTotalSales), 0) as lsnjnTotalSales from daily_sales_report where orderDate=#{orderDate} ") double lsnjnTotalSales(@Param("orderDate")String orderDate); - @Select("select pszxTotalSales from daily_sales_report where orderDate=#{orderDate} ") + @Select("select IFNULL(max(pszxTotalSales), 0) as pszxTotalSales from daily_sales_report where orderDate=#{orderDate} ") double pszxTotalSales(@Param("orderDate")String orderDate); - @Select("select lswjmTotalSales from daily_sales_report where orderDate=#{orderDate} ") + @Select("select IFNULL(max(lswjmTotalSales), 0) as lswjmTotalSales from daily_sales_report where orderDate=#{orderDate} ") double lswjmTotalSales(@Param("orderDate")String orderDate); - @Select("select bymdcTotalSales from daily_sales_report where orderDate=#{orderDate} ") + @Select("select IFNULL(max(bymdcTotalSales), 0) as bymdcTotalSales from daily_sales_report where orderDate=#{orderDate} ") double bymdcTotalSales(@Param("orderDate")String orderDate); - @Select("select yclswjmTotalSales from daily_sales_report where orderDate=#{orderDate} ") + @Select("select IFNULL(max(yclswjmTotalSales), 0) as yclswjmTotalSales from daily_sales_report where orderDate=#{orderDate} ") double yclswjmTotalSales(@Param("orderDate")String orderDate); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.xml index 8055367c..7eef0159 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/dailysalesreport/DailySalesReportMapper.xml @@ -6,6 +6,6 @@ \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java index eb501eb1..34b55d50 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java @@ -13,4 +13,5 @@ import java.util.List; public interface ProjectDailyMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); + IPage listPageVo(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/projectdaily/ProjectDailyMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml index e5d9c0b5..ce03e61b 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml @@ -8,6 +8,14 @@ order by orderDate desc + + + SELECT + ba.code as code,ba.purchaseDate as purchaseDate,ba.arrivalDate as arrivalDate,ba.supplierName as supplierName,ROUND(sum(de.price),2) as orderAmount + FROM + purchase_requisition_tobacco ba + LEFT JOIN purchase_requisition_store st ON ba.sid = st.mainSid + LEFT JOIN purchase_requisition_tobacco_details de ON st.sid = de.mainSid + ${ew.sqlSegment} + GROUP BY ba.code + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java new file mode 100644 index 00000000..e211e822 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.report.feign.crm.projectinformation; + +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.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/10/25 9:36 + */ +@FeignClient( + contextId = "supervise-crm-projectinformation", + name = "supervise-crm", + path = "v1/projectinformation") +public interface ProjectInformationFeign { + + @ApiOperation("查询全部") + @GetMapping("/listAll") + public ResultBean> listAll(@RequestHeader("token") String token); +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationVo.java new file mode 100644 index 00000000..0c2107d8 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationVo.java @@ -0,0 +1,69 @@ +package com.yxt.supervise.report.feign.crm.projectinformation; + +import com.yxt.common.core.vo.Vo; +import com.yxt.supervise.system.sysorganization.SysOrganizationVo; +import com.yxt.supervise.system.sysuser.SysUser; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @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 BigDecimal useLimit; + private String loanDate; + private String useDate; + private String bankPledgeRate; + //状态名称 + private String stateName; + private String stateSid; + //状态说明 + private String stateRemarks; + private BigDecimal balance=new BigDecimal(0); + + //项目银行人 + private SysUser sysUser; + //银行 + private SysOrganizationVo sysOrganizationVo; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysmenu/SysMenuFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysmenu/SysMenuFeign.java new file mode 100644 index 00000000..c038d933 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysmenu/SysMenuFeign.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.report.feign.system.sysmenu; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/10/26 9:50 + */ +@Api(tags = "菜单表") +@FeignClient( + contextId = "supervise-system-SysMenu", + name = "supervise-system", + path = "v1/sysmenu") +public interface SysMenuFeign { + @ApiOperation("根据资源sid查询所有数据列表 ") + @PostMapping("/sourcemenutree") + public ResultBean>> sourcemenutree(@RequestBody SysMenuQuery query); +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysmenu/SysMenuQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysmenu/SysMenuQuery.java new file mode 100644 index 00000000..5b1b8988 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysmenu/SysMenuQuery.java @@ -0,0 +1,66 @@ +package com.yxt.supervise.report.feign.system.sysmenu; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuQuery.java
+ * Class: SysMenuQuery
+ * Description: 菜单表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单表 查询条件", description = "菜单表 查询条件") +@Data +public class SysMenuQuery implements Query { + + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("是否显示,默认为1显示，0为不显示") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("上级sid") + private String pSid; + + @ApiModelProperty("前端页面路径重定向") + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty("前端页面别名") + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java new file mode 100644 index 00000000..0a785009 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.report.feign.system.sysuser; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.system.sysuser.SysUser; +import com.yxt.supervise.system.sysuser.SysUserDto; +import com.yxt.supervise.system.sysuser.SysUserVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/8/5 9:22 + */ +@FeignClient( + contextId = "supervise-system-sysUser", + name = "supervise-system", + path = "v1/sysuser") +public interface SysUserFeign { + @PostMapping(value = "/loginDetailsNew") + @ApiOperation("根据token值获取登录后的用户信息") + public ResultBean loginDetailsNew(@RequestHeader("token") String token); +}