From 5f9da8dfb581d6a324903f389fca9305f2781091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Sat, 14 Sep 2024 11:26:46 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?=
=?UTF-8?q?=E5=A7=94=E5=A4=96=E5=B7=A5=E5=BA=8F=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=A7=94=E5=A4=96=E5=B7=A5=E5=BA=8F=E5=88=97=E8=A1=A8=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E3=80=81=E6=B7=BB=E5=8A=A0=E3=80=81=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=A7=94?=
=?UTF-8?q?=E5=A4=96=E5=B7=A5=E5=BA=8Fcontroller=E3=80=81mapper=E3=80=81se?=
=?UTF-8?q?rvice=E6=8E=A5=E5=8F=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../OutsourceProcessController.java | 10 +--
.../impl/OutsourceProcessServiceImpl.java | 5 +-
.../mapper/system/OutsourceProcessMapper.xml | 2 +-
.../system/outsource_process/add.html | 83 +++++++++++--------
.../system/outsource_process/edit.html | 16 +++-
.../outsource_process/outsource_process.html | 1 -
6 files changed, 70 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java
index 1d1e3a11..d31d35c1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceProcessController.java
@@ -10,11 +10,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.controller.BaseController;
@@ -98,7 +94,7 @@ public class OutsourceProcessController extends BaseController
@ResponseBody
public AjaxResult addSave(OutsourceProcess outsourceProcess)
{
- if(!outsourceProcessService.checkoutsourceProcessNoUnique(outsourceProcess)){
+ if(outsourceProcessService.checkoutsourceProcessNoUnique(outsourceProcess)){
return error("添加委外工序'" + outsourceProcess.getOutsourceProcessNo() + "'失败,工序编号已存在");
};
outsourceProcess.setCreateTime(DateUtils.getNowDate());
@@ -109,7 +105,7 @@ public class OutsourceProcessController extends BaseController
*/
@PostMapping("/checkoutsourceProcessNoUnique")
@ResponseBody
- public boolean checkoutsourceProcessNoUnique(OutsourceProcess outsourceProcess)
+ public boolean checkoutsourceProcessNoUnique(@RequestBody OutsourceProcess outsourceProcess)
{
return outsourceProcessService.checkoutsourceProcessNoUnique(outsourceProcess);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
index f029e5c6..24e71ee2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java
@@ -103,9 +103,9 @@ public class OutsourceProcessServiceImpl implements IOutsourceProcessService
if(outsourceProcessMapper.selectOutsourceProcessByOutsourceProcessNo(outsourceProcess.getOutsourceProcessNo())!=null){
- return false;
+ return true;
}
- return true;
+ return false;
}
/**
@@ -117,6 +117,7 @@ public class OutsourceProcessServiceImpl implements IOutsourceProcessService
@Override
public int updateOutsourceProcess(OutsourceProcess outsourceProcess)
{
+ outsourceProcess.setUpdateBy(ShiroUtils.getLoginName());
outsourceProcess.setUpdateTime(DateUtils.getNowDate());
return outsourceProcessMapper.updateOutsourceProcess(outsourceProcess);
}
diff --git a/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
index 8decac4e..ee7f52c3 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time,
- outsource_process_code,
+ #{outsourceProcessCode},
#{outsourceProcessNo},
#{outsourceProcessName},
#{remark},
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html b/ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html
index 40b45e3f..70dd7e04 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_process/add.html
@@ -10,7 +10,7 @@
@@ -35,44 +35,61 @@