Merge remote-tracking branch 'origin/dev' into dev

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);
     }
 
     /**

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;
-  }
-
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java

@@ -11,8 +11,13 @@ public interface BmUnitPersonMapper {
 
     public List<BmUnitPerson> 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);

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<BmUnitPerson> getUnitPerson(BmUnitPerson bmUnitPerson);
 
-    public int unitPersonAdd(BmUnitPerson bmUnitPerson);
+    public AjaxResult unitPersonAdd(BmUnitPerson bmUnitPerson);
 
     public void remove(Long[] unitIds);
 

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) {
+    public AjaxResult unitPersonAdd(BmUnitPerson bmUnitPerson) {
-        return bmUnitPersonMapper.unitPersonAdd(bmUnitPerson);
+        BmUnitPerson ben =bmUnitPersonMapper.getUnitPersons(bmUnitPerson.getUnitId());
+        if(ben != null){
+            return AjaxResult.error("保存失败！！！单位已绑定");
+        }
+        return AjaxResult.success(bmUnitPersonMapper.unitPersonAdd(bmUnitPerson));
     }
 
     @Override

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
     </sql>
-    
+
 
     <select id="getUnitPersonAll"  resultMap="BmUnitPersonResult">
         <!--<include refid="bmUnitInfo"/>-->
@@ -36,8 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
 		</where>
     </select>
-    
 
+    <select id="getUnitPersons" parameterType="Long" resultMap="BmUnitPersonResult">
+        <include refid="bmUnitPerson"/>
+        where unit_id = #{unitId}
+    </select>
     
     <insert id="unitPersonAdd" parameterType="com.bonus.sgzb.base.domain.BmUnitPerson">
         insert into bm_unit_person (

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<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception {
         boolean b = true;
         for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) {

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<Long> taskIdList = scrapAudit.getTaskIdList();