fix

zhongzheng-admin-business/src/main/java/com/zhongzheng/controller/system/BsSysRoleController.java

@@ -77,8 +77,8 @@ public class BsSysRoleController extends BaseController {
      */
     @ApiOperation("根据角色编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
-    @GetMapping(value = "/getInfo")
-    public AjaxResult getInfo( Long roleId) {
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable Long roleId) {
         return AjaxResult.success(roleService.selectRoleById(roleId));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/bo/CompanyCertificateInfo.java

@@ -18,6 +18,7 @@ public class CompanyCertificateInfo {
     /** 申请日期 */
     @ApiModelProperty("申请日期")
     private Long applicationDate;
+    /** 1 主项 2 增项 */
     @ApiModelProperty("主项/增项")
     private Long itemClass;
     /** 证书编号 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/service/impl/CompanyCertificateServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.bs.company.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -136,6 +137,18 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
         }
         add.setCertificateId(bo.getCertificateId());
         if (bo.getCertificateType().equals(2)) {
+            if (!bo.getInfoList().isEmpty()){
+                List<CompanyCertificateInfo> infoList = bo.getInfoList();
+                infoList.forEach(item->{
+                    if (Validator.isEmpty(item.getQualificationCategory())){
+                        throw new CustomException("资质名称不能为空");
+                    }
+                });
+                List<CompanyCertificateInfo> collect = infoList.stream().filter(s -> s.getItemClass().equals(1)).collect(Collectors.toList());
+                if (collect.size()>=2){
+                    throw new CustomException("主项重复");
+                }
+            }
             add.setText(JSONArray.toJSONString(bo.getInfoList()));
         }
         //证书有效时间判断
@@ -306,6 +319,7 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
         if (ObjectUtil.isEmpty(companyCertificateVos)) {
             throw new CustomException("文档数据为空");
         }
+        ExcelCompanyCertificateVo vo = new ExcelCompanyCertificateVo();
         //判断不同证书类型 1：营业执照 2：资质证书 3：安全生产许可证 4：其他证书
         switch (bo.getCertificateType()) {
             case 1:
@@ -344,7 +358,8 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                             companyCertificate.setExperienceScope(item.getExperienceScope());
                             companyCertificate.setCreateTime(DateUtils.getNowTime());
                             companyCertificate.setUpdateTime(DateUtils.getNowTime());
-                            this.baseMapper.insert(companyCertificate);
+                            int insert = this.baseMapper.insert(companyCertificate);
+                            vo.setSaveStatus(insert);
                         }
                     }
                 });
@@ -416,7 +431,7 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                         companyCertificate.setIssuingAuthority(excelCompanyCertificateVo.getIssuingAuthority());
                         companyCertificate.setCreateTime(DateUtils.getNowTime());
                         companyCertificate.setUpdateTime(DateUtils.getNowTime());
-                        this.baseMapper.insert(companyCertificate);
+                        vo.setSaveStatus( this.baseMapper.insert(companyCertificate));
                     }
                 }
                 break;
@@ -458,7 +473,7 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                             companyCertificate.setIssuingAuthority(item.getIssuingAuthority());
                             companyCertificate.setCreateTime(DateUtils.getNowTime());
                             companyCertificate.setUpdateTime(DateUtils.getNowTime());
-                            this.baseMapper.insert(companyCertificate);
+                            vo.setSaveStatus( this.baseMapper.insert(companyCertificate));
                         }
                     }
                 });
@@ -500,12 +515,16 @@ public class CompanyCertificateServiceImpl extends ServiceImpl<CompanyCertificat
                             companyCertificate.setIssuingAuthority(item.getIssuingAuthority());
                             companyCertificate.setCreateTime(DateUtils.getNowTime());
                             companyCertificate.setUpdateTime(DateUtils.getNowTime());
-                            this.baseMapper.insert(companyCertificate);
+                            vo.setSaveStatus( this.baseMapper.insert(companyCertificate));
                         }
                     }
                 });
                 break;
         }
-        return true;
+        if (vo.getSaveStatus()==1){
+            return true;
+        }else {
+            return false;
+        }
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/company/vo/ExcelCompanyCertificateVo.java

@@ -144,4 +144,6 @@ public class ExcelCompanyCertificateVo {
 	private Long effectiveDate;
 	/** 有效日期 */
 	private Integer effectiveFlag;
+	/** 新增返回状态 */
+	private Integer saveStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/staff/service/impl/StaffCertificateServiceImpl.java

@@ -252,6 +252,7 @@ public class StaffCertificateServiceImpl extends ServiceImpl<StaffCertificateMap
         if (ObjectUtil.isEmpty(excelStaffCertificateVos)) {
             throw new CustomException("文档数据为空");
         }
+        ExcelStaffCertificateVo vo = new ExcelStaffCertificateVo();
         Map<String, List<ExcelStaffCertificateVo>> excelList = excelStaffCertificateVos.stream().collect(Collectors.groupingBy(ExcelStaffCertificateVo::getIdCard));
         ArrayList<StaffCertificateMajorInfo> staffCertificateMajorInfos = new ArrayList<>();
         excelList.forEach((k, v) -> {
@@ -304,10 +305,14 @@ public class StaffCertificateServiceImpl extends ServiceImpl<StaffCertificateMap
                         staffCertificateMajorInfos.add(staffCertificateMajorInfo);
                     });
                     staffCertificate.setCertificateMajor(JSONArray.toJSONString(staffCertificateMajorInfos));
-                    this.baseMapper.insert(staffCertificate);
+                    vo.setSaveStatus(this.baseMapper.insert(staffCertificate));
                 }
             }
         });
-        return true;
+        if (vo.getSaveStatus()==1){
+            return true;
+        }else {
+            return false;
+        }
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/staff/vo/ExcelStaffCertificateVo.java

@@ -63,6 +63,6 @@ public class ExcelStaffCertificateVo {
 	@Excel(name = "有效日期结束")
 	@ApiModelProperty("有效日期结束")
 	private String effectiveEnd;
-
+private Integer saveStatus;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/system/service/impl/BsSysRoleServiceImpl.java

@@ -308,7 +308,6 @@ public class BsSysRoleServiceImpl extends ServiceImpl<BsSysRoleMapper, BsSysRole
     }
 
     @Override
-    
     public BsSysRole getOneSysRole(String sellerAdmin, Long id) {
         return getOne(new LambdaQueryWrapper<BsSysRole>()
                 .eq(BsSysRole::getRoleKey, sellerAdmin)