diff --git a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java index 60fe4c5f94ade5e5e39f8a5492a86eb1eacc014f..23355fd8eb06bd6077b24a815abcad620bea831c 100644 --- a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java +++ b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java @@ -116,7 +116,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl @Autowired private WeiXinService weiXinService; @Autowired - IPrecipriceService iNormProductionService; + private INormProductionService iNormProductionService; + @Autowired + private IPrecipriceService iPrecipriceService; /** @@ -949,6 +951,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl .setStatus(0) .setAlias(handle.getName()); sampleHandleEnclosureList.add(sampleHandleEnclosure); + //获å–äº§å€¼ä¿¡æ¯ + QueryWrapper<NormProduction> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("assess_id", handle.getId()); + queryWrapper.eq("type", 0); + queryWrapper.eq("status", 1); + NormProduction normProduction = iNormProductionService.getOne(queryWrapper); + if(normProduction == null){ + return BaseResponse.errorMsg("è”系管ç†å‘˜.é…置产值信æ¯!"); + } } sampleHandleEnclosureService.saveBatch(sampleHandleEnclosureList); } @@ -1236,7 +1247,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl if (sampleHandle.getContent() != null) { String[] handIdS = sampleHandle.getContent().split("ã€"); for (String handleId : handIdS) { - iNormProductionService.createPreciprice(sampleHandle.getUserId(),entrust.getId(),Integer.valueOf(handleId),0,sample.getId()); + try { + iPrecipriceService.createPreciprice(sampleHandle.getUserId(),entrust.getId(),Integer.valueOf(handleId),0,sample.getId()); + }catch (Exception e){ + return BaseResponse.errorMsg(e.getMessage()); + } } } QueryWrapper<SampleHandle> sampleHandleWrapper = new QueryWrapper<>(); @@ -1329,6 +1344,16 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl .setStatus(0) .setCreateTime(LocalDateTime.now()); sampleDistributionList.add(sampleDistribution); + + //获å–äº§å€¼ä¿¡æ¯ + QueryWrapper<NormProduction> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("assess_id", distributionTeamQuery.getTeamGroupId()); + queryWrapper.eq("type", 1); + queryWrapper.eq("status", 1); + NormProduction normProduction = iNormProductionService.getOne(queryWrapper); + if(normProduction == null){ + return BaseResponse.errorMsg("è”系管ç†å‘˜.é…置产值信æ¯!"); + } //消æ¯æŽ¨é€ BaseResponse wrapper = userMessageService.sendMessage(distributionTeamQuery.getUserId(), "您有一æ¡æ ·å“检测信æ¯ç‰å¾…接å—",entrust.getId(), SysUserMessage.MessageType.ENTRUST); if(wrapper.getCode() != 200){ @@ -1593,7 +1618,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl List<SampleDistributionTeamVo> sampleDistributionTeamGroupVoList = distributionMapper.getDistributionTeamGroupList(sample.getId(), loginUser.getId()); if (sampleDistributionTeamGroupVoList != null && sampleDistributionTeamGroupVoList.size() > 0) { for (SampleDistributionTeamVo sdVo : sampleDistributionTeamGroupVoList) { - iNormProductionService.createPreciprice(sdVo.getUserId(),entrust.getId(),sdVo.getTeamGroupId(),1,sample.getId()); + try { + iPrecipriceService.createPreciprice(sdVo.getUserId(),entrust.getId(),sdVo.getTeamGroupId(),1,sample.getId()); + }catch (Exception e){ + return BaseResponse.errorMsg(e.getMessage()); + } } } sampleIdS.add(sample.getId()); diff --git a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java index 0f6572e4f5c515b283393964e582b2213b3a8376..bfb4d7736e5e936355353a16cee4b193b634787b 100644 --- a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java +++ b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java @@ -153,7 +153,7 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr if (BeanUtil.isEmpty(normProduction)) { log.debug("产值记录新增失败,产值信æ¯æ²¡æ‰¾åˆ°!"); - throw new IllegalArgumentException("处ç†é¡¹äº§å€¼æœªé…ç½®é…ç½®!"); + throw new IllegalArgumentException("è”系管ç†å‘˜.é…置产值信æ¯!"); } preciprice.setAnalyseRate(BigDecimal.valueOf(normProduction.getAnalyseRate())); preciprice.setAssessRate(BigDecimal.valueOf(normProduction.getAssessId())); diff --git a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java index 8d6e18a4ea105d10174b9ab67a5482c05b948f1d..1d36cc007461c24eb2edba204e1287f792ddc884 100644 --- a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java +++ b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java @@ -50,24 +50,24 @@ public class WeiXinService { System.out.println("==================code==================="); System.out.println(code); try { - /*String accessToken = null; - if (type.equals("PC")) { - accessToken = getAccessToken(); - } else if (type.equals("APP")) { - accessToken = getPCAccessToken(); - } else { - return BaseResponse.errorMsg("å‚数错误"); - } - String param = "access_token=%s&code=%s"; - param = String.format(param, accessToken, code); - JSONObject jsonObject = WeixinInterfaceUtil.doGet(Global.USERINFOURL, param); - if (jsonObject.get("errcode").toString().equals("40029")) { - return BaseResponse.errorMsg("code失效!"); - } - String UserId = jsonObject.getString("UserId"); - System.out.println("==================UserId==================="); - System.out.println(UserId); - JSONObject userJson = getUser(accessToken, UserId);*/ +// String accessToken = null; +// if (type.equals("PC")) { +// accessToken = getAccessToken(); +// } else if (type.equals("APP")) { +// accessToken = getPCAccessToken(); +// } else { +// return BaseResponse.errorMsg("å‚数错误"); +// } +// String param = "access_token=%s&code=%s"; +// param = String.format(param, accessToken, code); +// JSONObject jsonObject = WeixinInterfaceUtil.doGet(Global.USERINFOURL, param); +// if (jsonObject.get("errcode").toString().equals("40029")) { +// return BaseResponse.errorMsg("code失效!"); +// } +// String UserId = jsonObject.getString("UserId"); +// System.out.println("==================UserId==================="); +// System.out.println(UserId); +// JSONObject userJson = getUser(accessToken, UserId); QueryWrapper<SysUser> wrapper = new QueryWrapper<>(); // wrapper.eq("phone", userJson.get("mobile")); wrapper.eq("phone", code); //暂时用手机å·ä»£æ›¿code