企业信息上报代码迁移

ruoyi-admin/pom.xml

@@ -69,6 +69,12 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-safecompany</artifactId>
+            <version>${ruoyi.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-safecompany/pom.xml

@@ -22,6 +22,25 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <!--lombok-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-annotations</artifactId>
+            <version>3.0.3</version>
+            <scope>compile</scope>
+        </dependency>
+
 
     </dependencies>
 

ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java

@@ -1,10 +1,7 @@
 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;
@@ -14,29 +11,21 @@ import com.ruoyi.business.companyInformationReporting.domain.TbCompanyInformatio
 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;
 
 /**
@@ -166,7 +155,10 @@ public class TbCompanyInformationReportingController extends BaseController {
         if(tbCompanyInformationReporting.getDetails()==null||tbCompanyInformationReporting.getDetails().size()<1){
             return error("上报详情信息三项不能都为空");
         }
-        if("0".equals(tbCompanyInformationReporting.getReportState())){
+        QueryWrapper<TbCompanyInformationReporting> tbCompanyInformationReportingQueryWrapper =new QueryWrapper<>();
+        tbCompanyInformationReportingQueryWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReporting.Fields.id),tbCompanyInformationReporting.getId());
+        TbCompanyInformationReporting serviceOne = tbCompanyInformationReportingService.getOne(tbCompanyInformationReportingQueryWrapper);
+        if("0".equals(serviceOne.getReportState())){
             return error("上报已提交不能修改");
         }
         List<TbCompanyInformationReportingDetails> details = tbCompanyInformationReporting.getDetails();

ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java

@@ -0,0 +1,17 @@
+package com.ruoyi.business.companyInformationReporting.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.controller.BaseController;
+
+/**
+ * 企业信息上报详情Controller
+ * 
+ * @author 张二富
+ * @date 2024-06-26
+ */
+@RestController
+@RequestMapping("/system/details")
+public class TbCompanyInformationReportingDetailsController extends BaseController {
+
+}

ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java

@@ -6,8 +6,6 @@ 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;
 

ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java

@@ -1,20 +1,14 @@
 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
  * 

ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java

@@ -7,14 +7,10 @@ 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;
 
 

ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingDetailsMapper">
+<mapper namespace="com.ruyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingDetailsMapper">
     
 
 </mapper>

ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingMapper">
+<mapper namespace="com.ruyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingMapper">
 
 </mapper>

ruoyi-safecompany/target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Wed Jun 26 15:45:31 CST 2024
-groupId=com.ruoyi
-artifactId=ruoyi-safecompany
-version=3.8.5

ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java

@@ -1,32 +0,0 @@
-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 {
-
-}