6.16bug修正

@@ -88,6 +88,12 @@ public class TblTradeInquiryInfoController extends JeecgController<TblTradeInqui
 	@ApiOperation(value="询价明细表-添加", notes="询价明细表-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TblTradeInquiryInfo tblTradeInquiryInfo) {
+		// 重复检验
+		if (tblTradeInquiryInfoService.isExist(tblTradeInquiryInfo)) {
+			return Result.error("数据已存在，请勿重复添加！");
+		}
+
+
 		tblTradeInquiryInfoService.save(tblTradeInquiryInfo);
 		return Result.OK("添加成功！");
 	}

@@ -236,6 +236,20 @@ public class TblTradePriceInquiryController {
         if (CollectionUtil.isEmpty(tblTradeTenderInfoList)) {
             return Result.ok();
         }
+
+//        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+//        if (sysUser != null) {
+//            //当前用户id
+//            String userId = sysUser.getId();
+//            String roleId = tblTradeTenderInfoService.selectRoleInfo("ProcurementSupervisor");
+//
+//            Integer count = tblTradeTenderInfoService.selectIsRole(userId,roleId);
+//            if (count != null && count > 0) {
+//
+//            }
+//        }
+
+
         //查询库存信息
         Map<String, TblTradeTenderInfo> collect = tblTradeTenderInfoList.stream().collect(Collectors.toMap(TblTradeTenderInfo::getCode, e -> e));
         Set<String> strings = collect.keySet();

@@ -28,4 +28,8 @@ public interface TblTradeTenderInfoMapper extends BaseMapper<TblTradeTenderInfo>
    * @return List<TblTradeTenderInfo>
    */
 	public List<TblTradeTenderInfo> selectByMainId(@Param("mainId") String mainId);
+
+    String selectRoleInfo(@Param("procurementSupervisor") String procurementSupervisor);
+
+	Integer selectIsRole(@Param("userId") String userId,@Param("roleId") String roleId);
 }

@@ -13,4 +13,10 @@
 		FROM  tbl_trade_tender_info
 		WHERE
 			 xjbswjh = #{mainId} 	</select>
+    <select id="selectRoleInfo" resultType="java.lang.String">
+		select id from sys_role where role_code = #{procurementSupervisor}
+	</select>
+	<select id="selectIsRole" resultType="java.lang.Integer">
+		select count(1) from sys_user_role where role_id = #{roleId} and user_id = #{userId}
+	</select>
 </mapper>

@@ -19,4 +19,6 @@ public interface ITblTradeInquiryInfoService extends IService<TblTradeInquiryInf
 	 * @return List<TblTradeInquiryInfo>
 	 */
 	public List<TblTradeInquiryInfo> selectByMainId(String mainId);
+
+	boolean isExist(TblTradeInquiryInfo tblTradeInquiryInfo);
 }

@@ -41,4 +41,8 @@ public interface ITblTradeTenderInfoService extends IService<TblTradeTenderInfo>
 
 
 	void saveUploadData(List<TblTradeTenderInfo> list);
+
+    String selectRoleInfo(String procurementSupervisor);
+
+	Integer selectIsRole(String userId, String roleId);
 }

 package org.jeecg.modules.erp.trade.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.erp.trade.entity.TblTradeInquiryInfo;
 import org.jeecg.modules.erp.trade.mapper.TblTradeInquiryInfoMapper;
 import org.jeecg.modules.erp.trade.service.ITblTradeInquiryInfoService;
@@ -24,4 +27,33 @@ public class TblTradeInquiryInfoServiceImpl extends ServiceImpl<TblTradeInquiryI
 	public List<TblTradeInquiryInfo> selectByMainId(String mainId) {
 		return tblTradeInquiryInfoMapper.selectByMainId(mainId);
 	}
+
+    @Override
+    public boolean isExist(TblTradeInquiryInfo tblTradeInquiryInfo) {
+		if (tblTradeInquiryInfo != null && StringUtils.isNotBlank(tblTradeInquiryInfo.getTradeId())) {
+			QueryWrapper<TblTradeInquiryInfo> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("trade_id", tblTradeInquiryInfo.getTradeId());
+			queryWrapper.eq("ghsmc", tblTradeInquiryInfo.getGhsmc());
+			queryWrapper.eq("lxr", tblTradeInquiryInfo.getLxr());
+			queryWrapper.eq("tel", tblTradeInquiryInfo.getTel());
+			queryWrapper.eq("khhmc", tblTradeInquiryInfo.getKhhmc());
+			queryWrapper.eq("yhzh", tblTradeInquiryInfo.getYhzh());
+			queryWrapper.eq("hh", tblTradeInquiryInfo.getHh());
+
+			queryWrapper.eq("zpdj", tblTradeInquiryInfo.getZpdj());
+			queryWrapper.eq("zpsl", tblTradeInquiryInfo.getZpsl());
+			queryWrapper.eq("ppdj", tblTradeInquiryInfo.getPpdj());
+			queryWrapper.eq("ppsl", tblTradeInquiryInfo.getPpsl());
+			queryWrapper.eq("wpdj", tblTradeInquiryInfo.getWpdj());
+			queryWrapper.eq("sfhyf", tblTradeInquiryInfo.getSfhyf());
+			queryWrapper.eq("fhdz", tblTradeInquiryInfo.getFhdz());
+			queryWrapper.eq("zxchl", tblTradeInquiryInfo.getZxchl());
+			queryWrapper.eq("jhzqt", tblTradeInquiryInfo.getJhzqt());
+
+			List<TblTradeInquiryInfo> tblTradeInquiryInfos = tblTradeInquiryInfoMapper.selectList(queryWrapper);
+			//不为空，存在重复数据
+			return !CollectionUtil.isEmpty(tblTradeInquiryInfos);
+		}
+        return true;
+    }
 }

@@ -46,7 +46,7 @@ public class TblTradeTenderInfoServiceImpl extends ServiceImpl<TblTradeTenderInf
 	private TblTradePriceInquiryMapper tblTradePriceInquiryMapper;
 	@Autowired
 	private ITblTradeMeterialService tblTradeMeterialService;
-	
+
 	@Override
 	public List<TblTradeTenderInfo> selectByMainId(String mainId) {
 		return tblTradeTenderInfoMapper.selectByMainId(mainId);
@@ -130,5 +130,15 @@ public class TblTradeTenderInfoServiceImpl extends ServiceImpl<TblTradeTenderInf
 
 	}
 
+	@Override
+	public String selectRoleInfo(String procurementSupervisor) {
+		return tblTradeTenderInfoMapper.selectRoleInfo(procurementSupervisor);
+	}
+
+	@Override
+	public Integer selectIsRole(String userId, String roleId) {
+		return tblTradeTenderInfoMapper.selectIsRole(userId, roleId);
+	}
+
 
 }