diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 6bb8f76..92f03b5 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -72,7 +72,7 @@ spring: # 地址 host: 1.94.45.26 # 端口,默认为6379 - port: 10052 + port: 10054 # 数据库索引 database: 10 # 密码 diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/controller/TbCompanyRectifictionController.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/controller/TbCompanyRectifictionController.java index f79473e..9ec6336 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/controller/TbCompanyRectifictionController.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/controller/TbCompanyRectifictionController.java @@ -228,13 +228,19 @@ public class TbCompanyRectifictionController extends BaseController { //获取登陆人员所在公司 return loginUser.getUser().getCompanyName(); } - @GetMapping("/getLoginUserInfo") - @ApiOperation("获取公司基本信息") + public TbCompanyInfo getLoginUserCompanyInfo(){ LoginUser loginUser = SecurityUtils.getLoginUser(); //获取登陆人员所在公司 return tbCompanyInfoService.getOne(new LambdaQueryWrapper().eq(TbCompanyInfo::getCompanyName, loginUser.getUser().getCompanyName())); } + @GetMapping("/getLoginUserInfo") + @ApiOperation("获取公司基本信息") + public AjaxResult getLoginUserCompanyInfodetail(){ + LoginUser loginUser = SecurityUtils.getLoginUser(); + //获取登陆人员所在公司 + return success(tbCompanyInfoService.getOne(new LambdaQueryWrapper().eq(TbCompanyInfo::getCompanyName, loginUser.getUser().getCompanyName()))); + } } diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbCompanyInfo.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbCompanyInfo.java index 2892812..3a812aa 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbCompanyInfo.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbCompanyInfo.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.until.EntiyUntil; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -63,6 +64,7 @@ public class TbCompanyInfo extends EntiyUntil { * 成立日期 */ @ApiModelProperty("成立日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date establishDate; /** * 营业期限 diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScore.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScore.java index c0b6ba3..8761fc9 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScore.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScore.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.until.EntiyUntil; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -59,6 +60,7 @@ public class TbSafeCompanyStatisticsScore extends EntiyUntil { * 创建时间 */ @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 创建者 @@ -69,6 +71,7 @@ public class TbSafeCompanyStatisticsScore extends EntiyUntil { * 更新时间 */ @ApiModelProperty("更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** * 更新者 diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScoreDetail.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScoreDetail.java index f537165..588cf5a 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScoreDetail.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScoreDetail.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.until.EntiyUntil; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -96,6 +97,7 @@ public class TbSafeCompanyStatisticsScoreDetail extends EntiyUntil { * 创建时间 */ @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 创建者 @@ -106,6 +108,7 @@ public class TbSafeCompanyStatisticsScoreDetail extends EntiyUntil { * 更新时间 */ @ApiModelProperty("更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** * 更新者 diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSpecialCountRecord.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSpecialCountRecord.java index 2710e0c..8a29a94 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSpecialCountRecord.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSpecialCountRecord.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.until.EntiyUntil; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -82,6 +83,7 @@ public class TbSpecialCountRecord extends EntiyUntil { * 更新时间 */ @ApiModelProperty("更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSynergismEnterpriseSupervision.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSynergismEnterpriseSupervision.java index 5762721..1b038af 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSynergismEnterpriseSupervision.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/enterpriserectification/pojo/TbSynergismEnterpriseSupervision.java @@ -36,7 +36,6 @@ public class TbSynergismEnterpriseSupervision extends EntiyUntil { /** * 企业名称 */ - @NotBlank(message="[企业名称]不能为空") @Size(max= 255,message="编码长度不能超过255") @ApiModelProperty("企业名称") @Length(max= 255,message="编码长度不能超过255") @@ -59,16 +58,19 @@ public class TbSynergismEnterpriseSupervision extends EntiyUntil { * 纳入监管时间 */ @ApiModelProperty("纳入监管时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date includedSupervisionTime; /** * 清单生成时间 */ @ApiModelProperty("清单生成时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date checklistGenerationTime; /** * 整改截止日期 */ @ApiModelProperty("整改截止日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date rectificationDeadline; /** * 整改状态 @@ -195,8 +197,8 @@ public class TbSynergismEnterpriseSupervision extends EntiyUntil { /** * 创建时间 */ - @NotNull(message="[创建时间]不能为空") @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 创建者 @@ -207,6 +209,7 @@ public class TbSynergismEnterpriseSupervision extends EntiyUntil { * 更新时间 */ @ApiModelProperty("更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** * 更新者 diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/controller/TbCompanyVerificationController.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/controller/TbCompanyVerificationController.class new file mode 100644 index 0000000..f70e752 Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/controller/TbCompanyVerificationController.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/controller/TbVerificationUserDetailsController.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/controller/TbVerificationUserDetailsController.class new file mode 100644 index 0000000..68198b9 Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/controller/TbVerificationUserDetailsController.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbCompanyVerification$Fields.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbCompanyVerification$Fields.class new file mode 100644 index 0000000..8a09e44 Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbCompanyVerification$Fields.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbCompanyVerification.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbCompanyVerification.class new file mode 100644 index 0000000..813ef85 Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbCompanyVerification.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbVerificationUserDetails$Fields.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbVerificationUserDetails$Fields.class new file mode 100644 index 0000000..3e281dc Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbVerificationUserDetails$Fields.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbVerificationUserDetails.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbVerificationUserDetails.class new file mode 100644 index 0000000..f42fc3d Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/domain/TbVerificationUserDetails.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/mapper/TbCompanyVerificationMapper.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/mapper/TbCompanyVerificationMapper.class new file mode 100644 index 0000000..6f575c8 Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/mapper/TbCompanyVerificationMapper.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/mapper/TbVerificationUserDetailsMapper.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/mapper/TbVerificationUserDetailsMapper.class new file mode 100644 index 0000000..d23304f Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/mapper/TbVerificationUserDetailsMapper.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/ITbCompanyVerificationService.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/ITbCompanyVerificationService.class new file mode 100644 index 0000000..0d60ee2 Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/ITbCompanyVerificationService.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/ITbVerificationUserDetailsService.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/ITbVerificationUserDetailsService.class new file mode 100644 index 0000000..8025ab5 Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/ITbVerificationUserDetailsService.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/impl/TbCompanyVerificationServiceImpl.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/impl/TbCompanyVerificationServiceImpl.class new file mode 100644 index 0000000..5dcab9e Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/impl/TbCompanyVerificationServiceImpl.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/impl/TbVerificationUserDetailsServiceImpl.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/impl/TbVerificationUserDetailsServiceImpl.class new file mode 100644 index 0000000..64ca401 Binary files /dev/null and b/ruoyi-safecompany/target/classes/com/ruoyi/business/anHuiEnterprise/service/impl/TbVerificationUserDetailsServiceImpl.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.class index 1d5cfd8..80dbd72 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails$Fields.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails$Fields.class index d0b1fb0..332a71b 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails$Fields.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails$Fields.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.class index 82a712f..7987b0d 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/controller/TbCompanyRectifictionController.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/controller/TbCompanyRectifictionController.class index f9bb31d..7734d13 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/controller/TbCompanyRectifictionController.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/controller/TbCompanyRectifictionController.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbCompanyInfo.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbCompanyInfo.class index 688a76e..3e8363f 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbCompanyInfo.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbCompanyInfo.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScore.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScore.class index 856fa12..e07cc00 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScore.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScore.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScoreDetail.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScoreDetail.class index c01161d..3cba378 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScoreDetail.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSafeCompanyStatisticsScoreDetail.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSpecialCountRecord.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSpecialCountRecord.class index 09b120c..fdd3de0 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSpecialCountRecord.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSpecialCountRecord.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSynergismEnterpriseSupervision.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSynergismEnterpriseSupervision.class index 75901d1..2451607 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSynergismEnterpriseSupervision.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/pojo/TbSynergismEnterpriseSupervision.class differ diff --git a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/service/impl/TbCompanyInfoServiceImpl.class b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/service/impl/TbCompanyInfoServiceImpl.class index c677cdd..46dbf7c 100644 Binary files a/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/service/impl/TbCompanyInfoServiceImpl.class and b/ruoyi-safecompany/target/classes/com/ruoyi/business/enterpriserectification/service/impl/TbCompanyInfoServiceImpl.class differ diff --git a/ruoyi-safecompany/target/classes/mapper/system/TbCompanyInformationReportingDetailsMapper.xml b/ruoyi-safecompany/target/classes/mapper/system/TbCompanyInformationReportingDetailsMapper.xml index 96a9509..fe91c17 100644 --- a/ruoyi-safecompany/target/classes/mapper/system/TbCompanyInformationReportingDetailsMapper.xml +++ b/ruoyi-safecompany/target/classes/mapper/system/TbCompanyInformationReportingDetailsMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-safecompany/target/classes/mapper/system/TbCompanyInformationReportingMapper.xml b/ruoyi-safecompany/target/classes/mapper/system/TbCompanyInformationReportingMapper.xml index bb49c8b..b8756f6 100644 --- a/ruoyi-safecompany/target/classes/mapper/system/TbCompanyInformationReportingMapper.xml +++ b/ruoyi-safecompany/target/classes/mapper/system/TbCompanyInformationReportingMapper.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/ruoyi-safecompany/target/classes/mapper/system/TbCompanyVerificationMapper.xml b/ruoyi-safecompany/target/classes/mapper/system/TbCompanyVerificationMapper.xml new file mode 100644 index 0000000..948ec03 --- /dev/null +++ b/ruoyi-safecompany/target/classes/mapper/system/TbCompanyVerificationMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-safecompany/target/classes/mapper/system/TbVerificationUserDetailsMapper.xml b/ruoyi-safecompany/target/classes/mapper/system/TbVerificationUserDetailsMapper.xml new file mode 100644 index 0000000..fb76034 --- /dev/null +++ b/ruoyi-safecompany/target/classes/mapper/system/TbVerificationUserDetailsMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-safecompany/target/maven-archiver/pom.properties b/ruoyi-safecompany/target/maven-archiver/pom.properties index 405e8eb..892fc44 100644 --- a/ruoyi-safecompany/target/maven-archiver/pom.properties +++ b/ruoyi-safecompany/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Jul 05 19:29:59 CST 2024 +#Thu Jul 11 14:22:04 CST 2024 version=3.8.5 groupId=com.ruoyi artifactId=ruoyi-safecompany diff --git a/ruoyi-safecompany/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/ruoyi-safecompany/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 29c83e5..2ba2e47 100644 --- a/ruoyi-safecompany/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/ruoyi-safecompany/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,8 +1,11 @@ +com\ruoyi\business\anHuiEnterprise\controller\TbVerificationUserDetailsController.class +com\ruoyi\business\anHuiEnterprise\service\ITbVerificationUserDetailsService.class com\ruoyi\business\enterpriserectification\service\TbSynergismEnterpriseSupervisionService.class com\ruoyi\business\enterpriserectification\service\TbSafeRuleService.class com\ruoyi\business\enterpriserectification\pojo\TbCompanyInfo.class com\ruoyi\business\enterpriserectification\bo\TbSynergismParmas.class com\ruoyi\business\enterpriserectification\pojo\TbSpecialCountRecord.class +com\ruoyi\business\anHuiEnterprise\domain\TbCompanyVerification.class com\ruoyi\system\enums\RectificationStatusEnum.class com\ruoyi\business\enterpriserectification\bo\TbSafeRuleTwoVo.class com\ruoyi\business\enterpriserectification\service\TbSafeCompanyStatisticsScoreDetailService.class @@ -12,6 +15,7 @@ com\ruoyi\system\until\NbConstants.class com\ruoyi\business\enterpriserectification\service\impl\TbSafeCompanyStatisticsScoreDetailServiceImpl.class com\ruoyi\business\companyInformationReporting\domain\TbCompanyInformationReporting$Fields.class com\ruoyi\business\enterpriserectification\mapper\TbSafeRuleMapper.class +com\ruoyi\business\anHuiEnterprise\service\impl\TbCompanyVerificationServiceImpl.class com\ruoyi\business\enterpriserectification\bo\TbSafeRuleThreeVo.class com\ruoyi\business\enterpriserectification\pojo\TbSafeCompanyStatisticsScoreDetail.class com\ruoyi\business\enterpriserectification\pojo\TbSafeRule.class @@ -19,11 +23,15 @@ com\ruoyi\business\companyInformationReporting\domain\TbCompanyInformationReport com\ruoyi\business\companyInformationReporting\controller\TbCompanyInformationReportingDetailsController.class com\ruoyi\business\enterpriserectification\service\impl\TbCompanyInfoServiceImpl.class com\ruoyi\business\companyInformationReporting\service\ITbCompanyInformationReportingService.class +com\ruoyi\business\anHuiEnterprise\service\impl\TbVerificationUserDetailsServiceImpl.class com\ruoyi\business\companyInformationReporting\domain\TbCompanyInformationReportingDetails$Fields.class com\ruoyi\business\companyInformationReporting\service\impl\TbCompanyInformationReportingDetailsServiceImpl.class +com\ruoyi\business\anHuiEnterprise\domain\TbVerificationUserDetails.class +com\ruoyi\business\anHuiEnterprise\controller\TbCompanyVerificationController.class com\ruoyi\business\enterpriserectification\mapper\TbSafeCompanyStatisticsScoreMapper.class com\ruoyi\business\enterpriserectification\controller\TbCompanyRectifictionController.class com\ruoyi\business\enterpriserectification\mapper\TbCompanyInfoMapper.class +com\ruoyi\business\anHuiEnterprise\mapper\TbCompanyVerificationMapper.class com\ruoyi\business\companyInformationReporting\service\ITbCompanyInformationReportingDetailsService.class com\ruoyi\business\enterpriserectification\service\TbSafeCompanyStatisticsScoreService.class com\ruoyi\system\until\EntiyUntil.class @@ -31,12 +39,16 @@ com\ruoyi\business\enterpriserectification\service\impl\TbSynergismEnterpriseSup com\ruoyi\business\enterpriserectification\service\TbSpecialCountRecordService.class com\ruoyi\business\companyInformationReporting\mapper\TbCompanyInformationReportingDetailsMapper.class com\ruoyi\business\enterpriserectification\service\impl\TbSpecialCountRecordServiceImpl.class +com\ruoyi\business\anHuiEnterprise\domain\TbVerificationUserDetails$Fields.class com\ruoyi\business\companyInformationReporting\mapper\TbCompanyInformationReportingMapper.class com\ruoyi\business\enterpriserectification\service\impl\TbSafeRuleServiceImpl.class +com\ruoyi\business\anHuiEnterprise\domain\TbCompanyVerification$Fields.class +com\ruoyi\business\anHuiEnterprise\service\ITbCompanyVerificationService.class com\ruoyi\business\enterpriserectification\pojo\TbSynergismEnterpriseSupervision.class com\ruoyi\business\enterpriserectification\mapper\TbSynergismEnterpriseSupervisionMapper.class com\ruoyi\business\enterpriserectification\pojo\TbSafeCompanyStatisticsScore.class com\ruoyi\business\companyInformationReporting\service\impl\TbCompanyInformationReportingServiceImpl.class +com\ruoyi\business\anHuiEnterprise\mapper\TbVerificationUserDetailsMapper.class com\ruoyi\business\enterpriserectification\bo\TbSafeRuleOneVo.class com\ruoyi\business\enterpriserectification\service\impl\TbSafeCompanyStatisticsScoreServiceImpl.class com\ruoyi\business\companyInformationReporting\controller\TbCompanyInformationReportingController.class 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 index 80377da..dc5426c 100644 --- 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 @@ -1,42 +1,52 @@ -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbSynergismEnterpriseSupervision.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\impl\TbSafeCompanyStatisticsScoreServiceImpl.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\service\ITbVerificationUserDetailsService.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\mapper\TbSafeCompanyStatisticsScoreMapper.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\system\until\NbConstants.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\service\ITbCompanyInformationReportingService.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\mapper\TbSafeRuleMapper.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\controller\TbCompanyVerificationController.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\bo\TbSafeRuleOneVo.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\controller\TbCompanyInformationReportingController.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\TbSafeCompanyStatisticsScoreDetailService.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\TbCompanyInfoService.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\domain\TbVerificationUserDetails.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\service\impl\TbCompanyInformationReportingDetailsServiceImpl.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbCompanyInfo.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\TbSpecialCountRecordService.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\system\enums\RectificationStatusEnum.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\controller\TbCompanyRectifictionController.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\system\until\EntiyUntil.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\mapper\TbCompanyInformationReportingDetailsMapper.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\TbSafeRuleService.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\TbSynergismEnterpriseSupervisionService.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\service\ITbCompanyInformationReportingDetailsService.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\impl\TbCompanyInfoServiceImpl.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\impl\TbSafeCompanyStatisticsScoreDetailServiceImpl.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\controller\TbCompanyInformationReportingDetailsController.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\service\impl\TbVerificationUserDetailsServiceImpl.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbSafeCompanyStatisticsScoreDetail.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\domain\TbCompanyInformationReportingDetails.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\mapper\TbCompanyInformationReportingMapper.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\bo\TbSafeRuleTwoVo.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbSpecialCountRecord.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\impl\TbSafeRuleServiceImpl.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\service\impl\TbCompanyInformationReportingServiceImpl.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\mapper\TbCompanyInfoMapper.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\mapper\TbSpecialCountRecordMapper.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\controller\TbVerificationUserDetailsController.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\mapper\TbCompanyVerificationMapper.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\bo\TbSynergismParmas.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\mapper\TbVerificationUserDetailsMapper.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\mapper\TbSafeCompanyStatisticsScoreDetailMapper.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbSafeRule.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbSynergismEnterpriseSupervision.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\impl\TbSafeCompanyStatisticsScoreServiceImpl.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\system\until\NbConstants.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\controller\TbCompanyInformationReportingController.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\TbCompanyInfoService.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbCompanyInfo.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\system\enums\RectificationStatusEnum.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\system\until\EntiyUntil.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\domain\TbCompanyVerification.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\mapper\TbCompanyInformationReportingDetailsMapper.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\TbSynergismEnterpriseSupervisionService.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\impl\TbSafeCompanyStatisticsScoreDetailServiceImpl.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\service\ITbCompanyVerificationService.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\anHuiEnterprise\service\impl\TbCompanyVerificationServiceImpl.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\controller\TbCompanyInformationReportingDetailsController.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\domain\TbCompanyInformationReportingDetails.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\mapper\TbCompanyInformationReportingMapper.java +F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\mapper\TbCompanyInfoMapper.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\impl\TbSpecialCountRecordServiceImpl.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\mapper\TbSynergismEnterpriseSupervisionMapper.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\TbSafeCompanyStatisticsScoreService.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\bo\TbSafeRuleThreeVo.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\bo\TbSynergismParmas.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\service\impl\TbSynergismEnterpriseSupervisionServiceImpl.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbSafeCompanyStatisticsScore.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\mapper\TbSafeCompanyStatisticsScoreDetailMapper.java F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\companyInformationReporting\domain\TbCompanyInformationReporting.java -F:\A1\RuoYi-Vue3-Saas\ruoyi-safecompany\src\main\java\com\ruoyi\business\enterpriserectification\pojo\TbSafeRule.java diff --git a/ruoyi-safecompany/target/ruoyi-safecompany-3.8.5.jar b/ruoyi-safecompany/target/ruoyi-safecompany-3.8.5.jar index 5a98259..1c35e8d 100644 Binary files a/ruoyi-safecompany/target/ruoyi-safecompany-3.8.5.jar and b/ruoyi-safecompany/target/ruoyi-safecompany-3.8.5.jar differ diff --git a/ruoyi-ui-vue3/.env.development b/ruoyi-ui-vue3/.env.development index 7b59769..b02a398 100644 --- a/ruoyi-ui-vue3/.env.development +++ b/ruoyi-ui-vue3/.env.development @@ -5,4 +5,4 @@ VITE_APP_TITLE = 安惠商企管理系统 VITE_APP_ENV = 'development' # 若依管理系统/开发环境 -VITE_APP_BASE_API = '/dev-api' +VITE_APP_BASE_API = '/zhpcapi/zhpcapi' diff --git a/ruoyi-ui-vue3/vite.config.js b/ruoyi-ui-vue3/vite.config.js index db35bb2..4255aca 100644 --- a/ruoyi-ui-vue3/vite.config.js +++ b/ruoyi-ui-vue3/vite.config.js @@ -30,10 +30,10 @@ export default defineConfig(({ mode, command }) => { open: true, proxy: { // https://cn.vitejs.dev/config/#server-proxy - '/dev-api': { + '/zhpcapi': { target: 'http://localhost:8799', changeOrigin: true, - rewrite: (p) => p.replace(/^\/dev-api/, '') + rewrite: (p) => p.replace(/^\/zhpcapi/, '') } } },