diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 7eea1eb..8da6e19 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -69,6 +69,12 @@ ruoyi-generator + + com.ruoyi + ruoyi-safecompany + ${ruoyi.version} + + diff --git a/ruoyi-safecompany/pom.xml b/ruoyi-safecompany/pom.xml index 751ef44..074a719 100644 --- a/ruoyi-safecompany/pom.xml +++ b/ruoyi-safecompany/pom.xml @@ -22,6 +22,25 @@ 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-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java index df4794e..f83005f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java +++ b/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 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 details = tbCompanyInformationReporting.getDetails(); diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java new file mode 100644 index 0000000..88a1f1b --- /dev/null +++ b/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 { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java index a6b2bea..0aca0b6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReporting.java +++ b/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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java index a9bb895..a49b230 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java +++ b/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 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingDetailsMapper.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingDetailsMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingDetailsMapper.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingDetailsMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingMapper.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingMapper.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/mapper/TbCompanyInformationReportingMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingDetailsService.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingDetailsService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingDetailsService.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingDetailsService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingService.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingService.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/ITbCompanyInformationReportingService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java index ace73a6..4558a65 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingDetailsServiceImpl.java +++ b/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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingServiceImpl.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingServiceImpl.java rename to ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/service/impl/TbCompanyInformationReportingServiceImpl.java diff --git a/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml b/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml similarity index 54% rename from ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml rename to ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml index fe91c17..96a9509 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml +++ b/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml b/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml similarity index 55% rename from ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml rename to ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml index b8756f6..bb49c8b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml +++ b/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/ruoyi-safecompany/target/maven-archiver/pom.properties b/ruoyi-safecompany/target/maven-archiver/pom.properties deleted file mode 100644 index 44e923e..0000000 --- a/ruoyi-safecompany/target/maven-archiver/pom.properties +++ /dev/null @@ -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 diff --git a/ruoyi-safecompany/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/ruoyi-safecompany/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/ruoyi-safecompany/target/ruoyi-safecompany-3.8.5.jar b/ruoyi-safecompany/target/ruoyi-safecompany-3.8.5.jar deleted file mode 100644 index c3ea81e..0000000 Binary files a/ruoyi-safecompany/target/ruoyi-safecompany-3.8.5.jar and /dev/null differ 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 deleted file mode 100644 index f6c5122..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingDetailsController.java +++ /dev/null @@ -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 { - -}