From b16bda35446509871fe70b491e68478da8123898 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 12 Aug 2024 13:44:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ent/controller/JDataScreenController.java | 2 - .../controller/JProjectFundController.java | 98 ++++++++ .../ruoyi/jjh/ent/entity/JProjectFund.java | 55 +++++ .../ruoyi/jjh/ent/entity/JServicesList.java | 6 +- .../entity/request/JServicesListRequest.java | 4 +- .../response/FundStatisticsResponse.java | 27 +++ .../entity/response/JProjectFundResponse.java | 22 ++ .../jjh/ent/mapper/JDataScreenMapper.java | 19 +- .../jjh/ent/mapper/JProjectFundMapper.java | 46 ++++ .../jjh/ent/mapper/JServicesListMapper.java | 8 +- .../jjh/ent/service/JDataScreenService.java | 2 + .../jjh/ent/service/JProjectFundService.java | 44 ++++ .../jjh/ent/service/impl/JDataScreenImpl.java | 224 ++---------------- .../service/impl/JProjectFundServiceImpl.java | 76 ++++++ .../impl/JServicesListServiceImpl.java | 6 +- .../mapper/jjh/ent/JDataScreenMapper.xml | 50 ++-- .../mapper/jjh/ent/JProjectFundMapper.xml | 76 ++++++ .../mapper/jjh/ent/JServicesListMapper.xml | 51 ++-- 18 files changed, 542 insertions(+), 274 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectFundController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProjectFund.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/FundStatisticsResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JProjectFundResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java index ecffeb6..92338ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java @@ -98,6 +98,4 @@ public class JDataScreenController extends BaseController { public AjaxResult getAllIndustry() { return success(jDataScreenService.getAllIndustry()); } - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectFundController.java new file mode 100644 index 0000000..8ec3137 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectFundController.java @@ -0,0 +1,98 @@ +package com.ruoyi.jjh.ent.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.response.FundStatisticsResponse; +import com.ruoyi.jjh.ent.entity.response.JProjectFundResponse; +import com.ruoyi.jjh.ent.service.JProjectFundService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 项目资金表(j_project_fund)控制层 + * @author du + * @since 2024/8/8 15:31 + */ +@RestController +@RequestMapping("/jjh/jProjectFund") +@Api(tags = "项目资金表") +public class JProjectFundController extends BaseController { + + @Resource + private JProjectFundService jProjectFundService; + + /** + * 查询该项目id下的资金情况 + * + * @return 所有数据 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "查询该项目id下的资金情况", response = JProjectFund.class) + @GetMapping("/{id}") + public AjaxResult selectFund(@PathVariable Long id) { + return success(jProjectFundService.selectFund(id)); + } + + /** + * 政务端-工作台 资金引导拨付情况统计 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "政务端-工作台 资金引导拨付情况统计", response = FundStatisticsResponse.class) + @GetMapping("/fundStatistics") + public AjaxResult fundStatistics() { + return success(jProjectFundService.fundStatistics()); + } + + /** + * 政务端-工作台 拨付资金企业申请情况TOP5 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "政务端-工作台 拨付资金企业申请情况TOP5", response = JProjectFund.class) + @GetMapping("/appropriationTop5") + public AjaxResult appropriationTop5() { + return success(jProjectFundService.appropriationTop5()); + } + + /** + * 企业端-首页 企业荣誉资质关联项目进展 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,ent')") + @ApiOperation(value = "企业端-首页企业荣誉资质 关联项目进展", response = JProject.class) + @GetMapping("/enterpriseProject") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "1企业荣誉资质 2关联项目进展", required = true), + }) + public AjaxResult getEnterpriseProject(@RequestParam Integer type) { + String creditCode = null; + try { + creditCode = SecurityUtils.getUsername(); + } catch (Exception ignored) { + } + return success(jProjectFundService.getEnterpriseProject(type,creditCode)); + } + + /** + * 企业端-首页 往年专项资金申报 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,ent')") + @ApiOperation(value = "企业端-首页 往年专项资金申报", response = JProjectFundResponse.class) + @GetMapping("/usualFund") + public AjaxResult usualFund() { + String username = null; + try { + username = SecurityUtils.getUsername(); + } catch (Exception ignored) { + } + return success(jProjectFundService.usualFund(username)); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProjectFund.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProjectFund.java new file mode 100644 index 0000000..ff57527 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProjectFund.java @@ -0,0 +1,55 @@ +package com.ruoyi.jjh.ent.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目资金表(j_project_fund)实体类 + * @author du + * @since 2024/8/8 15:40 + */ +@ApiModel("项目表") +@TableName(value = "j_project_fund") +@Data +public class JProjectFund { + /** + * Id + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 企业名称 + */ + @ApiModelProperty("企业名称") + private String qymc; + + /** + * 统一社会信用代码 + */ + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; + + /** + * 项目 + */ + @ApiModelProperty("项目") + private String projectName; + + /** + * 项目金额 + */ + @ApiModelProperty("项目金额") + private Double fundAmount; + + /** + * 拨付时间 + */ + @ApiModelProperty("拨付时间") + private String appropriationTime; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JServicesList.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JServicesList.java index 955e460..06585b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JServicesList.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JServicesList.java @@ -18,7 +18,7 @@ import lombok.Data; @Data @ApiModel("服务业企业名单") @TableName(value = "j_services_list") -public class JServicesList extends BaseInfoEntity { +public class JServicesList{ /** * Id @@ -51,9 +51,9 @@ public class JServicesList extends BaseInfoEntity { private String hydm; /** - * 1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐 + * 1.生产性服务业 2生活性服务业 3规上服务业 4限上批零住餐 */ - @ApiModelProperty("1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐") + @ApiModelProperty("1.生产性服务业 2生活性服务业 3规上服务业 4限上批零住餐") private String servicesType; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JServicesListRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JServicesListRequest.java index ca0faad..0c9c5d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JServicesListRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JServicesListRequest.java @@ -27,8 +27,8 @@ public class JServicesListRequest { private String tyshxydm; /** - * 1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐 + * 1.生产性服务业 2生活性服务业 3规上服务业 4限上批零住餐 */ - @ApiModelProperty("1.生产性服务业 2生活性服务业 3新兴服务业 4限上批零住餐") + @ApiModelProperty("1.生产性服务业 2生活性服务业 3规上服务业 4限上批零住餐") private String servicesType; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/FundStatisticsResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/FundStatisticsResponse.java new file mode 100644 index 0000000..9a4906b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/FundStatisticsResponse.java @@ -0,0 +1,27 @@ +package com.ruoyi.jjh.ent.entity.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 资金引导拨付情况统计返回体 + * @author du + * @since 2024/8/8 16:09 + */ +@Data +@ApiModel("资金引导拨付情况统计返回体") +public class FundStatisticsResponse { + + /** + * 项目类别 + */ + @ApiModelProperty("项目类别") + private String type; + + /** + * 资金之和 （万元) + */ + @ApiModelProperty("资金之和 （万元)") + private Integer fundSum; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JProjectFundResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JProjectFundResponse.java new file mode 100644 index 0000000..676dc21 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JProjectFundResponse.java @@ -0,0 +1,22 @@ +package com.ruoyi.jjh.ent.entity.response; + +import com.ruoyi.jjh.ent.entity.JProjectFund; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 往年专项资金申报返回体 + * @author du + * @since 2024/8/12 11:19 + */ +@Data +@ApiModel("往年专项资金申报返回体") +public class JProjectFundResponse extends JProjectFund { + + /** + * 项目大类 + */ + @ApiModelProperty("项目大类") + private Integer projectBigType; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JDataScreenMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JDataScreenMapper.java index a3ac230..5f5226a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JDataScreenMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JDataScreenMapper.java @@ -1,11 +1,12 @@ package com.ruoyi.jjh.ent.mapper; -import com.ruoyi.jjh.ent.entity.response.HonorResponse; -import com.ruoyi.jjh.ent.entity.response.JAllIndustryResponse; -import com.ruoyi.jjh.ent.entity.response.JBigMiddleIndustryResponse; -import com.ruoyi.jjh.ent.entity.response.JIndustryDepthResponse; -import com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse; -import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.ent.entity.JContacts; +import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.response.*; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -47,17 +48,17 @@ public interface JDataScreenMapper { List getIndustryDepth(); /** - * 获取中类数据 + * 所有中类数据 * * @return 所有数据 */ List getMiddleIndustry(); - /** - * 获取大类数据 + * 所有大类数据 * * @return 所有数据 */ List getBigIndustry(); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java new file mode 100644 index 0000000..123ff4c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectFundMapper.java @@ -0,0 +1,46 @@ +package com.ruoyi.jjh.ent.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.response.FundStatisticsResponse; +import com.ruoyi.jjh.ent.entity.response.JProjectFundResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 项目资金情况（j_policy_fund）表数据访问层 + * @author du + * @since 2024/7/15 13:57 + */ +public interface JProjectFundMapper extends BaseMapper { + + /** + * 查询该项目id下的资金情况 + * + * @return 所有数据 + */ + List selectFund(String creditCode); + + /** + * 政务端-工作台 资金引导拨付情况统计 + */ + List fundStatistics(); + + /** + * 政务端-工作台 拨付资金企业申请情况TOP5 + */ + List appropriationTop5(); + + + /** + * 企业端-首页 企业荣誉资质 + */ + List getEnterpriseProject(@Param("type") Integer type,@Param("creditCode") String creditCode); + + /** + * 企业端-首页 往年专项资金申报 + */ + List usualFund(String username); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JServicesListMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JServicesListMapper.java index 1ceaf3e..4a596aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JServicesListMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JServicesListMapper.java @@ -26,13 +26,19 @@ public interface JServicesListMapper extends BaseMapper { */ Page page(Page page, @Param("req") JServicesListRequest js); + /** + * 分类为3的时候去企业库查找规上企业信息 + */ + Page page1(Page page, @Param("req")JServicesListRequest js); + /** * 首页服务业数据统计 */ List selectAllServicesCount(); /** - * 首页服务业数据统计 + * 获取总部企业的总数居 */ JServicesListCountResponse selectAllZbCount(); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JDataScreenService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JDataScreenService.java index e104df4..5dc24e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JDataScreenService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JDataScreenService.java @@ -52,4 +52,6 @@ public interface JDataScreenService { * @return 所有数据 */ List getAllIndustry(); + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java new file mode 100644 index 0000000..93d86ee --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectFundService.java @@ -0,0 +1,44 @@ +package com.ruoyi.jjh.ent.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.response.FundStatisticsResponse; +import com.ruoyi.jjh.ent.entity.response.JProjectFundResponse; + +import java.util.List; + +/** + * 项目资金情况（j_policy_fund）表业务层 + * @author du + * @since 2024/8/8 15:36 + */ +public interface JProjectFundService extends IService { + + /** + * 查询该项目id下的资金情况 + * + * @return 所有数据 + */ + List selectFund(Long id); + + /** + * 政务端-工作台 资金引导拨付情况统计 + */ + List fundStatistics(); + + /** + * 政务端-工作台 拨付资金企业申请情况TOP5 + */ + List appropriationTop5(); + + /** + * 企业端-首页 企业荣誉资质 + */ + List getEnterpriseProject(Integer type,String creditCode); + + /** + * 企业端-首页 往年专项资金申报 + */ + List usualFund(String username); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java index 854defe..84835ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java @@ -1,25 +1,26 @@ package com.ruoyi.jjh.ent.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.DesensitizedUtil; import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; +import com.ruoyi.jjh.ent.entity.JContacts; +import com.ruoyi.jjh.ent.entity.JEnterpriseContact; import com.ruoyi.jjh.ent.entity.JProject; -import com.ruoyi.jjh.ent.entity.response.HonorResponse; -import com.ruoyi.jjh.ent.entity.response.JAllIndustryResponse; -import com.ruoyi.jjh.ent.entity.response.JBigMiddleIndustryResponse; -import com.ruoyi.jjh.ent.entity.response.JIndustryDepthResponse; -import com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse; -import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.response.*; import com.ruoyi.jjh.ent.mapper.JDataScreenMapper; -import com.ruoyi.jjh.ent.service.JContactsService; -import com.ruoyi.jjh.ent.service.JDataScreenService; -import com.ruoyi.jjh.ent.service.JHeadQuartersRevenueService; -import com.ruoyi.jjh.ent.service.JProjectService; +import com.ruoyi.jjh.ent.service.*; +import liquibase.pro.packaged.A; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 数据大屏业务处理层 @@ -39,10 +40,14 @@ public class JDataScreenImpl implements JDataScreenService { @Resource private IBmsEnterpriseBasicInfoService enterpriseBasicInfoService; + @Resource + private IBmsEnterpriseDirectoryService es; @Resource private JHeadQuartersRevenueService jHeadQuartersRevenueService; @Resource + private JProjectFundService j1; + @Resource private JContactsService jc; /** @@ -128,203 +133,4 @@ public class JDataScreenImpl implements JDataScreenService { }); return all; } - -// /** -// * 数据库脱敏 -// */ -// @Override -// public String sqltm() { -// //修改企业库的企业名称 - //规上企业营收企业加密 -// List qyList = enterpriseBasicInfoService.list(); -// List neList = new ArrayList<>(); -// for (BmsEnterpriseBasicInfo items : qyList) { -// String result = items.getQymc().substring(2, items.getQymc().length()-4); -// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); -// be.setId(items.getId()); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getQymc(), 0, 2); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4)); -// be.setQymc(stringBuilder.toString()); -// neList.add(be); -// } -// enterpriseBasicInfoService.updateBatchById(neList); - -// //修改企业库的法人姓名 -// List qyList = enterpriseBasicInfoService.list(); -// List neList = new ArrayList<>(); -// for (BmsEnterpriseBasicInfo items : qyList) { -// if(items.getFddbrxm()!=null){ -// String result = items.getFddbrxm().substring(1, items.getFddbrxm().length() ); -// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); -// be.setId(items.getId()); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getFddbrxm(), 0, 1); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// be.setFddbrxm(stringBuilder.toString()); -// neList.add(be); -// } -// } -// enterpriseBasicInfoService.updateBatchById(neList); - - - // //修改企业库的法人姓名 -// List qyList = enterpriseBasicInfoService.list(); -// List neList = new ArrayList<>(); -// for (BmsEnterpriseBasicInfo items : qyList) { -// if(items.getFddbrxm()!=null){ -// String result = items.getFddbrxm().substring(1, items.getFddbrxm().length() ); -// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); -// be.setId(items.getId()); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getFddbrxm(), 0, 1); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// be.setFddbrxm(stringBuilder.toString()); -// neList.add(be); -// } -// } -// enterpriseBasicInfoService.updateBatchById(neList); - - //修改企业库的手机号 -// List qyList = enterpriseBasicInfoService.list(); -// List neList = new ArrayList<>(); -// for (BmsEnterpriseBasicInfo items : qyList) { -// if(items.getLxdh()!=null& !Objects.equals(items.getLxdh(), "")) { -// if (items.getLxdh().length() >= 10) { -// String result = items.getLxdh().substring(3, items.getLxdh().length() - 4); -// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); -// be.setId(items.getId()); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getLxdh(), 0, 3); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// stringBuilder.append(items.getLxdh().substring(items.getLxdh().length() - 4)); -// be.setLxdh(stringBuilder.toString()); -// neList.add(be); -// } else if(items.getLxdh().length() >= 4){ -// String result = items.getLxdh().substring(2, items.getLxdh().length() - 2); -// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); -// be.setId(items.getId()); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getLxdh(), 0, 2); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// stringBuilder.append(items.getLxdh().substring(items.getLxdh().length() - 2)); -// be.setLxdh(stringBuilder.toString()); -// neList.add(be); -// } -// } -// } -// enterpriseBasicInfoService.updateBatchById(neList); - - //规上企业营收企业加密 -// List jDataScreenMapper1 = jDataScreenMapper.get1(); -// System.out.println(jDataScreenMapper1.size()); -// List neList = new ArrayList<>(); -// for (BmsEnterpriseBasicInfo items : jDataScreenMapper1) { -// String result = items.getQymc().substring(2, items.getQymc().length()-4); -// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); -// be.setId(items.getId()); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getQymc(), 0, 2); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4)); -// be.setQymc(stringBuilder.toString()); -// neList.add(be); -// } -// for (BmsEnterpriseBasicInfo i : neList) { -// jDataScreenMapper.up(i); -// } - //联系人修改 -// List list = jc.list(); -// List newList = new ArrayList<>(); -// for (JContacts items : list) { -// JContacts be = new JContacts(); -// System.out.println(items.getDwAgencykey()); -// be.setDwAgencykey(items.getDwAgencykey()); -// if (items.getQymc() != null) { -// String result = items.getQymc().substring(2, items.getQymc().length() - 4); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getQymc(), 0, 2); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// stringBuilder.append(items.getQymc().substring(items.getQymc().length() - 4)); -// be.setQymc(stringBuilder.toString()); -// } -// if (items.getLlrxm() != null & !Objects.equals(items.getLlrxm(), "")) { -// String result = items.getLlrxm().substring(1, items.getLlrxm().length()); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getLlrxm(), 0, 1); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// be.setLlrxm(stringBuilder.toString()); -// } -// if (items.getDzyx() != null & !Objects.equals(items.getDzyx(), "")) { -// StringBuilder stringBuilder = new StringBuilder(); -// for (int i = 0; i < 4; i++) { -// stringBuilder.append("*"); -// } -// String result = items.getDzyx().substring(4, items.getDzyx().length()); -// stringBuilder.append(result); -// be.setDzyx(stringBuilder.toString()); -// } -// if (items.getYddh() != null &!Objects.equals(items.getYddh(), "")) { -// if (items.getYddh().length() >= 10) { -// String result = items.getYddh().substring(3, items.getYddh().length() - 4); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getYddh(), 0, 3); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// stringBuilder.append(items.getYddh().substring(items.getYddh().length() - 4)); -// be.setYddh(stringBuilder.toString()); -// } else if (items.getYddh().length() >= 4) { -// String result = items.getYddh().substring(2, items.getYddh().length() - 2); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getYddh(), 0, 2); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// stringBuilder.append(items.getYddh().substring(items.getYddh().length() - 2)); -// be.setYddh(stringBuilder.toString()); -// } -// } -// newList.add(be); -// } -// jc.updateBatchById(newList); -// -// //修改总部企业 -// List qyList = jDataScreenMapper.getjh(); -// List neList = new ArrayList<>(); -// for (BmsEnterpriseBasicInfo items : qyList) { -// String result = items.getQymc().substring(2, items.getQymc().length()-4); -// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); -// be.setId(items.getId()); -// StringBuilder stringBuilder = new StringBuilder(); -// stringBuilder.append(items.getQymc(), 0, 2); -// for (int i = 0; i < result.length(); i++) { -// stringBuilder.append("*"); -// } -// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4)); -// be.setQymc(stringBuilder.toString()); -// neList.add(be); -// } -// for (BmsEnterpriseBasicInfo i : neList) { -// jDataScreenMapper.upjh(i); -// } -// return null; -// } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java new file mode 100644 index 0000000..b8639e6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectFundServiceImpl.java @@ -0,0 +1,76 @@ +package com.ruoyi.jjh.ent.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.response.FundStatisticsResponse; +import com.ruoyi.jjh.ent.entity.response.JProjectFundResponse; +import com.ruoyi.jjh.ent.mapper.JProjectFundMapper; +import com.ruoyi.jjh.ent.service.JProjectFundService; +import com.ruoyi.jjh.ent.service.JProjectService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 项目资金情况（j_policy_fund）表业务处理层 + * @author du + * @since 2024/8/8 15:36 + */ +@Service +public class JProjectFundServiceImpl extends ServiceImpl implements JProjectFundService { + + + @Resource + private JProjectService jProjectService; + + /** + * 查询该项目id下的资金情况 + * + * @return 所有数据 + */ + @Override + public List selectFund(Long id) { + JProject jp = jProjectService.getById(id); + if(jp.getProjectSmallType()!=3&jp.getProjectSmallType()!=7){ + throw new ServiceException("暂无资金拨付!"); + }else { + return baseMapper.selectFund(jp.getCreditCode()); + } + } + + + /** + * 政务端-工作台 资金引导拨付情况统计 + */ + @Override + public List fundStatistics() { + return baseMapper.fundStatistics(); + } + + /** + * 政务端-工作台 拨付资金企业申请情况TOP5 + */ + @Override + public List appropriationTop5() { + return baseMapper.appropriationTop5(); + } + + /** + * 企业端-首页 企业荣誉资质 + */ + @Override + public List getEnterpriseProject(Integer type,String creditCode) { + return baseMapper.getEnterpriseProject(type,creditCode); + } + + /** + * 企业端-首页 往年专项资金申报 + */ + @Override + public List usualFund(String username) { + return baseMapper.usualFund(username); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java index 4433a37..4143eaa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JServicesListServiceImpl.java @@ -29,7 +29,11 @@ public class JServicesListServiceImpl extends ServiceImpl page(Page page, JServicesListRequest js) { - return baseMapper.page(page, js); + if("3".equals(js.getServicesType())){ + return baseMapper.page1(page, js); + }else { + return baseMapper.page(page, js); + } } /** diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml index cd1c447..0c0c072 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml @@ -88,42 +88,34 @@ SELECT a.years, a.industry_categories, IFNULL(ROUND(a.year_revenue / 10000, 1), '-') AS yearRevenue, - IFNULL(ROUND(a.add_value / 10000, 1), '-') AS addValue, - IFNULL(ROUND(a.growth / 10000, 1), '-') AS growth, - IFNULL(ROUND(a.gdp_proportion / 10000, 1), '-') AS gdpProportion + IFNULL(ROUND(a.add_value, 1) , '-') AS addValue, + IFNULL(ROUND(a.growth, 1), '-') AS growth, + IFNULL(ROUND(a.gdp_proportion, 4), '-') AS gdpProportion FROM j_industry_depth a WHERE a.years = YEAR(NOW()) - 1 + + diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml new file mode 100644 index 0000000..e86e783 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml @@ -0,0 +1,76 @@ + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml index 53765fe..4570dee 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml @@ -5,9 +5,13 @@ + + +