添加工作流

wushunjie
吴顺杰 7 months ago
parent bb3c42dc7d
commit abcf8619ee

@ -18,23 +18,29 @@
* 权限认证使用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),保持同步更新。
* 不分离版本,请移步[RuoYi](https://gitee.com/y_project/RuoYi),微服务版本,请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
*
提供了技术栈([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),保持同步更新。
* 不分离版本,请移步[RuoYi](https://gitee.com/y_project/RuoYi)
,微服务版本,请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
* 阿里云折扣场:[点我进入](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)
  
## 内置功能
1. 用户管理:用户是系统操作者,该功能主要完成系统用户配置。
2. 部门管理:配置系统组织机构(公司、部门、小组),树结构展现支持数据权限。
3. 岗位管理:配置系统用户所属担任职务。
4. 菜单管理:配置系统菜单,操作权限,按钮权限标识等。
5. 角色管理:角色菜单权限分配、设置角色按机构进行数据范围权限划分。
6. 字典管理:对系统中经常使用的一些较为固定的数据进行维护。
7. 参数管理:对系统动态配置常用参数。
8. 通知公告:系统通知公告信息发布维护。
9. 操作日志:系统正常操作日志记录和查询;系统异常信息日志记录和查询。
1. 用户管理:用户是系统操作者,该功能主要完成系统用户配置。
2. 部门管理:配置系统组织机构(公司、部门、小组),树结构展现支持数据权限。
3. 岗位管理:配置系统用户所属担任职务。
4. 菜单管理:配置系统菜单,操作权限,按钮权限标识等。
5. 角色管理:角色菜单权限分配、设置角色按机构进行数据范围权限划分。
6. 字典管理:对系统中经常使用的一些较为固定的数据进行维护。
7. 参数管理:对系统动态配置常用参数。
8. 通知公告:系统通知公告信息发布维护。
9. 操作日志:系统正常操作日志记录和查询;系统异常信息日志记录和查询。
10. 登录日志:系统登录日志记录查询包含登录异常。
11. 在线用户:当前系统中活跃用户状态监控。
12. 定时任务:在线(添加、修改、删除)任务调度包含执行结果日志。
@ -47,7 +53,7 @@
## 在线体验
- admin/admin123
- admin/admin123
- 陆陆续续收到一些打赏,为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
演示地址http://vue.ruoyi.vip
@ -90,7 +96,7 @@
</tr>
</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,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project 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">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<version>3.8.7</version>
@ -11,7 +11,7 @@
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>金鸡湖服务管理系统</description>
<properties>
<ruoyi.version>3.8.7</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -28,11 +28,51 @@
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.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>
<!-- 依赖声明 -->
<dependencyManagement>
<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的依赖配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
@ -148,6 +188,13 @@
<version>${ruoyi.version}</version>
</dependency>
<!-- 工作流模块 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-flowable</artifactId>
<version>${ruoyi.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project 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">
<parent>
<artifactId>ruoyi</artifactId>
@ -16,11 +16,7 @@
</description>
<dependencies>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.23</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
@ -32,7 +28,7 @@
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
<!-- Mysql驱动包 -->
<!-- Mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@ -50,6 +46,12 @@
<artifactId>ruoyi-quartz</artifactId>
</dependency>
<!-- flowable模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-flowable</artifactId>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.ruoyi</groupId>
@ -79,15 +81,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
</configuration>
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>

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

@ -22,14 +22,14 @@ public class BaseInfoEntity implements Serializable {
/**
*
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
*
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
@ -37,14 +37,14 @@ public class BaseInfoEntity implements Serializable {
/**
*
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableField(fill = FieldFill.UPDATE)
private String updateBy;
/**
*
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
@ -52,7 +52,7 @@ public class BaseInfoEntity implements Serializable {
/**
*
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
private String remark;
}

@ -26,7 +26,7 @@ import java.util.List;
* @since 2024/7/18 9:55
*/
@Component("TimingRemind")
public class TimingRemindImpl implements TimingRemindService{
public class TimingRemindImpl implements TimingRemindService {
private static final Logger log = LoggerFactory.getLogger(TimingRemindImpl.class);
/**
@ -78,7 +78,7 @@ public class TimingRemindImpl implements TimingRemindService{
sd.setSmartRemindersId(id);
sd.setTyshxydm(x.getTyshxydm());
listAdd.add(sd);
getContact( x.getTyshxydm(), "您有1个全局自定义通知,请前往系统首页查看");
getContact(x.getTyshxydm(), "您有1个全局自定义通知,请前往系统首页查看");
});
jSmartDeclarationService.saveBatch(listAdd);
}

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

@ -1,19 +1,17 @@
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.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.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo;
import com.ruoyi.jjh.declaration.service.IBmsApprovalInfoService;
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.PathVariable;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -23,7 +21,7 @@ import java.util.List;
/**
* Controller
*
*
* @author farben
* @date 2023-09-09
*/
@ -90,7 +88,7 @@ public class BmsApprovalInfoController extends BaseController {
*/
// @RequiresPermissions("system:approvalInfo:remove")
@Log(title = "审批记录信息", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@PostMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bmsApprovalInfoService.deleteBmsApprovalInfoByIds(ids));
}

@ -26,7 +26,13 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
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.servlet.http.HttpServletResponse;
@ -60,9 +66,9 @@ public class BmsDeclarationRecordsController extends BaseController {
@Resource
private BmsDeclarationRecordsMapper bmsDeclarationRecordsMapper;
/**
*
*
*/
@ApiOperation(value = "审核列表")
@PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')")
@ -95,10 +101,10 @@ public class BmsDeclarationRecordsController extends BaseController {
try {
admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
b = SecurityUtils.hasRole("ent");
str =SecurityUtils.getUsername();
str = SecurityUtils.getUsername();
} catch (Exception ignored) {
}
if(!admin && b){
if (!admin && b) {
bmsDeclarationRecordsDto.setCreditCode(str);
}
startPage();
@ -118,15 +124,15 @@ public class BmsDeclarationRecordsController extends BaseController {
String fatherFile = fileAddress + "/" + "项目压缩文件";
FileUtil.mkdir(fatherFile);
for (BmsDeclarationRecordsQueryVo item : rd) {
String itemsFileName = fatherFile + "/" +item.getProjectName()+item.getEnterpriseName();
String itemsFileName = fatherFile + "/" + item.getProjectName() + item.getEnterpriseName();
FileUtil.mkdir(itemsFileName);
List<String> splitList = bmsDeclarationRecordsService.getAllFile(item.getTemplateJson());
for (String s : splitList) {
// 下载文件
try {
HttpUtil.downloadFile("http://localhost:"+ port + s, itemsFileName);
HttpUtil.downloadFile("http://localhost:" + port + s, itemsFileName);
} catch (Exception e) {
throw new RuntimeException(itemsFileName+"某文件下载失败");
throw new RuntimeException(itemsFileName + "某文件下载失败");
}
}
}
@ -142,7 +148,7 @@ public class BmsDeclarationRecordsController extends BaseController {
// 设置响应头
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
headers.setContentDispositionFormData("attachment", URLEncoder.encode("项目压缩文件.zip","UTF-8"));
headers.setContentDispositionFormData("attachment", URLEncoder.encode("项目压缩文件.zip", "UTF-8"));
// 删除压缩之前的文件夹
FileUtil.del(zipFilePath);
// 删除压缩包
@ -162,7 +168,6 @@ public class BmsDeclarationRecordsController extends BaseController {
}
/**
* 线
*/

@ -1,25 +1,27 @@
package com.ruoyi.jjh.declaration.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
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.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.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.request.EnterpriseInfoWorkRequest;
import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper;
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.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletResponse;
@ -27,7 +29,7 @@ import java.util.List;
/**
* Controller
*
*
* @author farben
* @date 2023-08-25
*/
@ -46,7 +48,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "查询企业基础信息列表", response = BmsEnterpriseBasicInfo.class)
@GetMapping("/list")
public AjaxResult list(Page<BmsEnterpriseBasicInfo> page,BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
public AjaxResult list(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
return success(bmsEnterpriseBasicInfoService.page(page, bmsEnterpriseBasicInfo));
}
@ -54,7 +56,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
*
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "作业台查询企业信息" ,response = BmsEnterpriseBasicInfo.class)
@ApiOperation(value = "作业台查询企业信息", response = BmsEnterpriseBasicInfo.class)
@GetMapping("/workSearch")
public AjaxResult workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) {
return AjaxResult.success(bmsEnterpriseBasicInfoService.workSearch(enterpriseInfoWorkRequest));
@ -80,7 +82,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
@ApiOperation(value = "导入企业基础信息列表")
@Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT)
@PostMapping(value = "/importEnterprise", consumes = "multipart/form-data")
public AjaxResult importEnterprise(@RequestPart("file")MultipartFile file) throws Exception{
public AjaxResult importEnterprise(@RequestPart("file") MultipartFile file) throws Exception {
List<BmsEnterpriseBasicInfo> allList = bmsEnterpriseBasicInfoService.list();
ExcelUtil<BmsEnterpriseBasicInfo> util = new ExcelUtil<>(BmsEnterpriseBasicInfo.class);
List<BmsEnterpriseBasicInfo> proList = util.importExcel(file.getInputStream());
@ -98,7 +100,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/**
* id
*/
@ApiOperation(value = "根据信用代码获取该企业id" ,response = BmsEnterpriseBasicInfo.class)
@ApiOperation(value = "根据信用代码获取该企业id", response = BmsEnterpriseBasicInfo.class)
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@GetMapping(value = "/getCreditCode")
public AjaxResult getCreditCode(@RequestParam String getCreditCode) {
@ -109,11 +111,11 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
try {
admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
b = SecurityUtils.hasRole("ent");
str =SecurityUtils.getUsername();
str = SecurityUtils.getUsername();
} catch (Exception ignored) {
}
if(!admin && b){
getCreditCode=str;
if (!admin && b) {
getCreditCode = str;
}
return success(bmsEnterpriseBasicInfoService.selectGetCreditCode(getCreditCode));
}
@ -121,7 +123,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
/**
*
*/
@ApiOperation(value = "获取企业基础信息详细信息" ,response = BmsEnterpriseBasicInfo.class)
@ApiOperation(value = "获取企业基础信息详细信息", response = BmsEnterpriseBasicInfo.class)
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {

@ -1,21 +1,19 @@
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.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.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.PathVariable;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -25,7 +23,7 @@ import java.util.List;
/**
* Controller
*
*
* @author farben
* @date 2023-08-31
*/
@ -55,7 +53,7 @@ public class BmsEnterpriseDirectoryController extends BaseController {
@ApiOperation(value = "导出企业名录列表")
@Log(title = "企业名录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response,@RequestBody BmsEnterpriseDirectory bmsEnterpriseDirectory) {
public void export(HttpServletResponse response, @RequestBody BmsEnterpriseDirectory bmsEnterpriseDirectory) {
List<BmsEnterpriseDirectory> list = bmsEnterpriseDirectoryService.selectBmsEnterpriseDirectoryList(bmsEnterpriseDirectory);
ExcelUtil<BmsEnterpriseDirectory> util = new ExcelUtil<BmsEnterpriseDirectory>(BmsEnterpriseDirectory.class);
util.exportExcel(response, list, "企业名录数据");
@ -95,7 +93,7 @@ public class BmsEnterpriseDirectoryController extends BaseController {
*/
// @RequiresPermissions("system:enterpriseDirectory:remove")
@Log(title = "企业名录", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@PostMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bmsEnterpriseDirectoryService.deleteBmsEnterpriseDirectoryByIds(ids));
}

@ -18,13 +18,14 @@ import javax.validation.Valid;
/**
*
*
* @author du
* @since 2024/7/24 13:43
*/
@Api(tags = "企业填报")
@RestController
@RequestMapping("/system/fill")
public class BmsEnterpriseFillController extends BaseController {
public class BmsEnterpriseFillController extends BaseController {
@Autowired
private IBmsEnterpriseFillService iBmsEnterpriseFillService;
@ -42,6 +43,7 @@ public class BmsEnterpriseFillController extends BaseController {
//企业填报之后要新增一条审批记录
//政务端审批之后也要新增一条
//被驳回之后也要新增一条审批记录
/**
*
*/

@ -1,19 +1,17 @@
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.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.utils.poi.ExcelUtil;
import com.ruoyi.jjh.declaration.entity.BmsProcessInfo;
import com.ruoyi.jjh.declaration.service.IBmsProcessInfoService;
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.PathVariable;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -23,7 +21,7 @@ import java.util.List;
/**
* Controller
*
*
* @author farben
* @date 2023-09-09
*/
@ -90,7 +88,7 @@ public class BmsProcessInfoController extends BaseController {
*/
// @RequiresPermissions("system:processInfo:remove")
@Log(title = "审批流程", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@PostMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bmsProcessInfoService.deleteBmsProcessInfoByIds(ids));
}

@ -15,8 +15,12 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.parameters.P;
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.servlet.http.HttpServletRequest;
@ -26,7 +30,7 @@ import java.util.List;
/**
* Controller
*
*
* @author farben
* @date 2023-08-25
*/
@ -46,7 +50,7 @@ public class BmsTemplateInfoController extends BaseController {
@GetMapping("/list")
@ApiOperation(value = "查询申报模板信息列表", response = BmsTemplateInfo.class)
public AjaxResult list(Page<BmsTemplateInfo> page, BmsTemplateInfo bmsTemplateInfo) {
return success(bmsTemplateInfoService.selectBmsTemplateInfoList(page,bmsTemplateInfo));
return success(bmsTemplateInfoService.selectBmsTemplateInfoList(page, bmsTemplateInfo));
}
/**
@ -80,8 +84,8 @@ public class BmsTemplateInfoController extends BaseController {
@Log(title = "导出模板表单", businessType = BusinessType.EXPORT)
@ApiOperation(value = "导出模板表单")
@GetMapping(value = "/exportTemplate/{id}")
public void exportTemplate(HttpServletRequest request, HttpServletResponse response,@PathVariable("id")Long id){
bmsTemplateInfoService.exportTemplate(request,response,id);
public void exportTemplate(HttpServletRequest request, HttpServletResponse response, @PathVariable("id") Long id) {
bmsTemplateInfoService.exportTemplate(request, response, id);
}
/**
@ -127,7 +131,7 @@ public class BmsTemplateInfoController extends BaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "申报模板信息", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除申报模板信息")
@PostMapping("/{ids}")
@PostMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bmsTemplateInfoService.deleteBmsTemplateInfoByIds(ids));
}

@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
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.BmsTemplateRecordQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto;
@ -15,18 +13,21 @@ import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordQueryVo;
import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService;
import io.swagger.annotations.Api;
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.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 java.util.List;
/**
* 线Controller
*
*
* @author farben
* @date 2023-09-07
*/
@ -42,9 +43,9 @@ public class BmsTemplateRecordController extends BaseController {
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@GetMapping("/list")
@ApiOperation(value = "分页查询在线模板列表",response = BmsTemplateRecordQueryVo.class)
public AjaxResult list(Page<BmsTemplateRecordQueryVo> page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
return success(bmsTemplateRecordService.selectBmsTemplateRecordList(page,bmsTemplateRecordQueryDto));
@ApiOperation(value = "分页查询在线模板列表", response = BmsTemplateRecordQueryVo.class)
public AjaxResult list(Page<BmsTemplateRecordQueryVo> page, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) {
return success(bmsTemplateRecordService.selectBmsTemplateRecordList(page, bmsTemplateRecordQueryDto));
}
// /**
@ -63,12 +64,13 @@ public class BmsTemplateRecordController extends BaseController {
/**
*
*
* @param bmsTemplateRecordUpdateDto
* @return
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "补录")
@PostMapping ("/supplementation")
@PostMapping("/supplementation")
public AjaxResult supplementation(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
return toAjax(bmsTemplateRecordService.supplementation(bmsTemplateRecordUpdateDto));
}
@ -125,7 +127,7 @@ public class BmsTemplateRecordController extends BaseController {
@ApiOperation(value = "删除在线模板")
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@Log(title = "在线模板", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@PostMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(bmsTemplateRecordService.deleteBmsTemplateRecordByIds(ids));
}

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

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

@ -1,19 +1,14 @@
package com.ruoyi.jjh.declaration.entity;
import com.alibaba.fastjson2.annotation.JSONField;
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.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* bms_enterprise_basic_info
@ -30,22 +25,22 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
*
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
private Integer multiple;
/**
* 1. 2
*/
@ApiModelProperty("分类 1.规上服务业 2其他")
@JSONField(serialize=false)
@Excel(name = "分类",readConverterExp = "1=规上服务业,2=其他")
@JSONField(serialize = false)
@Excel(name = "分类", readConverterExp = "1=规上服务业,2=其他")
private Integer type;
@ -397,10 +392,9 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
* 01
*/
@ApiModelProperty("是否删除0未删除1已删除")
@JSONField(serialize=false)
@Excel(name = "是否删除",readConverterExp = "0=未删除,1=已删除")
@JSONField(serialize = false)
@Excel(name = "是否删除", readConverterExp = "0=未删除,1=已删除")
private Long isDeleted;
}

@ -7,8 +7,6 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
@ -126,7 +124,7 @@ public class BmsTemplateInfo extends BaseInfoEntity {
/**
* 0=,1=
*/
@Excel(name = "状态 0=过期,1=有效" , readConverterExp = "0=过期,1=有效")
@Excel(name = "状态 0=过期,1=有效", readConverterExp = "0=过期,1=有效")
@ApiModelProperty("状态 0=过期,1=有效")
private Integer status;

@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.Size;
import java.time.LocalDate;
/**
@ -75,16 +74,16 @@ public class BmsTemplateRecord extends BaseInfoEntity {
/**
* 0= 1= 2= 3
*/
@Excel(name = "状态 0=未开始 1=过期 2=有效 3长期有效" , readConverterExp = "0=未开始,1=过期,2=有效,3=长期有效")
@Excel(name = "状态 0=未开始 1=过期 2=有效 3长期有效", readConverterExp = "0=未开始,1=过期,2=有效,3=长期有效")
@ApiModelProperty("状态 0=未开始 1=过期 2=有效 3长期有效")
private Integer status;
@Excel(name = "是否限时" , readConverterExp = "0=限时,1=不限时")
@Excel(name = "是否限时", readConverterExp = "0=限时,1=不限时")
@ApiModelProperty(value = "是否限时,0:限时1:不限时")
private Integer isTime;
@Excel(name = "是否需要审批" , readConverterExp = "0=不需要审批,1=需要审批")
@Excel(name = "是否需要审批", readConverterExp = "0=不需要审批,1=需要审批")
@ApiModelProperty(value = "0=不需要审批,1=需要审批")
private Integer isApproval;
}

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

@ -1,9 +1,6 @@
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -11,7 +8,7 @@ import java.io.Serializable;
/**
* bms_approval_info
*
*
* @author farben
* @date 2023-09-09
*/
@ -20,21 +17,26 @@ public class BmsApprovalInfoUpdateDto implements Serializable {
private static final long serialVersionUID = 1L;
/** 申报记录id */
/**
* id
*/
@Excel(name = "申报记录id")
private Long declarationRecordsId;
// /** 审批状态(0=待审核.1=审批通过,2=审批驳回) */
// /** 审批状态(0=待审核.1=审批通过,2=审批驳回) */
@ApiModelProperty("审批状态(1=审批通过,2=审批驳回,3=初审退回修改)")
@Excel(name = "审批状态(1=审批通过,2=审批驳回,3=初审退回修改)")
private Integer approvalStatus;
/** 审批意见 */
/**
*
*/
@Excel(name = "审批意见")
private String approvalOpinions;
/** 审批附件 */
/**
*
*/
@Excel(name = "审批附件")
private String approvalAttachment;

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

@ -31,7 +31,9 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
@Excel(name = "申报单位")
private String enterpriseName;
/** 级别 0:本级,1:省级 */
/**
* 0:,1:
*/
@ApiModelProperty(value = "级别 0:本级,1:省级")
@Excel(name = "级别", readConverterExp = "0=本级,1=省级")
private Long level;
@ -41,7 +43,9 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
// @Excel(name = "申报类型", readConverterExp = "0=/,1=试点区域,2=龙头型,3=创新型")
// private Long type;
/** 责任单位 0经发委:1规建委:2行审局:3市监局 */
/**
* 0:1:2:3
*/
@ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局")
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
private Long responsibilityUnit;
@ -50,7 +54,7 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
private String templateName;
@ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过10=初审驳回")
@Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过10=初审驳回")
@Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过10=初审驳回")
private List<Long> statusStr;
@ApiModelProperty(value = "0=未填报,1=已填报")

@ -9,7 +9,7 @@ import java.util.Date;
/**
* bms_enterprise_basic_info
*
*
* @author farben
* @date 2023-08-25
*/

@ -10,7 +10,7 @@ import java.util.List;
/**
* bms_template_info
*
*
* @author farben
* @date 2023-08-25
*/

@ -8,7 +8,7 @@ import java.io.Serializable;
/**
* bms_template_info
*
*
* @author farben
* @date 2023-08-25
*/
@ -24,7 +24,7 @@ public class BmsTemplateQueryDto implements Serializable {
private String creditCode;
@ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局")
@Excel(name = "责任单位",readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
private Long responsibilityUnit;

@ -10,7 +10,7 @@ import java.util.List;
/**
* 线 bms_template_record
*
*
* @author farben
* @date 2023-09-07
*/

@ -1,7 +1,7 @@
package com.ruoyi.jjh.declaration.entity.dto;
import com.ruoyi.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -10,7 +10,7 @@ import java.util.Date;
/**
* bms_template_info
*
*
* @author farben
* @date 2023-08-25
*/
@ -26,24 +26,26 @@ public class BmsTemplateRecordQueryDto implements Serializable {
private Long templateId;
@ApiModelProperty(value = "级别 0:本级,1:省级")
@Excel(name = "级别 ",readConverterExp = "0=本级,1=省级")
@Excel(name = "级别 ", readConverterExp = "0=本级,1=省级")
private Integer level;
@ApiModelProperty(value = "申报途径,0:系统申报,1:补录")
@Excel(name = "申报途径",readConverterExp = "0=系统申报,1=补录")
@Excel(name = "申报途径", readConverterExp = "0=系统申报,1=补录")
private Long road;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开放开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 开放结束时间 */
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开放结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
@ApiModelProperty(value = "责任单位 0经发委:1规建委:2行审局:3市监局")
@Excel(name = "责任单位",readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
@Excel(name = "责任单位", readConverterExp = "0=经发委,1=规建委,2=行审局,3=市监局")
private Long responsibilityUnit;
@ApiModelProperty(value = "模板名称")

@ -11,7 +11,7 @@ import java.util.List;
/**
* 线 bms_template_record
*
*
* @author farben
* @date 2023-09-07
*/

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

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

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

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

@ -79,7 +79,7 @@ public class BmsTemplateRecordQueryVo implements Serializable {
/**
* 0= 1= 2=
*/
@Excel(name = "状态 0=未开始 1=过期 2=有效" , readConverterExp = "0=未开始,1=过期,2=有效")
@Excel(name = "状态 0=未开始 1=过期 2=有效", readConverterExp = "0=未开始,1=过期,2=有效")
@ApiModelProperty("状态 0=未开始 1=过期 2=有效")
private Integer status;
}

@ -1,6 +1,7 @@
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 lombok.Data;

@ -8,14 +8,14 @@ import java.util.List;
/**
* Mapper
*
*
* @author farben
* @date 2023-09-09
*/
public interface BmsApprovalInfoMapper extends BaseMapper<BmsApprovalInfo> {
/**
*
*
*
* @param id
* @return
*/
@ -23,7 +23,7 @@ public interface BmsApprovalInfoMapper extends BaseMapper<BmsApprovalInfo> {
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -31,7 +31,7 @@ public interface BmsApprovalInfoMapper extends BaseMapper<BmsApprovalInfo> {
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -39,7 +39,7 @@ public interface BmsApprovalInfoMapper extends BaseMapper<BmsApprovalInfo> {
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -47,7 +47,7 @@ public interface BmsApprovalInfoMapper extends BaseMapper<BmsApprovalInfo> {
/**
*
*
*
* @param id
* @return
*/
@ -55,7 +55,7 @@ public interface BmsApprovalInfoMapper extends BaseMapper<BmsApprovalInfo> {
/**
*
*
*
* @param ids
* @return
*/

@ -4,24 +4,24 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto;
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.BmsDeclarationRecordsQueryVo;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 线Mapper
*
*
* @author farben
* @date 2023-08-28
*/
public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRecords> {
/**
* 线
*
*
* @param id 线
* @return 线
*/
@ -29,7 +29,7 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/**
* 线
*
*
* @param bmsDeclarationRecordsDto 线
* @return 线
*/
@ -40,13 +40,12 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/**
*
*
*/
public List<ApprovalDeclarationRecordsQueryVo> approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto);
/**
* 线
*
*
* @param bmsDeclarationRecords 线
* @return
*/
@ -54,7 +53,7 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/**
* 线
*
*
* @param bmsDeclarationRecords 线
* @return
*/
@ -62,7 +61,7 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/**
* 线
*
*
* @param id 线
* @return
*/
@ -70,7 +69,7 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/**
* 线
*
*
* @param ids
* @return
*/
@ -85,12 +84,13 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
* @author emiya.xie
* @create 2023/9/6 15:13
*/
public int updateProjectNameById(@Param("id") Long id, @Param("projectName")String projectName,@Param("projectId")Long projectId);
public int updateProjectNameById(@Param("id") Long id, @Param("projectName") String projectName, @Param("projectId") Long projectId);
List<BmsDeclarationRecordsQueryVo> selectDeclarationRecordsToIdList(@Param("list") List<Long> list);
/**
* idid
*
* @return
*/
List<BmsDeclarationRecords> selectET(@Param("templateId") Long templateId, @Param("list") List<String> list);
@ -98,12 +98,14 @@ public interface BmsDeclarationRecordsMapper extends BaseMapper<BmsDeclarationRe
/**
*
*
* @return
*/
List<JSmartDeclaration> allNoLimited();
/**
* 线id
*
* @return
*/
JProject getAddProject(Long id);

@ -7,14 +7,14 @@ import java.util.List;
/**
* Mapper
*
*
* @author farben
* @date 2023-08-31
*/
public interface BmsEnterpriseDirectoryMapper extends BaseMapper<BmsEnterpriseDirectory> {
/**
*
*
*
* @param id
* @return
*/
@ -22,7 +22,7 @@ public interface BmsEnterpriseDirectoryMapper extends BaseMapper<BmsEnterpriseDi
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -30,7 +30,7 @@ public interface BmsEnterpriseDirectoryMapper extends BaseMapper<BmsEnterpriseDi
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -38,7 +38,7 @@ public interface BmsEnterpriseDirectoryMapper extends BaseMapper<BmsEnterpriseDi
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -46,7 +46,7 @@ public interface BmsEnterpriseDirectoryMapper extends BaseMapper<BmsEnterpriseDi
/**
*
*
*
* @param id
* @return
*/
@ -54,7 +54,7 @@ public interface BmsEnterpriseDirectoryMapper extends BaseMapper<BmsEnterpriseDi
/**
*
*
*
* @param ids
* @return
*/

@ -7,14 +7,14 @@ import java.util.List;
/**
* Mapper
*
*
* @author farben
* @date 2023-09-09
*/
public interface BmsProcessInfoMapper extends BaseMapper<BmsProcessInfo> {
/**
*
*
*
* @param id
* @return
*/
@ -22,7 +22,7 @@ public interface BmsProcessInfoMapper extends BaseMapper<BmsProcessInfo> {
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -30,7 +30,7 @@ public interface BmsProcessInfoMapper extends BaseMapper<BmsProcessInfo> {
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -38,7 +38,7 @@ public interface BmsProcessInfoMapper extends BaseMapper<BmsProcessInfo> {
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -46,7 +46,7 @@ public interface BmsProcessInfoMapper extends BaseMapper<BmsProcessInfo> {
/**
*
*
*
* @param id
* @return
*/
@ -54,7 +54,7 @@ public interface BmsProcessInfoMapper extends BaseMapper<BmsProcessInfo> {
/**
*
*
*
* @param ids
* @return
*/

@ -9,7 +9,7 @@ import java.util.List;
/**
* Mapper
*
*
* @author farben
* @date 2023-08-25
*/
@ -21,7 +21,7 @@ public interface BmsTemplateInfoMapper extends BaseMapper<BmsTemplateInfo> {
* @param bmsTemplateInfo
* @return
*/
Page<BmsTemplateInfo> templateInfoList(Page<BmsTemplateInfo> page,@Param("req") BmsTemplateInfo bmsTemplateInfo);
Page<BmsTemplateInfo> templateInfoList(Page<BmsTemplateInfo> page, @Param("req") BmsTemplateInfo bmsTemplateInfo);
/**
*
@ -29,7 +29,7 @@ public interface BmsTemplateInfoMapper extends BaseMapper<BmsTemplateInfo> {
* @param bmsTemplateInfo
* @return
*/
List<BmsTemplateInfo> templateInfoList(@Param("req") BmsTemplateInfo bmsTemplateInfo);
List<BmsTemplateInfo> templateInfoList(@Param("req") BmsTemplateInfo bmsTemplateInfo);
/**
*
@ -40,17 +40,17 @@ public interface BmsTemplateInfoMapper extends BaseMapper<BmsTemplateInfo> {
/**
*
*
*
* @param id
* @return
*/
int deleteBmsTemplateInfoById(Long id);
int deleteBmsTemplateInfoById(Long id);
/**
*
*
*
* @param ids
* @return
*/
int deleteBmsTemplateInfoByIds(Long[] ids);
int deleteBmsTemplateInfoByIds(Long[] ids);
}

@ -3,7 +3,6 @@ package com.ruoyi.jjh.declaration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.vo.BmsTemplateRecordQueryVo;
import com.ruoyi.jjh.declaration.entity.vo.BmsTemplateRecordVo;
@ -13,7 +12,7 @@ import java.util.List;
/**
* 线Mapper
*
*
* @author farben
* @date 2023-09-07
*/
@ -34,10 +33,9 @@ public interface BmsTemplateRecordMapper extends BaseMapper<BmsTemplateRecord> {
public List<BmsTemplateRecordQueryVo> selectTemplateRecordVo(@Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
/**
* 线
*
*
* @param id 线
* @return
*/
@ -45,21 +43,20 @@ public interface BmsTemplateRecordMapper extends BaseMapper<BmsTemplateRecord> {
/**
* 线
*
*
* @param ids
* @return
*/
public int deleteBmsTemplateRecordByIds(Long[] ids);
/**
* 线
*
* @param bmsTemplateRecordQueryDto 线
* @return 线
*/
public Page<BmsTemplateRecordQueryVo> selectTemplateRecordVo(Page<BmsTemplateRecordQueryVo> page,@Param("req")BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public Page<BmsTemplateRecordQueryVo> selectTemplateRecordVo(Page<BmsTemplateRecordQueryVo> page, @Param("req") BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
// /**
// * 企业端选择表单模板列表

@ -15,6 +15,7 @@ import java.util.List;
/**
*
*
* @author du
* @since 2024/7/17 10:30
*/
@ -33,41 +34,42 @@ public class SmsEnterChange {
@Value("${isTiming}")
private Boolean isTiming;
// 每三小时执行一次
@Scheduled(cron = "0 0 */12 * * *")
private void runTask() {
if(isTiming){
if (isTiming) {
//查询初审的所有用户
SysUser user = new SysUser();
user.setDeptId(105L);
Long count = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getStatus, 1).count();
if(count>0){
if (count > 0) {
List<SysUser> list1 = sysUserMapper.selectUserList(user);
list1.removeIf(x-> x.getPhonenumber().isEmpty());
list1.removeIf(x -> x.getPhonenumber().isEmpty());
for (SysUser items : list1) {
smsAlertsService.enterSms("政府人员-"+items.getNickName(),"您有"+count+"个新的申报审核任务[待初审]",items.getPhonenumber());
smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count + "个新的申报审核任务[待初审]", items.getPhonenumber());
}
}
//查询复审的所有用户
SysUser user1 = new SysUser();
user1.setDeptId(101L);
Long count1 = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getStatus, 2).count();
if(count1>0){
if (count1 > 0) {
List<SysUser> list2 = sysUserMapper.selectUserList(user1);
list2.removeIf(x-> x.getPhonenumber().isEmpty());
list2.removeIf(x -> x.getPhonenumber().isEmpty());
for (SysUser items : list2) {
smsAlertsService.enterSms("政府人员-"+items.getNickName(),"您有"+count1+"个新的申报审核任务[待复审]",items.getPhonenumber());
smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count1 + "个新的申报审核任务[待复审]", items.getPhonenumber());
}
}
//查询终审的所有用户
SysUser user2 = new SysUser();
user2.setDeptId(103L);
Long count2 = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getStatus, 3).count();
if(count2>0){
if (count2 > 0) {
List<SysUser> list3 = sysUserMapper.selectUserList(user2);
list3.removeIf(x-> x.getPhonenumber().isEmpty());
list3.removeIf(x -> x.getPhonenumber().isEmpty());
for (SysUser items : list3) {
smsAlertsService.enterSms("政府人员-"+items.getNickName(),"您有"+count2+"个新的申报审核任务[待终审]",items.getPhonenumber());
smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count2 + "个新的申报审核任务[待终审]", items.getPhonenumber());
}
}
}

@ -18,7 +18,11 @@ import com.ruoyi.jjh.ent.entity.JContacts;
import com.ruoyi.jjh.ent.entity.JProject;
import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
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.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
@ -113,6 +117,11 @@ public class TimeChange {
@Resource
private TimingRemindService timingRemindImpl;
/**
*
*/
@Resource
private JProjectService jProjectService;
/**
*
@ -126,12 +135,6 @@ public class TimeChange {
bmsTemplateInfoService.updateBatchById(list);
}
/**
*
*/
@Resource
private JProjectService jProjectService;
public void getTime(BmsTemplateRecord items) {
LocalDate currentDate = LocalDate.now();
LocalDate startDate = LocalDate.of(items.getStartTime().getYear(), items.getStartTime().getMonth(), items.getStartTime().getDayOfMonth());
@ -239,7 +242,6 @@ public class TimeChange {
}
/**
*
*/
@ -260,10 +262,10 @@ public class TimeChange {
y.setSmartRemindersId(1L);
y.setIsRead(1);
y.setAlertTime(y.getEndTime().minusDays(qy.getDaysAdvance()));
if(y.getTyshxydm()!=null){
if(isTiming){
if (y.getTyshxydm() != null) {
if (isTiming) {
//发送短信
timingRemindImpl.getContact(y.getTyshxydm(),"您有1个申报任务即将结束,请前往系统首页查看");
timingRemindImpl.getContact(y.getTyshxydm(), "您有1个申报任务即将结束,请前往系统首页查看");
}
}
});
@ -284,7 +286,7 @@ public class TimeChange {
y.setProjectId(x.getId());
y.setZwId(o.getUserId());
bmsDeclarationRecords.add(y);
if(isTiming){
if (isTiming) {
smsAlertsService.enterSms("政府人员-" + o.getNickName(), "您有1个项目即将建设完成,请前往工作台查看。", o.getPhonenumber());
}
});

@ -8,14 +8,14 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-09-09
*/
public interface IBmsApprovalInfoService extends IService<BmsApprovalInfo> {
/**
*
*
*
* @param id
* @return
*/
@ -23,7 +23,7 @@ public interface IBmsApprovalInfoService extends IService<BmsApprovalInfo> {
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -31,7 +31,7 @@ public interface IBmsApprovalInfoService extends IService<BmsApprovalInfo> {
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -39,7 +39,7 @@ public interface IBmsApprovalInfoService extends IService<BmsApprovalInfo> {
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -47,7 +47,7 @@ public interface IBmsApprovalInfoService extends IService<BmsApprovalInfo> {
/**
*
*
*
* @param ids
* @return
*/
@ -59,7 +59,7 @@ public interface IBmsApprovalInfoService extends IService<BmsApprovalInfo> {
/**
*
*
*
* @param id
* @return
*/

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

@ -9,7 +9,7 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-08-25
*/
@ -18,11 +18,11 @@ public interface IBmsEnterpriseBasicInfoService extends IService<BmsEnterpriseBa
/**
*
*
*
* @param bmsEnterpriseBasicInfo
* @return
*/
Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
/**
*
@ -30,10 +30,11 @@ public interface IBmsEnterpriseBasicInfoService extends IService<BmsEnterpriseBa
* @param bmsEnterpriseBasicInfo
* @return
*/
List<BmsEnterpriseBasicInfo> page( BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
List<BmsEnterpriseBasicInfo> page(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest);
/**
* id
*/

@ -7,14 +7,14 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-08-31
*/
public interface IBmsEnterpriseDirectoryService extends IService<BmsEnterpriseDirectory> {
/**
*
*
*
* @param id
* @return
*/
@ -22,7 +22,7 @@ public interface IBmsEnterpriseDirectoryService extends IService<BmsEnterpriseDi
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -30,7 +30,7 @@ public interface IBmsEnterpriseDirectoryService extends IService<BmsEnterpriseDi
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -38,7 +38,7 @@ public interface IBmsEnterpriseDirectoryService extends IService<BmsEnterpriseDi
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -46,7 +46,7 @@ public interface IBmsEnterpriseDirectoryService extends IService<BmsEnterpriseDi
/**
*
*
*
* @param ids
* @return
*/
@ -54,7 +54,7 @@ public interface IBmsEnterpriseDirectoryService extends IService<BmsEnterpriseDi
/**
*
*
*
* @param id
* @return
*/

@ -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.EnterpriseFillResquest;
import org.springframework.web.multipart.MultipartFile;
import java.util.Map;
/**
*
*
* @author du
* @since 2024/7/24 13:52
*/
@ -22,7 +22,7 @@ public interface IBmsEnterpriseFillService {
/**
* json
*/
Map<String,String> parseJson(String json);
Map<String, String> parseJson(String json);
/**
*

@ -7,14 +7,14 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-09-09
*/
public interface IBmsProcessInfoService extends IService<BmsProcessInfo> {
/**
*
*
*
* @param id
* @return
*/
@ -22,7 +22,7 @@ public interface IBmsProcessInfoService extends IService<BmsProcessInfo> {
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -30,7 +30,7 @@ public interface IBmsProcessInfoService extends IService<BmsProcessInfo> {
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -38,7 +38,7 @@ public interface IBmsProcessInfoService extends IService<BmsProcessInfo> {
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -46,7 +46,7 @@ public interface IBmsProcessInfoService extends IService<BmsProcessInfo> {
/**
*
*
*
* @param ids
* @return
*/
@ -54,7 +54,7 @@ public interface IBmsProcessInfoService extends IService<BmsProcessInfo> {
/**
*
*
*
* @param id
* @return
*/

@ -10,7 +10,7 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-08-25
*/
@ -19,11 +19,11 @@ public interface IBmsTemplateInfoService extends IService<BmsTemplateInfo> {
/**
*
*
*
* @param bmsTemplateInfo
* @return
*/
public Page<BmsTemplateInfo> selectBmsTemplateInfoList(Page<BmsTemplateInfo> page, BmsTemplateInfo bmsTemplateInfo);
public Page<BmsTemplateInfo> selectBmsTemplateInfoList(Page<BmsTemplateInfo> page, BmsTemplateInfo bmsTemplateInfo);
/**
*
@ -31,7 +31,7 @@ public interface IBmsTemplateInfoService extends IService<BmsTemplateInfo> {
* @param bmsTemplateInfo
* @return
*/
public List<BmsTemplateInfo> selectBmsTemplateInfoList( BmsTemplateInfo bmsTemplateInfo);
public List<BmsTemplateInfo> selectBmsTemplateInfoList(BmsTemplateInfo bmsTemplateInfo);
/**
*
@ -64,7 +64,7 @@ public interface IBmsTemplateInfoService extends IService<BmsTemplateInfo> {
/**
*
*
*
* @param ids
* @return
*/
@ -72,7 +72,7 @@ public interface IBmsTemplateInfoService extends IService<BmsTemplateInfo> {
/**
*
*
*
* @param id
* @return
*/

@ -3,7 +3,6 @@ package com.ruoyi.jjh.declaration.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
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.BmsTemplateRecordQueryDto;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateRecordUpdateDto;
@ -14,7 +13,7 @@ import java.util.List;
/**
* 线Service
*
*
* @author farben
* @date 2023-09-07
*/
@ -26,7 +25,7 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
* @param bmsTemplateRecordQueryDto 线
* @return 线
*/
public Page<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(Page<BmsTemplateRecordQueryVo> page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public Page<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(Page<BmsTemplateRecordQueryVo> page, BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
// /**
// * 企业端选择表单模板列表
@ -38,6 +37,7 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
/**
*
*
* @param bmsTemplateRecordAddDto
* @return
*/
@ -49,7 +49,7 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
* @param bmsTemplateRecordQueryDto 线
* @return 线
*/
public List<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
public List<BmsTemplateRecordQueryVo> selectBmsTemplateRecordList(BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto);
/**
* 线
@ -65,9 +65,6 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
public int insertBmsTemplateRecord(BmsTemplateRecordAddDto bmsTemplateRecordAddDto);
// /**
// * 修改在线模板
// *
@ -78,7 +75,7 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
/**
* 线
*
*
* @param ids 线
* @return
*/
@ -86,7 +83,7 @@ public interface IBmsTemplateRecordService extends IService<BmsTemplateRecord> {
/**
* 线
*
*
* @param id 线
* @return
*/

@ -11,15 +11,15 @@ package com.ruoyi.jjh.declaration.service;
*/
public interface ICommonService {
public Long checkEnterprise(String creditCode,int templateRecordId);
public Long checkEnterprise(String creditCode, int templateRecordId);
public void checkDeclaration(String creditCode,int templateRecordId);
public void checkDeclaration(String creditCode, int templateRecordId);
public void checkEnterprise(Long enterpriseId,Long templateId);
public void checkEnterprise(Long enterpriseId, Long templateId);
public void insertAuditRecord(Long declarationRecordId,Integer approvalType);
public void insertAuditRecord(Long declarationRecordId, Integer approvalType);
public void updateAuditRecord(Long declarationRecordId,Integer approvalType);
public void updateAuditRecord(Long declarationRecordId, Integer approvalType);
// public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto);

@ -12,17 +12,17 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-09-09
*/
@Service
public class BmsApprovalInfoServiceImpl extends ServiceImpl<BmsApprovalInfoMapper,BmsApprovalInfo> implements IBmsApprovalInfoService {
public class BmsApprovalInfoServiceImpl extends ServiceImpl<BmsApprovalInfoMapper, BmsApprovalInfo> implements IBmsApprovalInfoService {
/**
*
*
*
* @param id
* @return
*/
@ -33,7 +33,7 @@ public class BmsApprovalInfoServiceImpl extends ServiceImpl<BmsApprovalInfoMappe
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -44,7 +44,7 @@ public class BmsApprovalInfoServiceImpl extends ServiceImpl<BmsApprovalInfoMappe
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -56,7 +56,7 @@ public class BmsApprovalInfoServiceImpl extends ServiceImpl<BmsApprovalInfoMappe
/**
*
*
*
* @param bmsApprovalInfo
* @return
*/
@ -68,7 +68,7 @@ public class BmsApprovalInfoServiceImpl extends ServiceImpl<BmsApprovalInfoMappe
/**
*
*
*
* @param ids
* @return
*/
@ -89,7 +89,7 @@ public class BmsApprovalInfoServiceImpl extends ServiceImpl<BmsApprovalInfoMappe
/**
*
*
*
* @param id
* @return
*/

@ -8,7 +8,11 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
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.BmsApprovalInfoUpdateDto;
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.DeclarationRecordsVo;
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.JSmartDeclaration;
import com.ruoyi.jjh.ent.service.JProjectService;
@ -44,12 +53,10 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl<BmsDeclaration
private ICommonService iCommonService;
@Resource
private IBmsTemplateRecordService iBmsTemplateRecordService;
@Autowired
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.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper;
@ -13,23 +12,23 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-08-25
*/
@Service
public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterpriseBasicInfoMapper,BmsEnterpriseBasicInfo> implements IBmsEnterpriseBasicInfoService {
public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterpriseBasicInfoMapper, BmsEnterpriseBasicInfo> implements IBmsEnterpriseBasicInfoService {
/**
*
*
*
* @param bmsEnterpriseBasicInfo
* @return
*/
@Override
public Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
return baseMapper.page(page,bmsEnterpriseBasicInfo);
return baseMapper.page(page, bmsEnterpriseBasicInfo);
}
/**
@ -48,6 +47,7 @@ public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterprise
public List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) {
return baseMapper.workSearch(enterpriseInfoWorkRequest);
}
/**
* id
*/

@ -11,16 +11,16 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-08-31
*/
@Service
public class BmsEnterpriseDirectoryServiceImpl extends ServiceImpl<BmsEnterpriseDirectoryMapper,BmsEnterpriseDirectory> implements IBmsEnterpriseDirectoryService {
public class BmsEnterpriseDirectoryServiceImpl extends ServiceImpl<BmsEnterpriseDirectoryMapper, BmsEnterpriseDirectory> implements IBmsEnterpriseDirectoryService {
/**
*
*
*
* @param id
* @return
*/
@ -31,7 +31,7 @@ public class BmsEnterpriseDirectoryServiceImpl extends ServiceImpl<BmsEnterprise
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -42,7 +42,7 @@ public class BmsEnterpriseDirectoryServiceImpl extends ServiceImpl<BmsEnterprise
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -54,7 +54,7 @@ public class BmsEnterpriseDirectoryServiceImpl extends ServiceImpl<BmsEnterprise
/**
*
*
*
* @param bmsEnterpriseDirectory
* @return
*/
@ -66,7 +66,7 @@ public class BmsEnterpriseDirectoryServiceImpl extends ServiceImpl<BmsEnterprise
/**
*
*
*
* @param ids
* @return
*/
@ -77,7 +77,7 @@ public class BmsEnterpriseDirectoryServiceImpl extends ServiceImpl<BmsEnterprise
/**
*
*
*
* @param id
* @return
*/

@ -11,14 +11,17 @@ import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord;
import com.ruoyi.jjh.declaration.entity.request.EnterpriseFileResquest;
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.service.JProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.HashMap;
@ -110,11 +113,11 @@ public class BmsEnterpriseFillServiceImpl implements IBmsEnterpriseFillService {
JSONObject parse = JSONObject.parse(o.toString());
if (!"el-upload".equals(parse.get("tag"))) {
ps1.add(parse.toString());
}else{
} else {
ps2.add(parse.toString());
}
}
for (Object o : ps1) {
for (Object o : ps1) {
JSONObject parse = JSONObject.parse(o.toString());
//解析下拉框和单选框
if ("el-select".equals(parse.get("tag")) || "el-radio-group".equals(parse.get("tag"))) {
@ -146,7 +149,7 @@ public class BmsEnterpriseFillServiceImpl implements IBmsEnterpriseFillService {
str.append("}");
obj1.put("str", str.toString().replaceAll(",(?!.*,)", ""));
//解析文件
for (Object o : ps2) {
for (Object o : ps2) {
JSONObject s1 = JSONObject.parse(o.toString());
fileStr.append('"').append(s1.get("label").toString()).append('"').append(":")
.append('"').append(s1.get("defaultValue")).append('"').append(",");

@ -11,16 +11,16 @@ import java.util.List;
/**
* Service
*
*
* @author farben
* @date 2023-09-09
*/
@Service
public class BmsProcessInfoServiceImpl extends ServiceImpl<BmsProcessInfoMapper,BmsProcessInfo> implements IBmsProcessInfoService {
public class BmsProcessInfoServiceImpl extends ServiceImpl<BmsProcessInfoMapper, BmsProcessInfo> implements IBmsProcessInfoService {
/**
*
*
*
* @param id
* @return
*/
@ -31,7 +31,7 @@ public class BmsProcessInfoServiceImpl extends ServiceImpl<BmsProcessInfoMapper,
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -42,7 +42,7 @@ public class BmsProcessInfoServiceImpl extends ServiceImpl<BmsProcessInfoMapper,
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -54,7 +54,7 @@ public class BmsProcessInfoServiceImpl extends ServiceImpl<BmsProcessInfoMapper,
/**
*
*
*
* @param bmsProcessInfo
* @return
*/
@ -66,7 +66,7 @@ public class BmsProcessInfoServiceImpl extends ServiceImpl<BmsProcessInfoMapper,
/**
*
*
*
* @param ids
* @return
*/
@ -77,7 +77,7 @@ public class BmsProcessInfoServiceImpl extends ServiceImpl<BmsProcessInfoMapper,
/**
*
*
*
* @param id
* @return
*/

@ -40,7 +40,7 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl<BmsTemplateInfoMappe
*/
@Override
public Page<BmsTemplateInfo> selectBmsTemplateInfoList(Page<BmsTemplateInfo> page, BmsTemplateInfo bmsTemplateInfo) {
return baseMapper.templateInfoList(page,bmsTemplateInfo);
return baseMapper.templateInfoList(page, bmsTemplateInfo);
}
/**
@ -95,7 +95,6 @@ public class BmsTemplateInfoServiceImpl extends ServiceImpl<BmsTemplateInfoMappe
}
/**
*
*

@ -1,15 +1,15 @@
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.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.entity.*;
import com.ruoyi.jjh.declaration.entity.dto.BmsTemplateQueryDto;
import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords;
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.BmsTemplateRecordQueryDto;
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.mapper.BmsTemplateRecordMapper;
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.Value;
import org.springframework.stereotype.Service;
@ -104,11 +108,11 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
public int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
BmsTemplateRecord infos = getById(bmsTemplateRecordUpdateDto.getId());
BmsTemplateInfo tp = iBmsTemplateInfoService.getById(bmsTemplateRecordUpdateDto.getTemplateId());
if (infos.getIsTime() == 1){
if (infos.getIsTime() == 1) {
bmsTemplateRecordUpdateDto.setStartTime(null);
bmsTemplateRecordUpdateDto.setEndTime(null);
bmsTemplateRecordUpdateDto.setStatus(3);
}else if(infos.getIsTime() == 0){
} else if (infos.getIsTime() == 0) {
//只有未修改之前是过期的才能补录
if (bmsTemplateRecordUpdateDto.getStatus() != 1) {
throw new ServiceException("未过期不可以补录");
@ -117,7 +121,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
if (bmsTemplateRecordUpdateDto.getStatus() != 2) {
throw new ServiceException("请修改时间范围为有效区间");
}
}else {
} else {
throw new ServiceException("补录失败");
}
int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
@ -144,7 +148,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
}
//java有两个list实体类集合 如果a集合某条数据里面的name和b里面某条数据的name相等 就去除a的该条数据
enterpriseDirectoryList.removeIf(entityA -> list.stream().anyMatch(entityB -> entityB.getCreditCode().equals(entityA.getCreditCode())));
enterpriseDirectoryList.forEach(x->{
enterpriseDirectoryList.forEach(x -> {
x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), tp.getTemplateJson());
});
@ -194,22 +198,22 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
// 1 新增申报任务时,增加一个选项:是否审批(需要审批/不需要审批),选了“不需要审批”的企业填报后,状态变为“已填报”,不再进行后续流程,并且这种情况不对接到项目库。
// 2、新增申报任务时若项目分类选择了“企业信息收集”里面的则只能选择“不需要审批”这类申报都不对接项目库。
BmsTemplateInfo tp = iBmsTemplateInfoService.getById(bmsTemplateRecordAddDto.getTemplateId());
if(tp.getProjectBigType()== 11 &bmsTemplateRecordAddDto.getIsApproval()==1){
if (tp.getProjectBigType() == 11 & bmsTemplateRecordAddDto.getIsApproval() == 1) {
throw new ServiceException("企业信息收集模板,不需要审批");
}
int num = 0;
QueryWrapper<BmsTemplateRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enterprise_directory", bmsTemplateRecordAddDto.getEnterpriseDirectory());
List<BmsTemplateRecord> isFlag = baseMapper.selectList(queryWrapper);
if(!isFlag.isEmpty()){
if (!isFlag.isEmpty()) {
throw new ServiceException("该申报任务标题已经存在");
}
//如果不限时
if(bmsTemplateRecordAddDto.getIsTime()==null){
if (bmsTemplateRecordAddDto.getIsTime() == null) {
throw new ServiceException("请选择是否限时");
} else if(bmsTemplateRecordAddDto.getIsTime() == 1){
} else if (bmsTemplateRecordAddDto.getIsTime() == 1) {
bmsTemplateRecordAddDto.setStatus(3);
}else {
} else {
//新增的时候根据当前时间判断状态是否有效
tiTimeChange.getTime(bmsTemplateRecordAddDto);
}
@ -223,7 +227,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
//如果前端部分企业名录集合为空
if (null != enterpriseDirectoryList && enterpriseDirectoryList.size() > 0) {
enterpriseDirectoryList.forEach(x -> {
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(),tp.getTemplateJson());
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(), tp.getTemplateJson());
x.setTemplateRecordId(bmsTemplateRecordAddDto.getId());
});
enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
@ -236,17 +240,17 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
bms.setEnterpriseName(items.getQymc());
bms.setCreditCode(items.getTyshxydm());
copyList.add(bms);
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getTyshxydm(),tp.getTemplateJson());
getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, items.getTyshxydm(), tp.getTemplateJson());
}
enterpriseDirectoryService.saveBatch(copyList);
}
iBmsDeclarationRecordsService.saveBatch(drlist);
//给刚刚添加进企业名录的所有企业的联系人发短信
//获取每个企业对应的常用联系人
if(isTiming){
if (isTiming) {
List<BmsEnterpriseDirectory> list = enterpriseDirectoryService.lambdaQuery().eq(BmsEnterpriseDirectory::getTemplateRecordId, bmsTemplateRecordAddDto.getId()).list();
for (BmsEnterpriseDirectory x : list) {
timingRemindImpl.getContact(x.getCreditCode(),"您有1个新的申报任务[待填报]");
timingRemindImpl.getContact(x.getCreditCode(), "您有1个新的申报任务[待填报]");
}
}
return num;
@ -255,7 +259,7 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
/**
* 线
*/
private void getDeclarationRecordsList(BmsTemplateRecord bmsTemplateRecordAddDto, List<BmsDeclarationRecords> drlist, String creditCode,String json) {
private void getDeclarationRecordsList(BmsTemplateRecord bmsTemplateRecordAddDto, List<BmsDeclarationRecords> drlist, String creditCode, String json) {
BmsDeclarationRecords drItems = new BmsDeclarationRecords();
drItems.setProjectName(bmsTemplateRecordAddDto.getEnterpriseDirectory());
drItems.setYear(String.valueOf(Year.now().getValue()));

@ -7,7 +7,13 @@ import com.ruoyi.jjh.declaration.entity.BmsApprovalInfo;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
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.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -82,7 +88,7 @@ public class CommonServiceImpl implements ICommonService {
BmsTemplateRecord templateRecord = iBmsTemplateRecordService.getById(templateRecordId);
if (templateRecord.getStatus() == 0) {
throw new ServiceException("该申请还未到填报时间");
}else if(templateRecord.getStatus() == 1){
} else if (templateRecord.getStatus() == 1) {
throw new ServiceException("该申请已经过期");
}
// BmsTemplateRecord templateRecord = iBmsTemplateRecordService.lambdaQuery().eq(BmsTemplateRecord::getId, templateRecordId).le(BmsTemplateRecord::getStartTime, LocalDate.now()).ge(BmsTemplateRecord::getEndTime, LocalDate.now()).one();
@ -139,6 +145,7 @@ public class CommonServiceImpl implements ICommonService {
bmsApprovalInfo.setIsReview(0);
iBmsApprovalInfoService.save(bmsApprovalInfo);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateAuditRecord(Long declarationRecordId, Integer approvalType) {
@ -146,7 +153,6 @@ public class CommonServiceImpl implements ICommonService {
}
// @Override
// public int insertOpenInterfaceApplyAddDto(OpenInterfaceApplyAddDto openInterfaceApplyAddDto) {
// int num = 0;

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

@ -8,6 +8,7 @@ import java.util.List;
/**
*
*
* @author du
* @since 2024/6/4 11:05
*/
@ -36,7 +37,7 @@ public class ChiefResponse {
private String workAddress;
private String state;
private String description;
// private String post;
// private String post;
private String secondaryEmail;
private String hasDomainAccount;
private SettingsResponse settings;

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

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

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

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

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

@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets;
/**
*
*
* @author du
* @since 2024/6/20 10:15
*/
@ -23,14 +24,15 @@ public class HMAC256Config {
/**
*
*/
private final static String ALGORITHM = "AES";
private final static String ALGORITHM = "AES";
/**
*
*
*/
private final static String PATTERN = "AES/CBC/pkcs5padding";
//AES解密
/**
* @param content
* @param key aes
@ -57,7 +59,7 @@ public class HMAC256Config {
return new String(bytes);
}
public static byte[] HmacSHA256(String data,String key) throws Exception {
public static byte[] HmacSHA256(String data, String key) throws Exception {
Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
SecretKeySpec secret_key = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
sha256_HMAC.init(secret_key);

@ -1,6 +1,5 @@
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.domain.AjaxResult;
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.ApiOperation;
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 java.io.Serializable;
import java.util.Arrays;
/**
* ()j_contacts
@ -39,7 +40,7 @@ public class JContactsController extends BaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "分页查询联络人数据", response = JContacts.class)
@GetMapping
public AjaxResult selectAll( JContactsRequest jContacts) {
public AjaxResult selectAll(JContactsRequest jContacts) {
// 获取当前登录用户是否是企业端
boolean admin = false;
boolean b = false;

@ -33,8 +33,10 @@ public class JDataScreenController extends BaseController {
@Resource
private SmsAlertsService sms;
/**
*
*
* @return
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ -46,6 +48,7 @@ public class JDataScreenController extends BaseController {
/**
*
*
* @return
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ -57,6 +60,7 @@ public class JDataScreenController extends BaseController {
/**
*
*
* @return
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ -73,6 +77,7 @@ public class JDataScreenController extends BaseController {
/**
*
*
* @return
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ -84,6 +89,7 @@ public class JDataScreenController extends BaseController {
/**
*
*
* @return
*/
@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.ApiOperation;
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;
/**
* j_template_metrics
*
* @author du
* @since 2024/7/31 15:09
*/

@ -13,15 +13,20 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value;
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 java.io.Serializable;
import java.util.Arrays;
import java.util.Objects;
/**
* j_enterprise_contact
*
* @author du
* @since 2024/5/13 9:56
*/
@ -38,10 +43,11 @@ public class JEnterpriseContactController extends BaseController {
@Resource
private SmsAlertsService smsAlertsService;
/**
*
*
* @param page
* @param page
* @param jEnterpriseContactRequest
* @return
*/
@ -56,17 +62,17 @@ public class JEnterpriseContactController extends BaseController {
try {
admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
b = SecurityUtils.hasRole("ent");
str =SecurityUtils.getLoginUser().getUser();
str = SecurityUtils.getLoginUser().getUser();
} catch (Exception ignored) {
}
if(!admin && b){
if (!admin && b) {
jEnterpriseContactRequest.setEnterpriseName(str.getNickName());
jEnterpriseContactRequest.setEnterpriseCode(str.getUserName());
}
if(page.getCurrent() >=1 & page.getSize() >=1){
return success(jEnterpriseContactService.page(page, jEnterpriseContactRequest));
}else {
return success(jEnterpriseContactService.page(jEnterpriseContactRequest));
if (page.getCurrent() >= 1 & page.getSize() >= 1) {
return success(jEnterpriseContactService.page(page, jEnterpriseContactRequest));
} else {
return success(jEnterpriseContactService.page(jEnterpriseContactRequest));
}
}
@ -94,7 +100,7 @@ public class JEnterpriseContactController extends BaseController {
@ApiOperation(value = "新增数据")
@PostMapping
public AjaxResult insert(@RequestBody JEnterpriseContact jEnterpriseContact) {
if(isTiming){
if (isTiming) {
smsAlertsService.addSsmPhone(jEnterpriseContact.getContactPhone());
}
return success(jEnterpriseContactService.save(jEnterpriseContact));
@ -110,7 +116,7 @@ public class JEnterpriseContactController extends BaseController {
@ApiOperation(value = "修改数据")
@PostMapping("/edit")
public AjaxResult update(@RequestBody JEnterpriseContact jEnterpriseContact) {
if(isTiming){
if (isTiming) {
smsAlertsService.addSsmPhone(jEnterpriseContact.getContactPhone());
}
return success(jEnterpriseContactService.updateById(jEnterpriseContact));
@ -125,7 +131,7 @@ public class JEnterpriseContactController extends BaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')")
@ApiOperation(value = "删除数据")
@PostMapping("/{ids}")
public AjaxResult delete( @PathVariable Long[] ids) {
public AjaxResult delete(@PathVariable Long[] ids) {
return success(jEnterpriseContactService.removeByIds(Arrays.asList(ids)));
}
}

@ -2,7 +2,6 @@ package com.ruoyi.jjh.ent.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.request.JHeadQuartersRevenueRequest;
import com.ruoyi.jjh.ent.entity.response.JHqCountResponse;
@ -20,6 +19,7 @@ import static com.ruoyi.common.core.domain.AjaxResult.success;
/**
* j_headquarters_revenue
*
* @author du
* @since 2024/7/29 13:09
*/
@ -34,15 +34,16 @@ public class JHeadQuartersRevenueController {
/**
*
*
* @param page
* @param js
* @param js
* @return
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "分页查询总部企业", response = JHeadQuartersRevenue.class)
@GetMapping
public AjaxResult page(Page<JHeadQuartersRevenue> page, JHeadQuartersRevenueRequest js) {
return success(jHeadQuartersRevenueService.page(page,js));
return success(jHeadQuartersRevenueService.page(page, js));
}
/**

@ -8,27 +8,22 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
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.ent.entity.JMemorandum;
import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest;
import com.ruoyi.jjh.ent.service.JMemorandumService;
import io.swagger.annotations.Api;
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.PathVariable;
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -78,8 +73,6 @@ public class JMemorandumController extends BaseController {
}
/**
* IDIDID
*

@ -9,13 +9,19 @@ import com.ruoyi.jjh.ent.service.JPolicyFileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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 java.io.Serializable;
/**
* j_policy_file
*
* @author du
* @since 2024/5/6 11:16
*/

@ -18,7 +18,14 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import 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 javax.annotation.Resource;
@ -99,8 +106,8 @@ public class JProjectController extends BaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "作业台查询所有项目(政务端)", response = JProject.class)
@GetMapping("/selectAll")
public AjaxResult selectAll(@RequestParam String name,@RequestParam(required = false) Integer status) {
return success(jProjectService.selectAll(name,status));
public AjaxResult selectAll(@RequestParam String name, @RequestParam(required = false) Integer status) {
return success(jProjectService.selectAll(name, status));
}
/**

@ -3,29 +3,18 @@ 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.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.request.JContactsRequest;
import com.ruoyi.jjh.ent.entity.request.JServicesListRequest;
import com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse;
import com.ruoyi.jjh.ent.service.JContactsService;
import com.ruoyi.jjh.ent.service.JServicesListService;
import io.swagger.annotations.Api;
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.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 java.io.Serializable;
import java.util.List;
/**
* j_services_list
@ -43,15 +32,16 @@ public class JServicesListController extends BaseController {
/**
*
*
* @param page
* @param js
* @param js
* @return
*/
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "分页查询服务业企业名单", response = JServicesList.class)
@GetMapping
public AjaxResult selectAll(Page<JServicesList> page, JServicesListRequest js) {
return success(jServicesListService.page(page,js));
return success(jServicesListService.page(page, js));
}

@ -22,7 +22,13 @@ import io.swagger.annotations.ApiOperation;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
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.validation.Valid;
@ -116,7 +122,7 @@ public class JSmartRemindersController extends BaseController {
if (admin) {
userId = null;
}
return success(jSmartDeclarationService.chiefAll(userId,projectId));
return success(jSmartDeclarationService.chiefAll(userId, projectId));
}
/**
@ -173,9 +179,9 @@ public class JSmartRemindersController extends BaseController {
@ApiOperation(value = "新增定期提醒数据(政务端和企业端)")
@PostMapping
public AjaxResult insertDs(@RequestBody @Valid JSmartRemindersDq jSmartRemindersDq) throws SchedulerException, TaskException {
if(jSmartRemindersDq.getProjectId()!=null){
if (jSmartRemindersDq.getProjectId() != null) {
jSmartRemindersDq.setAlertType(4);
}else {
} else {
jSmartRemindersDq.setAlertType(1);
}
return success(jSmartRemindersService.add(jSmartRemindersDq));
@ -192,9 +198,9 @@ public class JSmartRemindersController extends BaseController {
@ApiOperation(value = "修改定期提醒数据")
@PostMapping("/updateDq")
public AjaxResult updateDq(@RequestBody @Valid JSmartRemindersDq dq) throws SchedulerException, TaskException {
if(dq.getAlertType() == 1 || dq.getAlertType()==4){
if (dq.getAlertType() == 1 || dq.getAlertType() == 4) {
return success(jSmartRemindersService.updateDq(dq));
}else {
} else {
throw new ServiceException("请选择正确类型!");
}
}
@ -209,9 +215,9 @@ public class JSmartRemindersController extends BaseController {
@ApiOperation(value = "修改不定期提醒数据")
@PostMapping("/updateNdq")
public AjaxResult updateNdq(@RequestBody @Valid JSmartRemindersNDq ndq) {
if(ndq.getAlertType()==2 || ndq.getAlertType()==3){
if (ndq.getAlertType() == 2 || ndq.getAlertType() == 3) {
return success(jSmartRemindersService.updateNdq(ndq));
}else {
} else {
throw new ServiceException("请选择正确类型!");
}
}
@ -226,13 +232,13 @@ public class JSmartRemindersController extends BaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')")
@ApiOperation(value = "删除数据")
@PostMapping("/{id}")
public AjaxResult delete( @PathVariable Long id) throws SchedulerException {
public AjaxResult delete(@PathVariable Long id) throws SchedulerException {
JSmartReminders js = jSmartRemindersService.getById(id);
if (js.getAlertManner() == 2) {
throw new ServiceException("不定期提醒不允许删除");
}
JAddJobSmart jAddJobSmart = jSmartRemindersMapper.selectJobSmart(id);
if(jAddJobSmart.getJobId()!=null){
if (jAddJobSmart.getJobId() != null) {
SysJob sysJob = new SysJob();
sysJob.setJobId(jAddJobSmart.getJobId());
jobService.deleteJob(sysJob);

@ -1,7 +1,5 @@
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -12,6 +10,7 @@ import java.time.LocalDateTime;
/**
*
*
* @author du
* @since 2024/7/1 19:29
*/

@ -1,7 +1,10 @@
package com.ruoyi.jjh.ent.entity;
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.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel;
@ -10,6 +13,7 @@ import lombok.Data;
/**
* ()j_contacts
*
* @author du
* @since 2024/5/13 9:49
*/
@ -28,14 +32,14 @@ public class JContacts extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableField(fill = FieldFill.INSERT)
private Long createId;
/**
* id
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateId;
@ -148,8 +152,6 @@ public class JContacts extends BaseInfoEntity {
private String dwTimestamp;
/**
*
*/

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

@ -1,7 +1,11 @@
package com.ruoyi.jjh.ent.entity;
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.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel;
@ -10,6 +14,7 @@ import lombok.Data;
/**
* j_enterprise_contact
*
* @author du
* @since 2024/5/13 9:49
*/
@ -71,14 +76,14 @@ public class JEnterpriseContact extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableField(fill = FieldFill.INSERT)
private Long createId;
/**
* id
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableField(fill = FieldFill.UPDATE)
private Long updateId;
}

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

@ -1,6 +1,10 @@
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.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
@ -35,7 +39,7 @@ public class JMemorandum {
/**
*
*/
@Excel(name = "分类",readConverterExp = "1=企业信息,2=项目")
@Excel(name = "分类", readConverterExp = "1=企业信息,2=项目")
@ApiModelProperty("名字,1=企业信息库的id,2=项目库对应的id")
private String type;
@ -77,7 +81,7 @@ public class JMemorandum {
/**
*
*/
@Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

@ -1,7 +1,11 @@
package com.ruoyi.jjh.ent.entity;
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.ruoyi.common.annotation.Excel;
import com.ruoyi.jjh.common.entity.BaseInfoEntity;
@ -14,13 +18,14 @@ import java.util.Date;
/**
* j_policy_file
*
* @author du
* @since 2024/5/6 14:15
*/
@Data
@ApiModel("政策文件表")
@TableName(value = "j_policy_file")
public class JPolicyFile extends BaseInfoEntity {
public class JPolicyFile extends BaseInfoEntity {
/**
* Id
@ -53,7 +58,7 @@ public class JPolicyFile extends BaseInfoEntity {
/**
*
*/
@Excel(name = "政策等级",readConverterExp = "1=国家级,2=江苏省级,3=苏州市级,4=园区本级")
@Excel(name = "政策等级", readConverterExp = "1=国家级,2=江苏省级,3=苏州市级,4=园区本级")
@ApiModelProperty("政策等级 1国家级、2江苏省级、3苏州市级、4园区本级")
private Integer policyLevel;
@ -77,14 +82,14 @@ public class JPolicyFile extends BaseInfoEntity {
/**
* id
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableField(fill = FieldFill.INSERT)
private Long createId;
/**
* id
*/
@JSONField(serialize=false)
@JSONField(serialize = false)
@TableField(fill = FieldFill.UPDATE)
private Long updateId;
}

@ -1,6 +1,10 @@
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.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
@ -20,7 +24,7 @@ import java.util.Date;
@ApiModel("项目表")
@TableName(value = "j_project")
@Data
public class JProject{
public class JProject {
/**
* Id
*/

@ -4,7 +4,6 @@ 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.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -12,13 +11,14 @@ import lombok.Data;
/**
* j_services_list
*
* @author du
* @since 2024/7/26 15:29
*/
@Data
@ApiModel("服务业企业名单")
@TableName(value = "j_services_list")
public class JServicesList extends BaseInfoEntity {
public class JServicesList extends BaseInfoEntity {
/**
* Id

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

@ -1,6 +1,10 @@
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.ruoyi.jjh.common.entity.BaseInfoEntity;
import io.swagger.annotations.ApiModel;
@ -12,6 +16,7 @@ import java.time.LocalDateTime;
/**
* j_smart_reminders
*
* @author du
* @since 2024/7/1 13:33
*/
@ -36,7 +41,7 @@ public class JSmartReminders extends BaseInfoEntity {
/**
*
*/
@TableField(exist=false)
@TableField(exist = false)
@ApiModelProperty("企业名称")
private String qymc;

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

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

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

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

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

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

@ -1,7 +1,5 @@
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -14,6 +12,7 @@ import java.time.LocalDateTime;
/**
*
*
* @author du
* @since 2024/7/1 15:56
*/

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

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

Loading…
Cancel
Save