diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JChiefWorkController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JChiefWorkController.java new file mode 100644 index 0000000..206654f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JChiefWorkController.java @@ -0,0 +1,95 @@ +package com.ruoyi.jjh.ent.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.jjh.ent.entity.JMemorandum; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.request.JTop5FundRequest; +import com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse; +import com.ruoyi.jjh.ent.service.JChiefWorkService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 政务端工作台控制层 + * @author du + * @since 2024/8/28 10:36 + */ +@RestController +@RequestMapping("/jjh/chiefWork") +@Api(tags = "政务端工作台 8.28") +public class JChiefWorkController extends BaseController { + + @Resource + private JChiefWorkService jChiefWorkService; + + + /** + * 政务端-工作台 服务业发展总览 + * (数据更新后建议修改 两条数据 1个去年总数的，1个本年上一季度的) + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "政务端-工作台 服务业发展总览", response = JServicesDevelopResponse.class) + @GetMapping("/servicesDevelop") + public AjaxResult getServicesDevelop() { + return success(jChiefWorkService.servicesDevelop()); + } + + /** + * 政务端-工作台 近三年资金拨付情况 + * (数据更新后建议修改 2个仪表盘、3个年份的18个数字待提供) + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "政务端-工作台 近三年资金拨付情况") + @GetMapping("/threeYearsFund") + public AjaxResult getThreeYearsFund() { + return success(); + } + + /** + * 政务端-工作台 企业获得资金拨付排名TOP5 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "政务端-工作台 企业获得资金拨付排名TOP5",response = JProjectFund.class) + @GetMapping("/top5Fund") + public AjaxResult getTop5Fund(JTop5FundRequest a) { + return success(jChiefWorkService.getTop5Fund(a)); + } + + /** + * 政务端-工作台 当年已申报完成的项目 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "政务端-工作台 当年已申报完成的项目",response = JProject.class) + @GetMapping("/currentYearFinish") + public AjaxResult currentYearFinish() { + return success(jChiefWorkService.currentYearFinish()); + } + + /** + * 政务端-工作台 项目追踪情况 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "政务端-工作台 项目追踪情况",response = JProject.class) + @GetMapping("/projectTrace") + public AjaxResult projectTrace() { + return success(jChiefWorkService.projectTrace()); + } + + /** + * 政务端-工作台 备忘录更新情况 + */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "政务端-工作台 备忘录更新情况", response = JMemorandum.class) + @GetMapping("/memorandum") + public AjaxResult memorandum() { + return success(jChiefWorkService.memorandum()); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JTop5FundRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JTop5FundRequest.java new file mode 100644 index 0000000..2bd9ec7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JTop5FundRequest.java @@ -0,0 +1,34 @@ +package com.ruoyi.jjh.ent.entity.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 企业获得资金拨付排名TOP5请求体 + * @author du + * @since 2024/8/28 13:13 + */ +@Data +@ApiModel("企业获得资金拨付排名TOP5请求体") +public class JTop5FundRequest { + + + /** + * 年份 1.当前 2.近三年 + */ + @NotBlank + @ApiModelProperty("年份 1.当前 2.近三年 ") + private Integer yearsChange; + + + /** + * 分类 1.总部专项 2.服务业专项 + */ + @NotNull + @ApiModelProperty("分类 1.总部专项 2.服务业专项") + private Integer type; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JChiefWorkMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JChiefWorkMapper.java new file mode 100644 index 0000000..da01c71 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JChiefWorkMapper.java @@ -0,0 +1,44 @@ +package com.ruoyi.jjh.ent.mapper; + +import com.ruoyi.jjh.ent.entity.JMemorandum; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.request.JTop5FundRequest; +import com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 政务端工作台表数据层 + * + * @author du + * @since 2024/5/6 13:57 + */ +public interface JChiefWorkMapper{ + + /** + * 政务端-工作台 服务业发展总览 + */ + List servicesDevelop(); + + /** + * 政务端-工作台 企业获得资金拨付排名TOP5 + */ + List getTop5Fund(@Param("req") JTop5FundRequest a); + + /** + * 政务端-工作台 当年已申报完成的项目 + */ + List currentYearFinish(); + + /** + * 政务端-工作台 项目追踪情况 + */ + List projectTrace(); + + /** + * 政务端-工作台 备忘录更新情况 + */ + List memorandum(); +} 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 index 81d0756..469a9eb 100644 --- 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 @@ -21,7 +21,7 @@ public interface JProjectFundMapper extends BaseMapper { * * @return 所有数据 */ - List selectFund(@Param("creditCode") String creditCode,@Param("years") String years); + List selectFund(@Param("creditCode") String creditCode,@Param("projectSmallType") String projectSmallType); /** * 政务端-工作台 资金引导拨付情况统计 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JChiefWorkService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JChiefWorkService.java new file mode 100644 index 0000000..3dd679e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JChiefWorkService.java @@ -0,0 +1,43 @@ +package com.ruoyi.jjh.ent.service; + +import com.ruoyi.jjh.ent.entity.JMemorandum; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.request.JTop5FundRequest; +import com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse; + +import java.util.List; + +/** + * 政务端工作台表业务层 + * + * @author du + * @since 2024/7/31 15:16 + */ +public interface JChiefWorkService { + + /** + * 政务端-工作台 服务业发展总览 + */ + List servicesDevelop(); + + /** + * 政务端-工作台 企业获得资金拨付排名TOP5 + */ + List getTop5Fund(JTop5FundRequest a); + + /** + * 政务端-工作台 当年已申报完成的项目 + */ + List currentYearFinish(); + + /** + * 政务端-工作台 项目追踪情况 + */ + List projectTrace(); + + /** + * 政务端-工作台 备忘录更新情况 + */ + List memorandum(); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JChiefWorkImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JChiefWorkImpl.java new file mode 100644 index 0000000..869751d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JChiefWorkImpl.java @@ -0,0 +1,80 @@ +package com.ruoyi.jjh.ent.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.ruoyi.jjh.ent.entity.JMemorandum; +import com.ruoyi.jjh.ent.entity.JProject; +import com.ruoyi.jjh.ent.entity.JProjectFund; +import com.ruoyi.jjh.ent.entity.request.JTop5FundRequest; +import com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse; +import com.ruoyi.jjh.ent.mapper.JChiefWorkMapper; +import com.ruoyi.jjh.ent.service.JChiefWorkService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDate; +import java.util.List; + +/** + * 政务端工作台表业务处理层 + * + * @author du + * @since 2024/5/13 9:58 + */ +@Service +public class JChiefWorkImpl implements JChiefWorkService { + + @Resource + private JChiefWorkMapper jChiefWorkMapper; + + /** + * 政务端-工作台 服务业发展总览 + */ + @Override + public List servicesDevelop() { + return jChiefWorkMapper.servicesDevelop(); + } + + /** + * 政务端-工作台 企业获得资金拨付排名TOP5 + */ + @Override + public List getTop5Fund(JTop5FundRequest a) { + List top5Fund = jChiefWorkMapper.getTop5Fund(a); + if(a.getYearsChange() == 1){ + top5Fund.forEach(x-> x.setAppropriationTime(String.valueOf(LocalDate.now().getYear()-1))); + }else { + top5Fund.forEach(x-> x.setAppropriationTime(LocalDate.now().getYear() - 3 +"-"+ + (LocalDate.now().getYear() - 1))); + } + return top5Fund; + } + + /** + * 政务端-工作台 当年已申报完成的项目 + */ + @Override + public List currentYearFinish() { + return jChiefWorkMapper.currentYearFinish(); + } + /** + * 政务端-工作台 项目追踪情况 + */ + @Override + public List projectTrace() { + return jChiefWorkMapper.projectTrace(); + } + + /** + * 政务端-工作台 备忘录更新情况 + */ + @Override + public List memorandum() { + List memorandum = jChiefWorkMapper.memorandum(); + memorandum.forEach(x->{ + if(x.getContent().length()>10){ + x.setContent(x.getContent().substring(0, 10)+"***"); + } + }); + return memorandum; + } +} 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 index 96f2f9d..0abab6b 100644 --- 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 @@ -37,7 +37,11 @@ public class JProjectFundServiceImpl extends ServiceImpl + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml index dcb6ee8..c840b42 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml @@ -9,9 +9,7 @@ FROM j_project_fund a WHERE - ( a.project_name = '区级总部' or a.project_name = '市级服务业领军') - and a.tyshxydm=#{creditCode} - and a.appropriation_time like concat(#{years}, '%') + a.project_name = #{projectSmallType} and a.tyshxydm=#{creditCode} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index a41dbb1..ce3d283 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -76,7 +76,7 @@ public class SysLoginService { */ public Map login(String username, String password, String code, String uuid, String userType) { // 验证码校验 - validateCaptcha(username, code, uuid); + validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username, password); // 用户验证