From 0ad1ac019d2e2b5bb44d3f3e23913786ab4c2fc6 Mon Sep 17 00:00:00 2001 From: gmhao <1285330039@qq.com> Date: Sat, 23 Dec 2023 22:52:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=80=E6=9D=A5?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmUnitPersonController.java | 2 +- .../bonus/sgzb/base/domain/BmUnitPerson.java | 28 ++----------------- .../sgzb/base/mapper/BmUnitPersonMapper.java | 5 ++++ .../base/service/BmUnitPersonService.java | 3 +- .../service/impl/BmUnitPersonServiceImpl.java | 9 ++++-- .../mapper/base/BmUnitPersonMapper.xml | 7 +++-- 6 files changed, 22 insertions(+), 32 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java index 73913a20..e4ff0e86 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java @@ -78,7 +78,7 @@ public class BmUnitPersonController extends BaseController{ @PostMapping public AjaxResult unitPersonAdd(@Validated @RequestBody BmUnitPerson bmUnitPerson) { - return toAjax(bmUnitPersonService.unitPersonAdd(bmUnitPerson)); + return bmUnitPersonService.unitPersonAdd(bmUnitPerson); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java index e133c160..c99f3790 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java @@ -2,7 +2,9 @@ package com.bonus.sgzb.base.domain; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +@Data public class BmUnitPerson { /**类型ID*/ @ApiModelProperty(value = "类型ID") @@ -15,30 +17,4 @@ public class BmUnitPerson { private String companyId; - public long getUnitId() { - return unitId; - } - - public void setUnitId(long unitId) { - this.unitId = unitId; - } - - - public long getUserId() { - return userId; - } - - public void setUserId(long userId) { - this.userId = userId; - } - - - public String getCompanyId() { - return companyId; - } - - public void setCompanyId(String companyId) { - this.companyId = companyId; - } - } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java index 334a6ade..2c089724 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java @@ -11,8 +11,13 @@ public interface BmUnitPersonMapper { public List getUnitPerson(BmUnitPerson bmUnitPerson); + + BmUnitPerson getUnitPersons(long unitId); + public int unitPersonAdd(BmUnitPerson bmUnitPerson); + public int getUnitPersonUser(BmUnitPerson bmUnitPerson); + public void remove(Long[] unitIds); public int updateBmUnitPerson(BmUnitPerson bmUnitPerson); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java index 621b24d2..ea41a1b2 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.base.service; import com.bonus.sgzb.base.domain.BmUnitPerson; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import java.util.List; @@ -10,7 +11,7 @@ public interface BmUnitPersonService { public List getUnitPerson(BmUnitPerson bmUnitPerson); - public int unitPersonAdd(BmUnitPerson bmUnitPerson); + public AjaxResult unitPersonAdd(BmUnitPerson bmUnitPerson); public void remove(Long[] unitIds); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java index 6dd80020..4db96d1c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java @@ -4,6 +4,7 @@ package com.bonus.sgzb.base.service.impl; import com.bonus.sgzb.base.domain.BmUnitPerson; import com.bonus.sgzb.base.mapper.BmUnitPersonMapper; import com.bonus.sgzb.base.service.BmUnitPersonService; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,8 +28,12 @@ public class BmUnitPersonServiceImpl implements BmUnitPersonService { } @Override - public int unitPersonAdd(BmUnitPerson bmUnitPerson) { - return bmUnitPersonMapper.unitPersonAdd(bmUnitPerson); + public AjaxResult unitPersonAdd(BmUnitPerson bmUnitPerson) { + BmUnitPerson ben =bmUnitPersonMapper.getUnitPersons(bmUnitPerson.getUnitId()); + if(ben != null){ + return AjaxResult.error("保存失败！！！单位已绑定"); + } + return AjaxResult.success(bmUnitPersonMapper.unitPersonAdd(bmUnitPerson)); } @Override diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml index 7dcd7568..70d0aa32 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select unit_id, user_id, company_id from bm_unit_person - + - + insert into bm_unit_person ( From 5a49a44693bd897207ff7d9ac9edd07b5d5d4d95 Mon Sep 17 00:00:00 2001 From: dingjie Date: Sat, 23 Dec 2023 23:09:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/service/impl/PurchaseMacodeInfoServiceImpl.java | 2 +- .../material/service/impl/RepairAuditDetailsServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index d20a7cb2..77dcba89 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -76,7 +76,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor=Exception.class) public AjaxResult insertPurchaseMacodeInfo(List purchaseMacodeInfoList) throws Exception { boolean b = true; for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index e812a6e5..7b0318d7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -152,7 +152,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor=Exception.class) public int auditRepair(ScrapAudit scrapAudit) throws Exception { String checkResult = scrapAudit.getCheckResult(); List taskIdList = scrapAudit.getTaskIdList();