From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 二月 2025 14:15:40 +0800
Subject: [PATCH] 解决冲突
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java | 7 +------
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java | 2 ++
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java
index 58defe4..b4ea5a7 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java
@@ -1,9 +1,7 @@
package com.sinata.web.controller.applet;
-import com.sinata.common.core.domain.AjaxResult;
import com.sinata.common.core.domain.R;
import com.sinata.common.core.redis.RedisCache;
-import com.sinata.common.entity.PageDTO;
import com.sinata.system.domain.MwApplication;
import com.sinata.system.service.MwApplicationService;
import io.swagger.annotations.Api;
@@ -17,7 +15,6 @@
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
-import java.util.Date;
/**
* <p>
@@ -44,9 +41,7 @@
if (!mwApplication.getCode().equals(string)){
return R.fail("验证码错误，请重试");
}
- mwApplication.setAuditStatus(1);
- mwApplication.setCreateTime(new Date());
- mwApplicationService.save(mwApplication);
+ mwApplicationService.saveApplication(mwApplication);
return R.ok();
}
}
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java
index e63f1db..649dc5d 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwApplicationServiceImpl.java
@@ -16,6 +16,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.Objects;
/**
@@ -85,6 +86,7 @@
@Override
public void saveApplication(MwApplication mwApplication) {
mwApplication.setAuditStatus(1);
+ mwApplication.setCreateTime(new Date());
if (Objects.nonNull(mwApplication.getDepartmentId())) {
mwApplication.setRegion(sysDepartmentService.getRegionName(sysDepartmentService.getById(mwApplication.getDepartmentId())));
}
--
Gitblit v1.7.1