From 51ff871510e8cbebe203b9750621c92dace41820 Mon Sep 17 00:00:00 2001
From: zef <1146339010@QQ.com>
Date: Fri, 28 Jun 2024 14:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E4=B8=8A?=
=?UTF-8?q?=E6=8A=A5=E7=AC=AC=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/encodings.xml | 4 -
.idea/jarRepositories.xml | 5 +
.idea/misc.xml | 2 +-
.../src/main/resources/application.yml | 29 ++-
ruoyi-common/pom.xml | 13 +
.../core/controller/BaseController.java | 11 +
.../ruoyi/common/core/domain/BaseEntity.java | 18 ++
.../ruoyi/framework/config/MyBatisConfig.java | 132 ----------
.../framework/config/MybatisPlusConfig.java | 52 ++++
ruoyi-system/pom.xml | 18 ++
...CompanyInformationReportingController.java | 241 ++++++++++++++++++
...InformationReportingDetailsController.java | 32 +++
.../domain/TbCompanyInformationReporting.java | 108 ++++++++
.../TbCompanyInformationReportingDetails.java | 202 +++++++++++++++
...panyInformationReportingDetailsMapper.java | 17 ++
.../TbCompanyInformationReportingMapper.java | 19 ++
...anyInformationReportingDetailsService.java | 26 ++
...ITbCompanyInformationReportingService.java | 50 ++++
...nformationReportingDetailsServiceImpl.java | 101 ++++++++
...ompanyInformationReportingServiceImpl.java | 91 +++++++
...mpanyInformationReportingDetailsMapper.xml | 8 +
.../TbCompanyInformationReportingMapper.xml | 7 +
22 files changed, 1041 insertions(+), 145 deletions(-)
delete mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingDetailsMapper.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingMapper.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingDetailsService.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingService.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java
create mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingServiceImpl.java
create mode 100644 ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml
create mode 100644 ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index a3a1942..17ae090 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -4,17 +4,13 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 75cfc5c..9b2ff24 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
+
+
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 67e1e61..d5cd614 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,5 @@
-
+
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f1904e1..6e18581 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -98,15 +98,28 @@ token:
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 30
-
+
+# MyBatis Plus配置
+mybatis-plus:
+ global-config:
+ db-config:
+ where-strategy: not_empty
+ # 搜索指定包别名
+ typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.**.domain
+ # 配置mapper的扫描，找到所有的mapper.xml映射文件
+ mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper/**/**/*Mapper.xml
+ # 加载全局的配置文件
+ configLocation: classpath:mybatis/mybatis-config.xml
+
+
# MyBatis配置
-mybatis:
- # 搜索指定包别名
- typeAliasesPackage: com.ruoyi.**.domain
- # 配置mapper的扫描，找到所有的mapper.xml映射文件
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 加载全局的配置文件
- configLocation: classpath:mybatis/mybatis-config.xml
+#mybatis:
+# # 搜索指定包别名
+# typeAliasesPackage: com.ruoyi.**.domain
+# # 配置mapper的扫描，找到所有的mapper.xml映射文件
+# mapperLocations: classpath*:mapper/**/*Mapper.xml
+# # 加载全局的配置文件
+# configLocation: classpath:mybatis/mybatis-config.xml
# PageHelper分页插件
pagehelper:
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index b3b8b04..28b6d91 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -133,6 +133,19 @@
javax.servlet-api
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.5.1
+
+
+ io.swagger
+ swagger-annotations
+ 1.6.2
+ compile
+
+
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 818817d..ab6def6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -3,8 +3,10 @@ package com.ruoyi.common.core.controller;
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import com.ruoyi.common.core.domain.BaseTenantEntity;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,6 +95,15 @@ public class BaseController
return rspData;
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ protected R> getResultand(Map map) {
+ R rspData = new R<>();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("查询成功");
+ rspData.setData(map);
+ return rspData;
+ }
+
/**
* 返回成功
*/
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 15bf66b..7e3033c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -4,9 +4,12 @@ import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
/**
* Entity基类
@@ -15,31 +18,46 @@ import com.fasterxml.jackson.annotation.JsonInclude;
*/
public class BaseEntity implements Serializable
{
+ @TableField(exist = false)
private static final long serialVersionUID = 1L;
/** 搜索值 */
@JsonIgnore
+ @TableField(exist = false)
+ @ApiModelProperty(hidden = true)
private String searchValue;
/** 创建者 */
+ @TableField(exist = false)
+ @ApiModelProperty(hidden = true)
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @TableField(exist = false)
+ @ApiModelProperty(hidden = true)
private Date createTime;
/** 更新者 */
+ @TableField(exist = false)
+ @ApiModelProperty(hidden = true)
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ @ApiModelProperty(hidden = true)
private Date updateTime;
/** 备注 */
+ @TableField(exist = false)
+ @ApiModelProperty(hidden = true)
private String remark;
/** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
+ @TableField(exist = false)
+ @ApiModelProperty(hidden = true)
private Map params;
public String getSearchValue()
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
deleted file mode 100644
index 057c941..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import javax.sql.DataSource;
-import org.apache.ibatis.io.VFS;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.util.ClassUtils;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * Mybatis支持*匹配扫描包
- *
- * @author ruoyi
- */
-@Configuration
-public class MyBatisConfig
-{
- @Autowired
- private Environment env;
-
- static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
-
- public static String setTypeAliasesPackage(String typeAliasesPackage)
- {
- ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
- MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
- List allResult = new ArrayList();
- try
- {
- for (String aliasesPackage : typeAliasesPackage.split(","))
- {
- List result = new ArrayList();
- aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
- + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
- Resource[] resources = resolver.getResources(aliasesPackage);
- if (resources != null && resources.length > 0)
- {
- MetadataReader metadataReader = null;
- for (Resource resource : resources)
- {
- if (resource.isReadable())
- {
- metadataReader = metadataReaderFactory.getMetadataReader(resource);
- try
- {
- result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
- }
- catch (ClassNotFoundException e)
- {
- e.printStackTrace();
- }
- }
- }
- }
- if (result.size() > 0)
- {
- HashSet hashResult = new HashSet(result);
- allResult.addAll(hashResult);
- }
- }
- if (allResult.size() > 0)
- {
- typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
- }
- else
- {
- throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
- }
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- return typeAliasesPackage;
- }
-
- public Resource[] resolveMapperLocations(String[] mapperLocations)
- {
- ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
- List resources = new ArrayList();
- if (mapperLocations != null)
- {
- for (String mapperLocation : mapperLocations)
- {
- try
- {
- Resource[] mappers = resourceResolver.getResources(mapperLocation);
- resources.addAll(Arrays.asList(mappers));
- }
- catch (IOException e)
- {
- // ignore
- }
- }
- }
- return resources.toArray(new Resource[resources.size()]);
- }
-
- @Bean
- public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
- {
- String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
- String mapperLocations = env.getProperty("mybatis.mapperLocations");
- String configLocation = env.getProperty("mybatis.configLocation");
- typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
- VFS.addImplClass(SpringBootVFS.class);
-
- final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
- sessionFactory.setDataSource(dataSource);
- sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
- sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
- sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
- return sessionFactory.getObject();
- }
-}
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..5ffcce7
--- /dev/null
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
@@ -0,0 +1,52 @@
+package com.ruoyi.framework.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+public class MybatisPlusConfig {
+ @Bean
+ public MybatisPlusInterceptor mybatisPlusInterceptor() {
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+ // 分页插件
+ interceptor.addInnerInterceptor(paginationInnerInterceptor());
+ // 乐观锁插件
+ interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
+ // 阻断插件
+ interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+ return interceptor;
+ }
+
+ /**
+ * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html
+ */
+ public PaginationInnerInterceptor paginationInnerInterceptor() {
+ PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+ // 设置数据库类型为mysql
+ paginationInnerInterceptor.setDbType(DbType.MYSQL);
+ // 设置最大单页限制数量，默认 500 条，-1 不受限制
+ paginationInnerInterceptor.setMaxLimit(-1L);
+ return paginationInnerInterceptor;
+ }
+
+ /**
+ * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html
+ */
+ public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() {
+ return new OptimisticLockerInnerInterceptor();
+ }
+
+ /**
+ * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html
+ */
+ public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
+ return new BlockAttackInnerInterceptor();
+ }
+}
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index aa268bd..e019b34 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -22,6 +22,24 @@
com.ruoyi
ruoyi-common
+
+
+ org.projectlombok
+ lombok
+ true
+
+
+ io.swagger
+ swagger-annotations
+ 1.6.2
+ compile
+
+
+ com.github.xiaoymin
+ knife4j-annotations
+ 3.0.3
+ compile
+
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java
new file mode 100644
index 0000000..df4794e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java
@@ -0,0 +1,241 @@
+package com.ruoyi.business.companyInformationReporting.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReporting;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReportingDetails;
+import com.ruoyi.business.companyInformationReporting.service.impl.TbCompanyInformationReportingDetailsServiceImpl;
+import com.ruoyi.business.companyInformationReporting.service.impl.TbCompanyInformationReportingServiceImpl;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.DateUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.token.TokenService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 企业信息上报Controller
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@Api(tags = "企业信息上报")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/reporting")
+public class TbCompanyInformationReportingController extends BaseController {
+
+ private final TbCompanyInformationReportingServiceImpl tbCompanyInformationReportingService;
+ private final TbCompanyInformationReportingDetailsServiceImpl tbCompanyInformationReportingDetailsService;
+
+ /**
+ * 查询企业信息上报列表
+ */
+
+ @GetMapping("/list")
+ @ApiOperation("查询企业信息上报列表")
+ @ApiOperationSupport(author = "张二富", order = 1)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "reportMonth", value = "上报月份 1-12", dataType = "String", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "reportState", value = "上报状态 0=已提交,1=待提交", dataType = "String", dataTypeClass = String.class)
+ })
+ public TableDataInfo list(TbCompanyInformationReporting tbCompanyInformationReporting)
+ {
+ startPage();
+ List list = tbCompanyInformationReportingService.selectTbCompanyInformationReportingList(tbCompanyInformationReporting);
+ return getDataTable(list);
+ }
+
+
+ /**
+ * 获取企业信息上报详细信息
+ */
+ @GetMapping(value = "/{id}")
+ @ApiOperation("获取企业信息上报详细信息")
+ @ApiOperationSupport(author = "张二富", order = 5)
+ @ApiImplicitParam(name = "id", value = "企业信息上报id 列表返回的id", required = true)
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ if(id==null||id==0){
+ return error("企业信息上报id为空");
+ }
+ List byCompanyInformationReportingId = tbCompanyInformationReportingDetailsService.getByCompanyInformationReportingId(id);
+ TbCompanyInformationReporting tbCompanyInformationReporting = tbCompanyInformationReportingService.selectTbCompanyInformationReportingById(id);
+ tbCompanyInformationReporting.setDetails(byCompanyInformationReportingId);
+ return success(tbCompanyInformationReporting);
+ }
+
+ /**
+ * 新增企业信息上报
+ */
+ @PostMapping
+ @ApiOperation("新增企业信息上报")
+ @ApiOperationSupport(author = "张二富", order = 10)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "companyId", value = "公司id", dataType = "String", dataTypeClass = String.class ,required = true),
+ @ApiImplicitParam(name = "companyName", value = "公司名称", dataType = "String", dataTypeClass = String.class,required = true),
+ @ApiImplicitParam(name = "reportMonth", value = "上报月份 1-12", dataType = "String", dataTypeClass = String.class,required = true),
+ @ApiImplicitParam(name = "details", value = "上报详情信息 三项必填一项", dataType = "List", dataTypeClass = TbCompanyInformationReportingDetails.class,required = true)
+ })
+ public AjaxResult add(@RequestBody TbCompanyInformationReporting tbCompanyInformationReporting) {
+ if(tbCompanyInformationReporting==null){
+ return error("入参为空");
+ }
+ if(tbCompanyInformationReporting.getCompanyId()==null|| StringUtils.isBlank(tbCompanyInformationReporting.getCompanyName())||StringUtils.isBlank(tbCompanyInformationReporting.getReportMonth())){
+ return error("参数异常 请检查 企业id 企业名称 上报月份 是否为空");
+ }
+ if(tbCompanyInformationReporting.getDetails()==null||tbCompanyInformationReporting.getDetails().size()<1){
+ return error("上报详情信息三项不能都为空");
+ }
+ List details = tbCompanyInformationReporting.getDetails();
+ for (TbCompanyInformationReportingDetails detail : details) {
+ if(tbCompanyInformationReportingDetailsService.group1FieldsEmptyByCompanyThreePreventionData(detail)){
+ tbCompanyInformationReporting.setCompanyThreePreventionData("0");
+ }else {
+ tbCompanyInformationReporting.setCompanyThreePreventionData("1");
+ }
+ if(tbCompanyInformationReportingDetailsService.group2FieldsEmptyBySystemPlanExercise(detail)){
+ tbCompanyInformationReporting.setSystemPlanExercise("0");
+ }else {
+ tbCompanyInformationReporting.setSystemPlanExercise("1");
+ }
+ if(tbCompanyInformationReportingDetailsService.group3FieldsEmptyByInspectionResult(detail)){
+ tbCompanyInformationReporting.setInspectionResult("0");
+ }else {
+ tbCompanyInformationReporting.setInspectionResult("1");
+ }
+ detail.setCreateTime(DateUtils.getNowDate());
+ }
+ tbCompanyInformationReporting.setReportState("1");
+ int i = tbCompanyInformationReportingService.insertTbCompanyInformationReporting(tbCompanyInformationReporting);
+ boolean saveBatch = tbCompanyInformationReportingDetailsService.saveBatch(details);
+ if(!saveBatch){
+ i=0;
+ }
+ return toAjax(i);
+ }
+
+ /**
+ * 修改企业信息上报
+ */
+ @PutMapping
+ @ApiOperation("修改企业信息上报")
+ @ApiOperationSupport(author = "张二富", order = 15)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "企业信息上报id", dataType = "Long", dataTypeClass = Long.class ,required = true),
+ @ApiImplicitParam(name = "companyId", value = "公司id", dataType = "Long", dataTypeClass = Long.class ,required = true),
+ @ApiImplicitParam(name = "companyName", value = "公司名称", dataType = "String", dataTypeClass = String.class,required = true),
+ @ApiImplicitParam(name = "reportMonth", value = "上报月份 1-12", dataType = "String", dataTypeClass = String.class,required = true),
+ @ApiImplicitParam(name = "details", value = "上报详情信息 三项必填一项 id字段也必填", dataType = "List", dataTypeClass = TbCompanyInformationReportingDetails.class,required = true)
+ })
+ public AjaxResult edit(@RequestBody TbCompanyInformationReporting tbCompanyInformationReporting) {
+ if(tbCompanyInformationReporting==null){
+ return error("入参为空");
+ }
+ if(tbCompanyInformationReporting.getId()==null){
+ return error("参数企业信息上报id为空");
+ }
+ if(tbCompanyInformationReporting.getCompanyId()==null|| StringUtils.isBlank(tbCompanyInformationReporting.getCompanyName())||StringUtils.isBlank(tbCompanyInformationReporting.getReportMonth())){
+ return error("参数异常 请检查 企业id 企业名称 上报月份 是否为空");
+ }
+ if(tbCompanyInformationReporting.getDetails()==null||tbCompanyInformationReporting.getDetails().size()<1){
+ return error("上报详情信息三项不能都为空");
+ }
+ if("0".equals(tbCompanyInformationReporting.getReportState())){
+ return error("上报已提交不能修改");
+ }
+ List details = tbCompanyInformationReporting.getDetails();
+ boolean sing=false;
+ boolean batchById = false;
+ for (TbCompanyInformationReportingDetails detail : details) {
+ detail.setCompanyInformationReportingId(tbCompanyInformationReporting.getId());
+ if(StringUtils.isBlank(detail.getDataType())){
+ sing=true;
+ break;
+ }
+ if("1".equals(detail.getDataType())){
+ if(tbCompanyInformationReportingDetailsService.group1FieldsEmptyByCompanyThreePreventionData(detail)){
+ tbCompanyInformationReporting.setCompanyThreePreventionData("0");
+ }else {
+ tbCompanyInformationReporting.setCompanyThreePreventionData("1");
+ }
+ }
+ if("2".equals(detail.getDataType())){
+ if(tbCompanyInformationReportingDetailsService.group2FieldsEmptyBySystemPlanExercise(detail)){
+ tbCompanyInformationReporting.setSystemPlanExercise("0");
+ }else {
+ tbCompanyInformationReporting.setSystemPlanExercise("1");
+ }
+ }
+ if("3".equals(detail.getDataType())){
+ if(tbCompanyInformationReportingDetailsService.group3FieldsEmptyByInspectionResult(detail)){
+ tbCompanyInformationReporting.setInspectionResult("0");
+ }else {
+ tbCompanyInformationReporting.setInspectionResult("1");
+ }
+ }
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReportingDetails.Fields.dataType),detail.getDataType());
+ queryWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReportingDetails.Fields.companyInformationReportingId),tbCompanyInformationReporting.getId());
+ TbCompanyInformationReportingDetails one = tbCompanyInformationReportingDetailsService.getOne(queryWrapper);
+
+ if(one==null){
+ detail.setCreateTime(DateUtils.getNowDate());
+ batchById=tbCompanyInformationReportingDetailsService.save(detail);
+ }else {
+ if(!one.getId().equals(Optional.ofNullable(detail.getId()).orElse(0L))){
+ detail.setId(one.getId());
+ }
+ detail.setUpdateTime(DateUtils.getNowDate());
+ batchById=tbCompanyInformationReportingDetailsService.updateById(detail);
+ }
+ }
+ if(sing){
+ return error("上报详情类型为空");
+ }
+ int i = tbCompanyInformationReportingService.updateTbCompanyInformationReporting(tbCompanyInformationReporting);
+
+ if(!batchById){
+ i=0;
+ }
+ return toAjax(i);
+ }
+
+ /**
+ * 修改企业信息上报
+ */
+ @PutMapping("/changeState")
+ public AjaxResult changeState(@RequestBody TbCompanyInformationReporting tbCompanyInformationReporting){
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReporting.Fields.id),tbCompanyInformationReporting.getId());
+ updateWrapper.set(StringUtils.camelToUnderline(TbCompanyInformationReporting.Fields.reportState),"0");
+ updateWrapper.set("update_time",DateUtils.getNowDate());
+ return toAjax(tbCompanyInformationReportingService.update(updateWrapper));
+ }
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java
new file mode 100644
index 0000000..f6c5122
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java
@@ -0,0 +1,32 @@
+package com.ruoyi.business.companyInformationReporting.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 企业信息上报详情Controller
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@RestController
+@RequestMapping("/system/details")
+public class TbCompanyInformationReportingDetailsController extends BaseController {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java
new file mode 100644
index 0000000..a6b2bea
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java
@@ -0,0 +1,108 @@
+package com.ruoyi.business.companyInformationReporting.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 企业信息上报对象 tb_company_information_reporting
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "tb_company_information_reporting")
+@Accessors
+@FieldNameConstants
+public class TbCompanyInformationReporting extends BaseEntity {
+
+
+ /** 主键 */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "主键id", position = 1)
+ private Long id;
+
+ /** 企业id */
+ @Excel(name = "企业id")
+ @ApiModelProperty(value = "公司id", position = 5)
+ private Long companyId;
+
+ /** 公司名称 */
+ @Excel(name = "公司名称")
+ @TableField(condition = SqlCondition.LIKE)
+ @ApiModelProperty(value = "公司名称", position = 10)
+ private String companyName;
+
+ /** 上报月份 */
+ @Excel(name = "上报月份")
+ @TableField(condition = SqlCondition.EQUAL)
+ @ApiModelProperty(value = "上报月份", position = 15)
+ private String reportMonth;
+
+ /** 上报状态（0 已提交 1待提交） */
+ @Excel(name = "上报状态", readConverterExp = "0=,已=提交,1=待提交")
+ @TableField(condition = SqlCondition.EQUAL)
+ @ApiModelProperty(value = "上报状态（0 已提交 1待提交）", position = 20)
+ private String reportState;
+
+ /** 企业三防基础数据（0 是 1否） */
+ @Excel(name = "企业三防基础数据", readConverterExp = "0=,是=,1=否")
+ @ApiModelProperty(value = "企业三防基础数据（0 是 1否）", position = 25)
+ private String companyThreePreventionData;
+
+ /** 规章制度，应急预案，应急演练（0 是 1否） */
+ @Excel(name = "规章制度，应急预案，应急演练", readConverterExp = "0=,是=,1=否")
+ @ApiModelProperty(value = "规章制度，应急预案，应急演练（0 是 1否）", position = 30)
+ private String systemPlanExercise;
+
+ /** 部门检查结果（0 是 1否） */
+ @Excel(name = "部门检查结果", readConverterExp = "0=,是=,1=否")
+ @ApiModelProperty(value = "部门检查结果（0 是 1否）", position = 35)
+ private String inspectionResult;
+
+ /** 企业信息上报详情 */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "企业信息上报详情", position = 40)
+ private List details;
+
+ /** 0:不活跃,1:活跃 */
+ @Excel(name = "0:不活跃,1:活跃")
+ @ApiModelProperty(value = "0:不活跃,1:活跃", position = 45)
+ private String isActive;
+
+ /** 扩展字段c1 */
+ @Excel(name = "扩展字段c1")
+ @ApiModelProperty(hidden = true)
+ private String c1;
+
+ /** 扩展字段c2 */
+ @Excel(name = "扩展字段c2")
+ @ApiModelProperty(hidden = true)
+ private String c2;
+
+ /** 扩展字段c3 */
+ @Excel(name = "扩展字段c3")
+ @ApiModelProperty(hidden = true)
+ private String c3;
+
+ /** 扩展字段c4 */
+ @Excel(name = "扩展字段c4")
+ @ApiModelProperty(hidden = true)
+ private String c4;
+
+ /** 扩展字段c5 */
+ @Excel(name = "扩展字段c5")
+ @ApiModelProperty(hidden = true)
+ private String c5;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java
new file mode 100644
index 0000000..a9bb895
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java
@@ -0,0 +1,202 @@
+package com.ruoyi.business.companyInformationReporting.domain;
+
+import com.ruoyi.common.annotation.DataSource;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 企业信息上报详情对象 tb_company_information_reporting_details
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "tb_company_information_reporting_details")
+@Accessors(chain = true)
+@FieldNameConstants
+public class TbCompanyInformationReportingDetails extends BaseEntity
+{
+
+
+ /** 主键 */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "主键id", position = 1)
+ private Long id;
+
+ /** 数据上报表id */
+ @Excel(name = "数据上报表id")
+ @ApiModelProperty(value = "数据上报表id", position = 5)
+ private Long companyInformationReportingId;
+
+ /** 数据类型 （1企业三防基础数据 2规章制度，应急预案，应急演练 3部门检查） */
+ @Excel(name = "数据类型 ", readConverterExp = "1=企业三防基础数据,2=规章制度，应急预案，应急演练,3=部门检查")
+ @ApiModelProperty(value = "数据类型 （1企业三防基础数据 2规章制度，应急预案，应急演练 3部门检查）", position = 10)
+ private String dataType;
+
+ /** 值班人员总数 */
+ @Excel(name = "值班人员总数")
+ @ApiModelProperty(value = "值班人员总数", position = 15)
+ private String totalNum;
+
+ /** 巡逻人员数 */
+ @Excel(name = "巡逻人员数")
+ @ApiModelProperty(value = "巡逻人员数", position = 20)
+ private String patrolNum;
+
+ /** 应急处理人员数 */
+ @Excel(name = "应急处理人员数")
+ @ApiModelProperty(value = "应急处理人员数", position = 25)
+ private String emergencyProcessingNum;
+
+ /** 企业围墙长度 */
+ @Excel(name = "企业围墙长度")
+ @ApiModelProperty(value = "企业围墙长度", position = 30)
+ private String wallLength;
+
+ /** 防盗门数 */
+ @Excel(name = "防盗门数")
+ @ApiModelProperty(value = "防盗门数", position = 35)
+ private String securityDoorNum;
+
+ /** 防爆桶数 */
+ @Excel(name = "防爆桶数")
+ @ApiModelProperty(value = "防爆桶数", position = 40)
+ private String explosionPreventionNum;
+
+ /** 盾牌钢叉数 */
+ @Excel(name = "盾牌钢叉数")
+ @ApiModelProperty(value = "盾牌钢叉数", position = 45)
+ private String shieldForkNum;
+
+ /** 防刺服数 */
+ @Excel(name = "防刺服数")
+ @ApiModelProperty(value = "防刺服数", position = 45)
+ private String preventPunctureClothingNum;
+
+ /** 防暴警棍数 */
+ @Excel(name = "防暴警棍数")
+ @ApiModelProperty(value = "防暴警棍数", position = 50)
+ private String riotBatonsNum;
+
+ /** 视频监控数 */
+ @Excel(name = "视频监控数")
+ @ApiModelProperty(value = "视频监控数", position = 55)
+ private String videoSurveillanceNum;
+
+ /** 人行闸机数 */
+ @Excel(name = "人行闸机数")
+ @ApiModelProperty(value = "人行闸机数", position = 60)
+ private String pedestrianBrakesNum;
+
+ /** 楼宇对讲数 */
+ @Excel(name = "楼宇对讲数")
+ @ApiModelProperty(value = "楼宇对讲数", position = 65)
+ private String buildingIntercomNum;
+
+ /** 人脸门禁数 */
+ @Excel(name = "人脸门禁数")
+ @ApiModelProperty(value = "人脸门禁数", position = 70)
+ private String faceControlNum;
+
+ /** 电子脉冲长度 */
+ @Excel(name = "电子脉冲长度")
+ @ApiModelProperty(value = "电子脉冲长度", position = 75)
+ private String electronPulseLength;
+
+ /** 人脸摄像头数 */
+ @Excel(name = "人脸摄像头数")
+ @ApiModelProperty(value = "人脸摄像头数", position = 80)
+ private String faceCamerasNum;
+
+ /** 车辆道闸数 */
+ @Excel(name = "车辆道闸数")
+ @ApiModelProperty(value = "车辆道闸数", position = 85)
+ private String vehicleGatesNum;
+
+ /** 指纹识别数 */
+ @Excel(name = "指纹识别数")
+ @ApiModelProperty(value = "指纹识别数", position = 90)
+ private String fingerprintIdentificationNum;
+
+ /** 周界报警长度 */
+ @Excel(name = "周界报警长度")
+ @ApiModelProperty(value = "周界报警长度", position = 95)
+ private String perimeterAlarmLength;
+
+ /** 紧急报警设施数 */
+ @Excel(name = "紧急报警设施数")
+ @ApiModelProperty(value = "紧急报警设施数", position = 100)
+ private String emergencyAlarmFacilitiesNum;
+
+ /** 企业应急管理制度 */
+ @Excel(name = "企业应急管理制度")
+ @ApiModelProperty(value = "企业应急管理制度(0是 1否)", position = 105)
+ private String emergencyManagement;
+
+ /** 应急预案 */
+ @Excel(name = "应急预案")
+ @ApiModelProperty(value = "应急预案 (0是 1否)", position = 110)
+ private String emergencyPlan;
+
+ /** 应急演练 */
+ @Excel(name = "应急演练")
+ @ApiModelProperty(value = "应急演练", position = 115)
+ private String emergencyRehearsal;
+
+ /** 内部治安检查 */
+ @Excel(name = "内部治安检查")
+ @ApiModelProperty(value = "内部治安检查(0是 1否)", position = 120)
+ private String internalSecurityInspection;
+
+ /** 治安设施检查 */
+ @Excel(name = "治安设施检查")
+ @ApiModelProperty(value = "治安设施检查(0是 1否)", position = 125)
+ private String securityFacilityInspection;
+
+ /** 0:不活跃,1:活跃 */
+ @Excel(name = "0:不活跃,1:活跃")
+ @ApiModelProperty(value = "0:不活跃,1:活跃", position = 45)
+ private String isActive;
+
+ /** 扩展字段c1 */
+ @Excel(name = "扩展字段c1")
+ @ApiModelProperty(hidden = true)
+ private String c1;
+
+ /** 扩展字段c2 */
+ @Excel(name = "扩展字段c2")
+ @ApiModelProperty(hidden = true)
+ private String c2;
+
+ /** 扩展字段c3 */
+ @Excel(name = "扩展字段c3")
+ @ApiModelProperty(hidden = true)
+ private String c3;
+
+ /** 扩展字段c4 */
+ @Excel(name = "扩展字段c4")
+ @ApiModelProperty(hidden = true)
+ private String c4;
+
+ /** 扩展字段c5 */
+ @Excel(name = "扩展字段c5")
+ @ApiModelProperty(hidden = true)
+ private String c5;
+
+
+
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingDetailsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingDetailsMapper.java
new file mode 100644
index 0000000..03cf280
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingDetailsMapper.java
@@ -0,0 +1,17 @@
+package com.ruoyi.business.companyInformationReporting.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReportingDetails;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 企业信息上报详情Mapper接口
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@Mapper
+public interface TbCompanyInformationReportingDetailsMapper extends BaseMapper {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingMapper.java
new file mode 100644
index 0000000..27b2dac
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingMapper.java
@@ -0,0 +1,19 @@
+package com.ruoyi.business.companyInformationReporting.mapper;
+
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReporting;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 企业信息上报Mapper接口
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@Mapper
+public interface TbCompanyInformationReportingMapper extends BaseMapper {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingDetailsService.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingDetailsService.java
new file mode 100644
index 0000000..ad8a907
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingDetailsService.java
@@ -0,0 +1,26 @@
+package com.ruoyi.business.companyInformationReporting.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReportingDetails;
+
+import java.util.List;
+
+
+/**
+ * 企业信息上报详情Service接口
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+public interface ITbCompanyInformationReportingDetailsService extends IService {
+
+ boolean group1FieldsEmptyByCompanyThreePreventionData(TbCompanyInformationReportingDetails data);
+
+ boolean group2FieldsEmptyBySystemPlanExercise(TbCompanyInformationReportingDetails data);
+
+ boolean group3FieldsEmptyByInspectionResult(TbCompanyInformationReportingDetails data);
+
+ List getByCompanyInformationReportingId(Long companyInformationReportingId);
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingService.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingService.java
new file mode 100644
index 0000000..da5012c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingService.java
@@ -0,0 +1,50 @@
+package com.ruoyi.business.companyInformationReporting.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReporting;
+
+
+/**
+ * 企业信息上报Service接口
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+public interface ITbCompanyInformationReportingService extends IService
+{
+ /**
+ * 查询企业信息上报
+ *
+ * @param id 企业信息上报主键
+ * @return 企业信息上报
+ */
+ public TbCompanyInformationReporting selectTbCompanyInformationReportingById(Long id);
+
+ /**
+ * 查询企业信息上报列表
+ *
+ * @param tbCompanyInformationReporting 企业信息上报
+ * @return 企业信息上报集合
+ */
+ public List selectTbCompanyInformationReportingList(TbCompanyInformationReporting tbCompanyInformationReporting);
+
+ /**
+ * 新增企业信息上报
+ *
+ * @param tbCompanyInformationReporting 企业信息上报
+ * @return 结果
+ */
+ public int insertTbCompanyInformationReporting(TbCompanyInformationReporting tbCompanyInformationReporting);
+
+ /**
+ * 修改企业信息上报
+ *
+ * @param tbCompanyInformationReporting 企业信息上报
+ * @return 结果
+ */
+ public int updateTbCompanyInformationReporting(TbCompanyInformationReporting tbCompanyInformationReporting);
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java
new file mode 100644
index 0000000..ace73a6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java
@@ -0,0 +1,101 @@
+package com.ruoyi.business.companyInformationReporting.service.impl;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReporting;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReportingDetails;
+import com.ruoyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingDetailsMapper;
+import com.ruoyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingMapper;
+import com.ruoyi.business.companyInformationReporting.service.ITbCompanyInformationReportingDetailsService;
+import com.ruoyi.common.utils.DateUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 企业信息上报详情Service业务层处理
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@Service
+@RequiredArgsConstructor
+public class TbCompanyInformationReportingDetailsServiceImpl extends ServiceImpl implements ITbCompanyInformationReportingDetailsService {
+
+ public boolean group1FieldsEmptyByCompanyThreePreventionData(TbCompanyInformationReportingDetails data) {
+ List fields = Arrays.asList(
+ data.getTotalNum(),
+ data.getPatrolNum(),
+ data.getEmergencyProcessingNum(),
+ data.getWallLength(),
+ data.getSecurityDoorNum(),
+ data.getExplosionPreventionNum(),
+ data.getShieldForkNum(),
+ data.getPreventPunctureClothingNum(),
+ data.getRiotBatonsNum(),
+ data.getVideoSurveillanceNum(),
+ data.getPedestrianBrakesNum(),
+ data.getBuildingIntercomNum(),
+ data.getFaceControlNum(),
+ data.getElectronPulseLength(),
+ data.getFaceCamerasNum(),
+ data.getVehicleGatesNum(),
+ data.getFingerprintIdentificationNum(),
+ data.getPerimeterAlarmLength(),
+ data.getEmergencyAlarmFacilitiesNum()
+ );
+
+ for (String field : fields) {
+ if (field != null && !field.isEmpty()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean group2FieldsEmptyBySystemPlanExercise(TbCompanyInformationReportingDetails data) {
+
+ List fields = Arrays.asList(
+ data.getEmergencyManagement(),
+ data.getEmergencyPlan()
+ );
+
+ String emergencyRehearsal = data.getEmergencyRehearsal();
+ for (String field : fields) {
+ if (field != null && !field.isEmpty()&&"0".equals(field)) {
+ return true;
+ }
+ }
+ return emergencyRehearsal != null && !emergencyRehearsal.isEmpty();
+ }
+
+ public boolean group3FieldsEmptyByInspectionResult(TbCompanyInformationReportingDetails data) {
+ List fields = Arrays.asList(
+ data.getInternalSecurityInspection(),
+ data.getSecurityFacilityInspection()
+ );
+
+ for (String field : fields) {
+ if (field != null && !field.isEmpty()&&"0".equals(field)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public List getByCompanyInformationReportingId(Long companyInformationReportingId) {
+ QueryWrapper tbCompanyInformationReportingDetailsQueryWrapper = new QueryWrapper<>();
+ Optional.of(companyInformationReportingId)
+ .ifPresent(id->{
+ tbCompanyInformationReportingDetailsQueryWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReportingDetails.Fields.companyInformationReportingId),companyInformationReportingId);
+ });
+ return this.list(tbCompanyInformationReportingDetailsQueryWrapper);
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingServiceImpl.java
new file mode 100644
index 0000000..039be35
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingServiceImpl.java
@@ -0,0 +1,91 @@
+package com.ruoyi.business.companyInformationReporting.service.impl;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformationReporting;
+import com.ruoyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingMapper;
+import com.ruoyi.business.companyInformationReporting.service.ITbCompanyInformationReportingService;
+import com.ruoyi.common.utils.DateUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 企业信息上报Service业务层处理
+ *
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@RequiredArgsConstructor
+@Service
+public class TbCompanyInformationReportingServiceImpl extends ServiceImpl implements ITbCompanyInformationReportingService
+{
+ private final TbCompanyInformationReportingMapper tbCompanyInformationReportingMapper;
+
+
+
+ /**
+ * 查询企业信息上报
+ *
+ * @param id 企业信息上报主键
+ * @return 企业信息上报
+ */
+ @Override
+ public TbCompanyInformationReporting selectTbCompanyInformationReportingById(Long id)
+ {
+ return tbCompanyInformationReportingMapper.selectById(id);
+ }
+
+ /**
+ * 查询企业信息上报列表
+ *
+ * @param tbCompanyInformationReporting 企业信息上报
+ * @return 企业信息上报
+ */
+ @Override
+ public List selectTbCompanyInformationReportingList(TbCompanyInformationReporting tbCompanyInformationReporting)
+ {
+ QueryWrapper tbCompanyInformationReportingQueryWrapper = new QueryWrapper<>();
+ Optional.ofNullable(tbCompanyInformationReporting.getReportMonth())
+ .ifPresent(reportMonth->{
+ tbCompanyInformationReportingQueryWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReporting.Fields.reportMonth),reportMonth);
+ });
+ Optional.ofNullable(tbCompanyInformationReporting.getReportState())
+ .ifPresent(reportState->{
+ tbCompanyInformationReportingQueryWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReporting.Fields.reportState),reportState);
+ });
+ return tbCompanyInformationReportingMapper.selectList(tbCompanyInformationReportingQueryWrapper);
+ }
+
+ /**
+ * 新增企业信息上报
+ *
+ * @param tbCompanyInformationReporting 企业信息上报
+ * @return 结果
+ */
+ @Override
+ public int insertTbCompanyInformationReporting(TbCompanyInformationReporting tbCompanyInformationReporting) {
+
+ tbCompanyInformationReporting.setCreateTime(DateUtils.getNowDate());
+ return tbCompanyInformationReportingMapper.insert(tbCompanyInformationReporting);
+ }
+
+ /**
+ * 修改企业信息上报
+ *
+ * @param tbCompanyInformationReporting 企业信息上报
+ * @return 结果
+ */
+ @Override
+ public int updateTbCompanyInformationReporting(TbCompanyInformationReporting tbCompanyInformationReporting)
+ {
+ tbCompanyInformationReporting.setUpdateTime(DateUtils.getNowDate());
+ return tbCompanyInformationReportingMapper.updateById(tbCompanyInformationReporting);
+ }
+
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml
new file mode 100644
index 0000000..fe91c17
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml
new file mode 100644
index 0000000..b8756f6
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file