添加工作流

wushunjie
吴顺杰 7 months ago
parent bb3c42dc7d
commit abcf8619ee

@ -18,11 +18,17 @@
* 权限认证使用Jwt支持多终端认证系统。 * 权限认证使用Jwt支持多终端认证系统。
* 支持加载动态权限菜单,多方式轻松权限控制。 * 支持加载动态权限菜单,多方式轻松权限控制。
* 高效率开发,使用代码生成器可以一键生成前后端代码。 * 高效率开发,使用代码生成器可以一键生成前后端代码。
* 提供了技术栈([Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev))版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3),保持同步更新。 *
* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle),保持同步更新。 提供了技术栈([Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)
* 不分离版本,请移步[RuoYi](https://gitee.com/y_project/RuoYi),微服务版本,请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) )版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3),保持同步更新。
* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)
Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle),保持同步更新。
* 不分离版本,请移步[RuoYi](https://gitee.com/y_project/RuoYi)
,微服务版本,请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
* 阿里云折扣场:[点我进入](http://aly.ruoyi.vip),腾讯云秒杀场:[点我进入](http://txy.ruoyi.vip)   * 阿里云折扣场:[点我进入](http://aly.ruoyi.vip),腾讯云秒杀场:[点我进入](http://txy.ruoyi.vip)  
* 阿里云优惠券:[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link),腾讯云优惠券:[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   * 阿里云优惠券:[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)
,腾讯云优惠券:[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)
  
## 内置功能 ## 内置功能
@ -90,7 +96,7 @@
</tr> </tr>
</table> </table>
## 若依前后端分离交流群 ## 若依前后端分离交流群
QQ群 [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) 点击按钮入群。 QQ群 [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063)
点击按钮入群。

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -28,11 +28,51 @@
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version> <velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version> <jwt.version>0.9.1</jwt.version>
<flowable.version>6.8.0</flowable.version>
<ruoyi-flowable-plus.version>0.8.3</ruoyi-flowable-plus.version>
<easyexcel.version>3.2.1</easyexcel.version>
</properties> </properties>
<!-- 依赖声明 --> <!-- 依赖声明 -->
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- flowable -->
<dependency>
<groupId>org.flowable</groupId>
<artifactId>flowable-spring-boot-starter-process</artifactId>
<version>${flowable.version}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
<!-- SpringBoot的依赖配置--> <!-- SpringBoot的依赖配置-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -148,6 +188,13 @@
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<!-- 工作流模块 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-flowable</artifactId>
<version>${ruoyi.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>ruoyi</artifactId> <artifactId>ruoyi</artifactId>
@ -16,11 +16,7 @@
</description> </description>
<dependencies> <dependencies>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.23</version>
</dependency>
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId> <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
@ -50,6 +46,12 @@
<artifactId>ruoyi-quartz</artifactId> <artifactId>ruoyi-quartz</artifactId>
</dependency> </dependency>
<!-- flowable模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-flowable</artifactId>
</dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>

@ -8,11 +8,9 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
* *
* @author ruoyi * @author ruoyi
*/ */
public class RuoYiServletInitializer extends SpringBootServletInitializer public class RuoYiServletInitializer extends SpringBootServletInitializer {
{
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
{
return application.sources(RuoYiApplication.class); return application.sources(RuoYiApplication.class);
} }
} }

@ -2,6 +2,7 @@ package com.ruoyi.jjh.declaration.component;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/19 9:50 * @since 2024/7/19 9:50
*/ */

@ -1,19 +1,17 @@
package com.ruoyi.jjh.declaration.controller; package com.ruoyi.jjh.declaration.controller;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo; import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo;
import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService; import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

@ -26,7 +26,13 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -60,9 +66,9 @@ public class BmsDeclarationRecordsController extends BaseController {
@Resource @Resource
private BmsDeclarationRecordsMapper bmsDeclarationRecordsMapper; private BmsDeclarationRecordsMapper bmsDeclarationRecordsMapper;
/** /**
* *
*
*/ */
@ApiOperation(value = "审核列表") @ApiOperation(value = "审核列表")
@PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')") @PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
@ -162,7 +168,6 @@ public class BmsDeclarationRecordsController extends BaseController {
} }
/** /**
* 线 * 线
*/ */

@ -1,25 +1,27 @@
package com.ruoyi.jjh.declaration.controller; package com.ruoyi.jjh.declaration.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.ent.entity.JMemorandum;
import com.ruoyi.jjh.ent.entity.JProject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;

@ -1,21 +1,19 @@
package com.ruoyi.jjh.declaration.controller; package com.ruoyi.jjh.declaration.controller;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

@ -18,6 +18,7 @@ import javax.validation.Valid;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/24 13:43 * @since 2024/7/24 13:43
*/ */
@ -42,6 +43,7 @@ public class BmsEnterpriseFillController extends BaseController {
//企业填报之后要新增一条审批记录 //企业填报之后要新增一条审批记录
//政务端审批之后也要新增一条 //政务端审批之后也要新增一条
//被驳回之后也要新增一条审批记录 //被驳回之后也要新增一条审批记录
/** /**
* *
*/ */

@ -1,19 +1,17 @@
package com.ruoyi.jjh.declaration.controller; package com.ruoyi.jjh.declaration.controller;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsProcessInfo; import com.ruoyi.jjh.declaration.entity.BmsProcessInfo;
import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService; import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

@ -15,8 +15,12 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.parameters.P; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;

@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto;
@ -15,11 +13,14 @@ import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
@ -63,6 +64,7 @@ public class BmsTemplateRecordController extends BaseController {
/** /**
* *
*
* @param bmsTemplateRecordUpdateDto * @param bmsTemplateRecordUpdateDto
* @return * @return
*/ */

@ -6,8 +6,6 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date; import java.util.Date;

@ -8,8 +8,6 @@ import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/** /**
* 线 bms_declaration_records * 线 bms_declaration_records
@ -105,8 +103,6 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
private String creditCode; private String creditCode;
/** /**
* *
*/ */

@ -1,19 +1,14 @@
package com.ruoyi.jjh.declaration.entity; package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/** /**
* bms_enterprise_basic_info * bms_enterprise_basic_info
@ -402,5 +397,4 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
private Long isDeleted; private Long isDeleted;
} }

@ -7,8 +7,6 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;

@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.Size;
import java.time.LocalDate; import java.time.LocalDate;
/** /**

@ -9,6 +9,7 @@ import java.util.List;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/24 13:43 * @since 2024/7/24 13:43
*/ */

@ -1,9 +1,6 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -20,8 +17,9 @@ public class BmsApprovalInfoUpdateDto implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
/** 申报记录id */ * id
*/
@Excel(name = "申报记录id") @Excel(name = "申报记录id")
private Long declarationRecordsId; private Long declarationRecordsId;
@ -30,11 +28,15 @@ public class BmsApprovalInfoUpdateDto implements Serializable {
@Excel(name = "审批状态(1=审批通过,2=审批驳回,3=初审退回修改)") @Excel(name = "审批状态(1=审批通过,2=审批驳回,3=初审退回修改)")
private Integer approvalStatus; private Integer approvalStatus;
/** 审批意见 */ /**
*
*/
@Excel(name = "审批意见") @Excel(name = "审批意见")
private String approvalOpinions; private String approvalOpinions;
/** 审批附件 */ /**
*
*/
@Excel(name = "审批附件") @Excel(name = "审批附件")
private String approvalAttachment; private String approvalAttachment;

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* 线 bms_declaration_records * 线 bms_declaration_records
@ -18,7 +17,9 @@ public class BmsDeclarationRecordsAddDto implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 项目名称 */ /**
*
*/
@ApiModelProperty(value = "项目名称") @ApiModelProperty(value = "项目名称")
@Excel(name = "项目名称") @Excel(name = "项目名称")
private String projectName; private String projectName;
@ -29,24 +30,34 @@ public class BmsDeclarationRecordsAddDto implements Serializable {
@ApiModelProperty(value = "提交事项") @ApiModelProperty(value = "提交事项")
private Long matter; private Long matter;
/** 企业id */ /**
* id
*/
@ApiModelProperty(value = "企业id") @ApiModelProperty(value = "企业id")
private Long enterpriseId; private Long enterpriseId;
/** 年份 */ /**
*
*/
@ApiModelProperty(value = "年份") @ApiModelProperty(value = "年份")
@Excel(name = "年份") @Excel(name = "年份")
private String year; private String year;
/** 模板id */ /**
* id
*/
@ApiModelProperty(value = "模板id") @ApiModelProperty(value = "模板id")
private Long templateId; private Long templateId;
/** 申报模版类型 */ /**
*
*/
@ApiModelProperty(value = "申报模版类型") @ApiModelProperty(value = "申报模版类型")
private Long declarationTemplateType; private Long declarationTemplateType;
/** 详情id对应详情id */ /**
* idid
*/
@ApiModelProperty(value = "详情id对应详情id") @ApiModelProperty(value = "详情id对应详情id")
private Long detailId; private Long detailId;

@ -31,7 +31,9 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
@Excel(name = "申报单位") @Excel(name = "申报单位")
private String enterpriseName; private String enterpriseName;
/** 级别 0:本级,1:省级 */ /**
* 0:,1:
*/
@ApiModelProperty(value = "级别 0:本级,1:省级") @ApiModelProperty(value = "级别 0:本级,1:省级")
@Excel(name = "级别", readConverterExp = "0=本级,1=省级") @Excel(name = "级别", readConverterExp = "0=本级,1=省级")
private Long level; private Long level;
@ -41,7 +43,9 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
// @Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型") // @Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型")
// private Long type; // private Long type;
/** 责任单位 0经发委:1规建委:2行审局:3市监局 */ /**
* 0:1:2:3
*/
@ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局") @ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局")
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局") @Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
private Long responsibilityUnit; private Long responsibilityUnit;

@ -1,7 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto; package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -37,7 +37,9 @@ public class BmsTemplateRecordQueryDto implements Serializable {
@Excel(name = "开放开始时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开放开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime; private Date startTime;
/** 开放结束时间 */ /**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime; private Date endTime;

@ -9,6 +9,7 @@ import javax.validation.constraints.NotNull;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/24 13:48 * @since 2024/7/24 13:48
*/ */

@ -1,6 +1,5 @@
package com.ruoyi.jjh.declaration.entity.request; package com.ruoyi.jjh.declaration.entity.request;
import com.alibaba.fastjson2.annotation.JSONField;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -10,6 +9,7 @@ import javax.validation.constraints.NotNull;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/24 13:48 * @since 2024/7/24 13:48
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/5/28 8:55 * @since 2024/5/28 8:55
*/ */

@ -3,7 +3,6 @@ package com.ruoyi.jjh.declaration.entity.vo;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -21,7 +20,9 @@ import java.io.Serializable;
public class BmsApprovalInfoQueryVo implements Serializable { public class BmsApprovalInfoQueryVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键id */ /**
* id
*/
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty("主键Id") @ApiModelProperty("主键Id")
private Long id; private Long id;
@ -38,22 +39,30 @@ public class BmsApprovalInfoQueryVo implements Serializable {
@Excel(name = "默认审批人") @Excel(name = "默认审批人")
private String approvalByName; private String approvalByName;
/** 审批状态(0=待审核.1=审批通过,2=审批驳回) */ /**
* (0=.1=,2=)
*/
@ApiModelProperty("审批状态(0=待审核.1=审批通过,2=审批驳回)") @ApiModelProperty("审批状态(0=待审核.1=审批通过,2=审批驳回)")
@Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回)") @Excel(name = "审批状态(0=待审核.1=审批通过,2=审批驳回)")
private Integer approvalStatus; private Integer approvalStatus;
/** 审批意见 */ /**
*
*/
@ApiModelProperty("审批意见") @ApiModelProperty("审批意见")
@Excel(name = "审批意见") @Excel(name = "审批意见")
private String approvalOpinions; private String approvalOpinions;
/** 审批附件 */ /**
*
*/
@ApiModelProperty("审批附件") @ApiModelProperty("审批附件")
@Excel(name = "审批附件") @Excel(name = "审批附件")
private String approvalAttachment; private String approvalAttachment;
/** 是否可审核(0=是,1=否,2=结束) */ /**
* (0=,1=,2=)
*/
@ApiModelProperty("是否可审核(0=是,1=否,2=结束)") @ApiModelProperty("是否可审核(0=是,1=否,2=结束)")
@Excel(name = "是否可审核(0=是,1=否,2=结束)") @Excel(name = "是否可审核(0=是,1=否,2=结束)")
private Integer isReview; private Integer isReview;
@ -62,7 +71,9 @@ public class BmsApprovalInfoQueryVo implements Serializable {
@Excel(name = "是否为拒绝前数据01是") @Excel(name = "是否为拒绝前数据01是")
private Integer isBeforeData; private Integer isBeforeData;
/** 排序 */ /**
*
*/
@ApiModelProperty("排序") @ApiModelProperty("排序")
@Excel(name = "排序") @Excel(name = "排序")
private Integer sort; private Integer sort;

@ -1,6 +1,5 @@
package com.ruoyi.jjh.declaration.entity.vo; package com.ruoyi.jjh.declaration.entity.vo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -101,7 +100,6 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
private Long status; private Long status;
/** /**
* json * json
*/ */

@ -1,6 +1,7 @@
package com.ruoyi.jjh.declaration.entity.vo; package com.ruoyi.jjh.declaration.entity.vo;
import com.ruoyi.jjh.declaration.entity.*; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto; import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto; import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo; import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -40,7 +40,6 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/** /**
* *
*
*/ */
public List<ApprovalDeclarationRecordsQueryVo> approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto); public List<ApprovalDeclarationRecordsQueryVo> approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto);
@ -91,6 +90,7 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/** /**
* idid * idid
*
* @return * @return
*/ */
List<BmsDeclarationRecords> selectET(@Param("templateId") Long templateId, @Param("list") List<String> list); List<BmsDeclarationRecords> selectET(@Param("templateId") Long templateId, @Param("list") List<String> list);
@ -98,12 +98,14 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/** /**
* *
*
* @return * @return
*/ */
List<JSmartDeclaration> allNoLimited(); List<JSmartDeclaration> allNoLimited();
/** /**
* 线id * 线id
*
* @return * @return
*/ */
JProject getAddProject(Long id); JProject getAddProject(Long id);

@ -3,7 +3,6 @@ package com.ruoyi.jjh.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo;
@ -34,7 +33,6 @@ public interface BmsTemplateRecordMapper extends BaseMapper<BmsTemplateRecord> {
public List<BmsTemplateRecordQueryVo> selectTemplateRecordVo(@Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto); public List<BmsTemplateRecordQueryVo> selectTemplateRecordVo(@Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
/** /**
* 线 * 线
* *
@ -52,7 +50,6 @@ public interface BmsTemplateRecordMapper extends BaseMapper<BmsTemplateRecord> {
public int deleteBmsTemplateRecordByIds(Long[] ids); public int deleteBmsTemplateRecordByIds(Long[] ids);
/** /**
* 线 * 线
* *

@ -15,6 +15,7 @@ import java.util.List;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/17 10:30 * @since 2024/7/17 10:30
*/ */
@ -33,6 +34,7 @@ public class SmsEnterChange {
@Value("${isTiming}") @Value("${isTiming}")
private Boolean isTiming; private Boolean isTiming;
// 每三小时执行一次 // 每三小时执行一次
@Scheduled(cron = "0 0 */12 * * *") @Scheduled(cron = "0 0 */12 * * *")
private void runTask() { private void runTask() {

@ -18,7 +18,11 @@ import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration; import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
import com.ruoyi.jjh.ent.entity.JSmartReminders; import com.ruoyi.jjh.ent.entity.JSmartReminders;
import com.ruoyi.jjh.ent.service.*; import com.ruoyi.jjh.ent.service.JContactsService;
import com.ruoyi.jjh.ent.service.JProjectService;
import com.ruoyi.jjh.ent.service.JSmartDeclarationService;
import com.ruoyi.jjh.ent.service.JSmartRemindersService;
import com.ruoyi.jjh.ent.service.SmsAlertsService;
import com.ruoyi.quartz.service.ISysJobService; import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -113,6 +117,11 @@ public class TimeChange {
@Resource @Resource
private TimingRemindService timingRemindImpl; private TimingRemindService timingRemindImpl;
/**
*
*/
@Resource
private JProjectService jProjectService;
/** /**
* *
@ -126,12 +135,6 @@ public class TimeChange {
bmsTemplateInfoService.updateBatchById(list); bmsTemplateInfoService.updateBatchById(list);
} }
/**
*
*/
@Resource
private JProjectService jProjectService;
public void getTime(BmsTemplateRecord items) { public void getTime(BmsTemplateRecord items) {
LocalDate currentDate = LocalDate.now(); LocalDate currentDate = LocalDate.now();
LocalDate startDate = LocalDate.of(items.getStartTime().getYear(), items.getStartTime().getMonth(), items.getStartTime().getDayOfMonth()); LocalDate startDate = LocalDate.of(items.getStartTime().getYear(), items.getStartTime().getMonth(), items.getStartTime().getDayOfMonth());
@ -239,7 +242,6 @@ public class TimeChange {
} }
/** /**
* *
*/ */

@ -2,12 +2,14 @@ package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.*; import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration; import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto;
import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo; import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
import java.util.List; import java.util.List;
@ -37,10 +39,8 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
public List<BmsDeclarationRecordsQueryVo> selectBmsDeclarationRecordsZwList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto); public List<BmsDeclarationRecordsQueryVo> selectBmsDeclarationRecordsZwList(BmsDeclarationRecordsDto bmsDeclarationRecordsDto);
/** /**
* *
*
*/ */
public List<ApprovalDeclarationRecordsQueryVo> approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto); public List<ApprovalDeclarationRecordsQueryVo> approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto);
@ -85,7 +85,6 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
public int deleteBmsDeclarationRecordsById(Long id); public int deleteBmsDeclarationRecordsById(Long id);
/** /**
* id使 * id使
*/ */
@ -93,12 +92,14 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
/** /**
* idid * idid
*
* @return * @return
*/ */
List<BmsDeclarationRecords> selectET(Long templateId, List<String> list); List<BmsDeclarationRecords> selectET(Long templateId, List<String> list);
/** /**
* *
*
* @return * @return
*/ */
List<JSmartDeclaration> allNoLimited(); List<JSmartDeclaration> allNoLimited();
@ -106,6 +107,7 @@ public interface IBmsDeclarationRecordsService extends IService<BmsDeclarationRe
/** /**
* 线id * 线id
*
* @return * @return
*/ */
JProject getAddProject(Long id); JProject getAddProject(Long id);

@ -34,6 +34,7 @@ public interface IBmsEnterpriseBasicInfoService extends IService<BmsEnterpriseBa
List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest); List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest);
/** /**
* id * id
*/ */

@ -2,12 +2,12 @@ package com.ruoyi.jjh.declaration.service;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFileResquest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseFileResquest;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFillResquest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseFillResquest;
import org.springframework.web.multipart.MultipartFile;
import java.util.Map; import java.util.Map;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/24 13:52 * @since 2024/7/24 13:52
*/ */

@ -3,7 +3,6 @@ package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto;
@ -38,6 +37,7 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
/** /**
* *
*
* @param bmsTemplateRecordAddDto * @param bmsTemplateRecordAddDto
* @return * @return
*/ */
@ -65,9 +65,6 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto); public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto);
// /** // /**
// * 修改在线模板 // * 修改在线模板
// * // *

@ -8,7 +8,11 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.declaration.component.TimingRemindService; import com.ruoyi.jjh.declaration.component.TimingRemindService;
import com.ruoyi.jjh.declaration.entity.*; import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsProcessInfo;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto; import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsApprovalInfoUpdateDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto; import com.ruoyi.jjh.declaration.entity.dto.BmsDeclarationRecordsDto;
@ -16,7 +20,12 @@ import com.ruoyi.jjh.declaration.entity.vo.ApprovalDeclarationRecordsQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo; import com.ruoyi.jjh.declaration.entity.vo.BmsDeclarationRecordsQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo; import com.ruoyi.jjh.declaration.entity.vo.DeclarationRecordsVo;
import com.ruoyi.jjh.declaration.mapper.BmsDeclarationRecordsMapper; import com.ruoyi.jjh.declaration.mapper.BmsDeclarationRecordsMapper;
import com.ruoyi.jjh.declaration.service.*; import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration; import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
@ -44,12 +53,10 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
private ICommonService iCommonService; private ICommonService iCommonService;
@Resource @Resource
private IBmsTemplateRecordService iBmsTemplateRecordService; private IBmsTemplateRecordService iBmsTemplateRecordService;
@Autowired @Autowired
private IBmsApprovalInfoService iBmsApprovalInfoService; private IBmsApprovalInfoService iBmsApprovalInfoService;

@ -2,7 +2,6 @@ package com.ruoyi.jjh.declaration.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper; import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper;
@ -48,6 +47,7 @@ public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterprise
public List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) { public List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) {
return baseMapper.workSearch(enterpriseInfoWorkRequest); return baseMapper.workSearch(enterpriseInfoWorkRequest);
} }
/** /**
* id * id
*/ */

@ -11,14 +11,17 @@ import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFileResquest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseFileResquest;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFillResquest; import com.ruoyi.jjh.declaration.entity.request.EnterpriseFillResquest;
import com.ruoyi.jjh.declaration.service.*; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseFillService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.service.JProjectService; import com.ruoyi.jjh.ent.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.HashMap; import java.util.HashMap;

@ -95,7 +95,6 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl<BmsTemplateInfoMappe
} }
/** /**
* *
* *

@ -1,15 +1,15 @@
package com.ruoyi.jjh.declaration.service.impl; package com.ruoyi.jjh.declaration.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.jjh.declaration.component.TimingRemindImpl;
import com.ruoyi.jjh.declaration.component.TimingRemindService; import com.ruoyi.jjh.declaration.component.TimingRemindService;
import com.ruoyi.jjh.declaration.entity.*; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordAddDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto;
@ -17,7 +17,11 @@ import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo; import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo;
import com.ruoyi.jjh.declaration.mapper.BmsTemplateRecordMapper; import com.ruoyi.jjh.declaration.mapper.BmsTemplateRecordMapper;
import com.ruoyi.jjh.declaration.regular.TimeChange; import com.ruoyi.jjh.declaration.regular.TimeChange;
import com.ruoyi.jjh.declaration.service.*; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

@ -7,7 +7,13 @@ import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.service.*; import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService;
import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import com.ruoyi.jjh.declaration.service.ICommonService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -139,6 +145,7 @@ public class CommonServiceImpl implements ICommonService {
bmsApprovalInfo.setIsReview(0); bmsApprovalInfo.setIsReview(0);
iBmsApprovalInfoService.save(bmsApprovalInfo); iBmsApprovalInfoService.save(bmsApprovalInfo);
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updateAuditRecord(Long declarationRecordId, Integer approvalType) { public void updateAuditRecord(Long declarationRecordId, Integer approvalType) {
@ -146,7 +153,6 @@ public class CommonServiceImpl implements ICommonService {
} }
// @Override // @Override
// public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto) { // public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto) {
// int num = 0; // int num = 0;

@ -4,6 +4,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/6/20 11:20 * @since 2024/6/20 11:20
*/ */

@ -8,6 +8,7 @@ import java.util.List;
/** /**
* *
*
* @author du * @author du
* @since 2024/6/4 11:05 * @since 2024/6/4 11:05
*/ */

@ -5,6 +5,7 @@ import lombok.Data;
/** /**
* organizations * organizations
*
* @author du * @author du
* @since 2024/6/4 14:42 * @since 2024/6/4 14:42
*/ */

@ -5,6 +5,7 @@ import lombok.Data;
/** /**
* organizations * organizations
*
* @author du * @author du
* @since 2024/6/4 14:40 * @since 2024/6/4 14:40
*/ */

@ -5,6 +5,7 @@ import lombok.Data;
/** /**
* settings * settings
*
* @author du * @author du
* @since 2024/6/4 11:07 * @since 2024/6/4 11:07
*/ */

@ -4,6 +4,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/6/20 13:38 * @since 2024/6/20 13:38
*/ */

@ -66,7 +66,6 @@ public class UserResponse implements Serializable {
private String token; private String token;
@ApiModelProperty(value = "企业机构代码") @ApiModelProperty(value = "企业机构代码")
private UserMainResponse main; private UserMainResponse main;
} }

@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets;
/** /**
* *
*
* @author du * @author du
* @since 2024/6/20 10:15 * @since 2024/6/20 10:15
*/ */
@ -31,6 +32,7 @@ public class HMAC256Config {
private final static String PATTERN = "AES/CBC/pkcs5padding"; private final static String PATTERN = "AES/CBC/pkcs5padding";
//AES解密 //AES解密
/** /**
* @param content * @param content
* @param key aes * @param key aes

@ -1,6 +1,5 @@
package com.ruoyi.jjh.ent.controller; package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
@ -10,11 +9,13 @@ import com.ruoyi.jjh.ent.service.JContactsService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays;
/** /**
* ()j_contacts * ()j_contacts

@ -33,8 +33,10 @@ public class JDataScreenController extends BaseController {
@Resource @Resource
private SmsAlertsService sms; private SmsAlertsService sms;
/** /**
* *
*
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ -46,6 +48,7 @@ public class JDataScreenController extends BaseController {
/** /**
* *
*
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ -57,6 +60,7 @@ public class JDataScreenController extends BaseController {
/** /**
* *
*
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ -73,6 +77,7 @@ public class JDataScreenController extends BaseController {
/** /**
* *
*
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ -84,6 +89,7 @@ public class JDataScreenController extends BaseController {
/** /**
* *
*
* @return * @return
*/ */
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")

@ -8,12 +8,17 @@ import com.ruoyi.jjh.ent.service.JDevelopmentReportService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* j_template_metrics * j_template_metrics
*
* @author du * @author du
* @since 2024/7/31 15:09 * @since 2024/7/31 15:09
*/ */

@ -13,15 +13,20 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects;
/** /**
* j_enterprise_contact * j_enterprise_contact
*
* @author du * @author du
* @since 2024/5/13 9:56 * @since 2024/5/13 9:56
*/ */
@ -38,6 +43,7 @@ public class JEnterpriseContactController extends BaseController {
@Resource @Resource
private SmsAlertsService smsAlertsService; private SmsAlertsService smsAlertsService;
/** /**
* *
* *

@ -2,7 +2,6 @@ package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue; import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue;
import com.ruoyi.jjh.ent.entity.request.JHeadQuartersRevenueRequest; import com.ruoyi.jjh.ent.entity.request.JHeadQuartersRevenueRequest;
import com.ruoyi.jjh.ent.entity.response.JHqCountResponse; import com.ruoyi.jjh.ent.entity.response.JHqCountResponse;
@ -20,6 +19,7 @@ import static com.ruoyi.common.core.domain.AjaxResult.success;
/** /**
* j_headquarters_revenue * j_headquarters_revenue
*
* @author du * @author du
* @since 2024/7/29 13:09 * @since 2024/7/29 13:09
*/ */
@ -34,6 +34,7 @@ public class JHeadQuartersRevenueController {
/** /**
* *
*
* @param page * @param page
* @param js * @param js
* @return * @return

@ -8,27 +8,22 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.regular.TimeChange; import com.ruoyi.jjh.declaration.regular.TimeChange;
import com.ruoyi.jjh.ent.entity.JMemorandum; import com.ruoyi.jjh.ent.entity.JMemorandum;
import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest; import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest;
import com.ruoyi.jjh.ent.service.JMemorandumService; import com.ruoyi.jjh.ent.service.JMemorandumService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -78,8 +73,6 @@ public class JMemorandumController extends BaseController {
} }
/** /**
* IDIDID * IDIDID
* *

@ -9,13 +9,19 @@ import com.ruoyi.jjh.ent.service.JPolicyFileService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.Serializable; import java.io.Serializable;
/** /**
* j_policy_file * j_policy_file
*
* @author du * @author du
* @since 2024/5/6 11:16 * @since 2024/5/6 11:16
*/ */

@ -18,7 +18,14 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;

@ -3,29 +3,18 @@ package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.JServicesList; import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest; import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse; import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import com.ruoyi.jjh.ent.service.JContactsService;
import com.ruoyi.jjh.ent.service.JServicesListService; import com.ruoyi.jjh.ent.service.JServicesListService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.boot.SpringBootVersion;
import org.springframework.core.SpringVersion;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/** /**
* j_services_list * j_services_list
@ -43,6 +32,7 @@ public class JServicesListController extends BaseController {
/** /**
* *
*
* @param page * @param page
* @param js * @param js
* @return * @return

@ -22,7 +22,13 @@ import io.swagger.annotations.ApiOperation;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;

@ -1,7 +1,5 @@
package com.ruoyi.jjh.ent.entity; package com.ruoyi.jjh.ent.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -12,6 +10,7 @@ import java.time.LocalDateTime;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/1 19:29 * @since 2024/7/1 19:29
*/ */

@ -1,7 +1,10 @@
package com.ruoyi.jjh.ent.entity; package com.ruoyi.jjh.ent.entity;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -10,6 +13,7 @@ import lombok.Data;
/** /**
* ()j_contacts * ()j_contacts
*
* @author du * @author du
* @since 2024/5/13 9:49 * @since 2024/5/13 9:49
*/ */
@ -148,8 +152,6 @@ public class JContacts extends BaseInfoEntity {
private String dwTimestamp; private String dwTimestamp;
/** /**
* *
*/ */

@ -10,6 +10,7 @@ import lombok.Data;
/** /**
* j_template_metrics * j_template_metrics
*
* @author du * @author du
* @since 2024/7/31 15:13 * @since 2024/7/31 15:13
*/ */

@ -1,7 +1,11 @@
package com.ruoyi.jjh.ent.entity; package com.ruoyi.jjh.ent.entity;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -10,6 +14,7 @@ import lombok.Data;
/** /**
* j_enterprise_contact * j_enterprise_contact
*
* @author du * @author du
* @since 2024/5/13 9:49 * @since 2024/5/13 9:49
*/ */

@ -7,6 +7,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/29 13:01 * @since 2024/7/29 13:01
*/ */

@ -1,6 +1,10 @@
package com.ruoyi.jjh.ent.entity; package com.ruoyi.jjh.ent.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

@ -1,7 +1,11 @@
package com.ruoyi.jjh.ent.entity; package com.ruoyi.jjh.ent.entity;
import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
@ -14,6 +18,7 @@ import java.util.Date;
/** /**
* j_policy_file * j_policy_file
*
* @author du * @author du
* @since 2024/5/6 14:15 * @since 2024/5/6 14:15
*/ */

@ -1,6 +1,10 @@
package com.ruoyi.jjh.ent.entity; package com.ruoyi.jjh.ent.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -12,6 +11,7 @@ import lombok.Data;
/** /**
* j_services_list * j_services_list
*
* @author du * @author du
* @since 2024/7/26 15:29 * @since 2024/7/26 15:29
*/ */

@ -12,6 +12,7 @@ import java.time.LocalDateTime;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/1 19:29 * @since 2024/7/1 19:29
*/ */

@ -1,6 +1,10 @@
package com.ruoyi.jjh.ent.entity; package com.ruoyi.jjh.ent.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.jjh.common.entity.BaseInfoEntity; import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -12,6 +16,7 @@ import java.time.LocalDateTime;
/** /**
* j_smart_reminders * j_smart_reminders
*
* @author du * @author du
* @since 2024/7/1 13:33 * @since 2024/7/1 13:33
*/ */

@ -3,10 +3,9 @@ package com.ruoyi.jjh.ent.entity.request;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/18 17:14 * @since 2024/7/18 17:14
*/ */

@ -1,6 +1,5 @@
package com.ruoyi.jjh.ent.entity.request; package com.ruoyi.jjh.ent.entity.request;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -8,6 +7,7 @@ import javax.validation.constraints.NotNull;
/** /**
* - * -
*
* @author du * @author du
* @since 2024/6/28 11:18 * @since 2024/6/28 11:18
*/ */

@ -1,12 +1,12 @@
package com.ruoyi.jjh.ent.entity.request; package com.ruoyi.jjh.ent.entity.request;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/5/13 10:06 * @since 2024/5/13 10:06
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/29 13:14 * @since 2024/7/29 13:14
*/ */

@ -7,6 +7,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/5/6 14:34 * @since 2024/5/6 14:34
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/26 15:45 * @since 2024/7/26 15:45
*/ */

@ -1,7 +1,5 @@
package com.ruoyi.jjh.ent.entity.request; package com.ruoyi.jjh.ent.entity.request;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -14,6 +12,7 @@ import java.time.LocalDateTime;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/1 15:56 * @since 2024/7/1 15:56
*/ */

@ -1,17 +1,15 @@
package com.ruoyi.jjh.ent.entity.request; package com.ruoyi.jjh.ent.entity.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/1 15:56 * @since 2024/7/1 15:56
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/15 15:04 * @since 2024/7/15 15:04
*/ */

@ -17,55 +17,48 @@ import java.util.Objects;
@Data @Data
public class JAllIndustryResponse { public class JAllIndustryResponse {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
JAllIndustryResponse that = (JAllIndustryResponse) o;
return Objects.equals(nameType, that.nameType) && Objects.equals(children, that.children) && Objects.equals(yearRevenue, that.yearRevenue) && Objects.equals(addValue, that.addValue) && Objects.equals(growth, that.growth) && Objects.equals(gdpProportion, that.gdpProportion);
}
@Override
public int hashCode() {
return Objects.hash(nameType, children, yearRevenue, addValue, growth, gdpProportion);
}
/** /**
* *
*/ */
@ApiModelProperty("行业类别名称") @ApiModelProperty("行业类别名称")
private String nameType; private String nameType;
/** /**
* *
*/ */
@ApiModelProperty("子类") @ApiModelProperty("子类")
private List<JAllIndustryResponse> children; private List<JAllIndustryResponse> children;
/** /**
* 亿 * 亿
*/ */
@ApiModelProperty("全年营收(亿元)") @ApiModelProperty("全年营收(亿元)")
private String yearRevenue; private String yearRevenue;
/** /**
* 亿 * 亿
*/ */
@ApiModelProperty("增加值(亿元)") @ApiModelProperty("增加值(亿元)")
private String addValue; private String addValue;
/** /**
* *
*/ */
@ApiModelProperty("增加值增速(按不变价)%") @ApiModelProperty("增加值增速(按不变价)%")
private String growth; private String growth;
/** /**
* GDP * GDP
*/ */
@ApiModelProperty("增加值占GDP比重 %") @ApiModelProperty("增加值占GDP比重 %")
private String gdpProportion; private String gdpProportion;
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
JAllIndustryResponse that = (JAllIndustryResponse) o;
return Objects.equals(nameType, that.nameType) && Objects.equals(children, that.children) && Objects.equals(yearRevenue, that.yearRevenue) && Objects.equals(addValue, that.addValue) && Objects.equals(growth, that.growth) && Objects.equals(gdpProportion, that.gdpProportion);
}
@Override
public int hashCode() {
return Objects.hash(nameType, children, yearRevenue, addValue, growth, gdpProportion);
}
} }

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/25 18:09 * @since 2024/7/25 18:09
*/ */
@ -27,7 +28,6 @@ public class JBigMiddleIndustryResponse {
private String nameType; private String nameType;
/** /**
* 亿 * 亿
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/29 15:02 * @since 2024/7/29 15:02
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/25 14:16 * @since 2024/7/25 14:16
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/25 10:33 * @since 2024/7/25 10:33
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/29 9:17 * @since 2024/7/29 9:17
*/ */

@ -6,6 +6,7 @@ import lombok.Data;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/31 15:28 * @since 2024/7/31 15:28
*/ */

@ -10,6 +10,7 @@ import java.time.LocalDate;
/** /**
* *
*
* @author du * @author du
* @since 2024/7/16 9:15 * @since 2024/7/16 9:15
*/ */

@ -1,17 +1,15 @@
package com.ruoyi.jjh.ent.mapper; package com.ruoyi.jjh.ent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.ent.entity.JContacts; import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
import com.ruoyi.jjh.ent.entity.request.JContactsRequest; import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
/** /**
* ()j_contacts * ()j_contacts
*
* @author du * @author du
* @since 2024/5/6 13:57 * @since 2024/5/6 13:57
*/ */

@ -1,6 +1,11 @@
package com.ruoyi.jjh.ent.mapper; package com.ruoyi.jjh.ent.mapper;
import com.ruoyi.jjh.ent.entity.response.*; 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 java.util.List; import java.util.List;
@ -29,18 +34,21 @@ public interface JDataScreenMapper {
/** /**
* *
*
* @return * @return
*/ */
List<JServicesDevelopResponse> servicesDevelop(Integer type); List<JServicesDevelopResponse> servicesDevelop(Integer type);
/** /**
* *
*
* @return * @return
*/ */
List<JIndustryDepthResponse> getIndustryDepth(); List<JIndustryDepthResponse> getIndustryDepth();
/** /**
* *
*
* @return * @return
*/ */
List<JBigMiddleIndustryResponse> getMiddleIndustry(); List<JBigMiddleIndustryResponse> getMiddleIndustry();
@ -48,6 +56,7 @@ public interface JDataScreenMapper {
/** /**
* *
*
* @return * @return
*/ */
List<JAllIndustryResponse> getBigIndustry(); List<JAllIndustryResponse> getBigIndustry();

@ -8,6 +8,7 @@ import java.util.List;
/** /**
* j_template_metrics访 * j_template_metrics访
*
* @author du * @author du
* @since 2024/7/26 15:36 * @since 2024/7/26 15:36
*/ */

@ -10,6 +10,7 @@ import java.util.List;
/** /**
* j_enterprise_contact * j_enterprise_contact
*
* @author du * @author du
* @since 2024/5/6 13:57 * @since 2024/5/6 13:57
*/ */

@ -3,17 +3,13 @@ package com.ruoyi.jjh.ent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue; import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue;
import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JHeadQuartersRevenueRequest; import com.ruoyi.jjh.ent.entity.request.JHeadQuartersRevenueRequest;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JHqCountResponse; import com.ruoyi.jjh.ent.entity.response.JHqCountResponse;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* j_headquarters_revenue访 * j_headquarters_revenue访
*
* @author du * @author du
* @since 2024/7/26 15:36 * @since 2024/7/26 15:36
*/ */
@ -22,6 +18,7 @@ public interface JHeadQuartersRevenueMapper extends BaseMapper<JHeadQuartersReve
/** /**
* *
*
* @param page * @param page
* @param js * @param js
* @return * @return

@ -26,6 +26,7 @@ public interface JMemorandumMapper extends BaseMapper<JMemorandum> {
Page<JMemorandum> page(Page<JMemorandum> page, @Param("req") JMemorandumRequest jMemorandumRequest); Page<JMemorandum> page(Page<JMemorandum> page, @Param("req") JMemorandumRequest jMemorandumRequest);
List<JMemorandum> page(@Param("req") JMemorandumRequest jMemorandumRequest); List<JMemorandum> page(@Param("req") JMemorandumRequest jMemorandumRequest);
/** /**
* IDID * IDID
* *

@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
/** /**
* j_policy_file * j_policy_file
*
* @author du * @author du
* @since 2024/5/6 13:57 * @since 2024/5/6 13:57
*/ */

@ -37,7 +37,6 @@ public interface JProjectMapper extends BaseMapper<JProject> {
List<BmsApprovalInfoQueryVo> getApprovalInfoList(@Param("id") Serializable id); List<BmsApprovalInfoQueryVo> getApprovalInfoList(@Param("id") Serializable id);
List<JProject> selectAll(@Param("name") String name, @Param("status") Integer status); List<JProject> selectAll(@Param("name") String name, @Param("status") Integer status);
} }

@ -2,9 +2,7 @@ package com.ruoyi.jjh.ent.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JServicesList; import com.ruoyi.jjh.ent.entity.JServicesList;
import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest; import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse; import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -13,6 +11,7 @@ import java.util.List;
/** /**
* j_services_list访 * j_services_list访
*
* @author du * @author du
* @since 2024/7/26 15:36 * @since 2024/7/26 15:36
*/ */
@ -20,6 +19,7 @@ public interface JServicesListMapper extends BaseMapper<JServicesList> {
/** /**
* *
*
* @param page * @param page
* @param js * @param js
* @return * @return

@ -7,7 +7,6 @@ import com.ruoyi.jjh.ent.entity.request.JAddJobSmart;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* j_smart_reminders访 * j_smart_reminders访
@ -27,7 +26,6 @@ public interface JSmartRemindersMapper extends BaseMapper<JSmartReminders> {
Page<JSmartReminders> page(Page<JSmartReminders> page, @Param("req") JSmartReminders jSmartReminders); Page<JSmartReminders> page(Page<JSmartReminders> page, @Param("req") JSmartReminders jSmartReminders);
/** /**
* *
* *

@ -1,6 +1,5 @@
package com.ruoyi.jjh.ent.service; package com.ruoyi.jjh.ent.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.jjh.ent.entity.JContacts; import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.request.JContactsRequest; import com.ruoyi.jjh.ent.entity.request.JContactsRequest;
@ -9,6 +8,7 @@ import java.util.List;
/** /**
* ()j_contacts * ()j_contacts
*
* @author du * @author du
* @since 2024/5/13 9:58 * @since 2024/5/13 9:58
*/ */

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save