diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index e1cf2994..0681f4ba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -738,32 +738,8 @@ public class SarBussionessStandController extends BaseControllerqueryWrapper = new QueryWrapper<>(); - queryWrapper.eq("STAND_CODE",standCode).eq("VALID_FLAG","0"); - List list = sarBussionessStandEOService.list(queryWrapper); - if (list == null || list.isEmpty()){ - return Result.success("校验通过"); - } - for (SarBussionessStand stand :list){ - if (standName.equals(stand.getStandName())){ - logger.info("企标标准号"+ standCode +"和企标名称"+ standName +"已存在"); - return Result.error("企标标准号"+ standCode +"和企标名称"+ standName +"已存在"); - } - logger.info("企标标准号" + standCode + "已存在"); - return Result.error("企标标准号" + standCode + "已存在"); -// if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ -// valIdFlag = stand.getValidFlag(); -// if (valIdFlag == 0){ -// logger.info("企标标准号"+ standCode +"和企标名称"+ standName +"已存在"); -// return Result.error("企标标准号"+ standCode +"和企标名称"+ standName +"已存在"); -// } -// } - } - return Result.success("校验通过"); + public ResponseMessage ifStandCodeByStandName(String standCode,String standName,String taskIds,String standNum){ + return sarBussionessStandEOService.ifStandCodeByStandName(standCode,standName,taskIds,standNum); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 933889ce..26b308cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -72,5 +72,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage repeal(String id, String type); String selectMaxStandSn(String standSort); + + ResponseMessage ifStandCodeByStandName(String standCode, String standName, String taskIds, String standNum); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 2501af56..2f55a7fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -68,7 +68,9 @@ import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; @@ -224,6 +226,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl= 1) { // 根据代替标准号 ,修改代替标准号标准中的,被代替标准号 @@ -4705,6 +4711,55 @@ public class SarBussionessStandServiceImpl extends ServiceImpl ifStandCodeByStandName(String standCode, String standName, String taskIds, String standNum) { + if (StringUtils.isBlank(standCode) || StringUtils.isBlank(standName)) { + return Result.error("企标编号或企标名称不能为空"); + } + // 根据任务ID查询企标顺序表,判断企标顺序号是否作出修改 + if (StringUtils.isNotBlank(taskIds) && StringUtils.isNotBlank(standNum)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SarBussStandSn::getTaskId, taskIds); + wrapper.orderByDesc(SarBussStandSn::getModifyTime); + List sarBussStandSnList = sarBussStandSnService.list(wrapper); + // 制定 才会生成企标顺序号,在企标顺序表中有数据,如果是修订,则不会生成顺序号,所以结果为空,不作处理 + if (sarBussStandSnList != null && !sarBussStandSnList.isEmpty()) { + SarBussStandSn sarBussStandSn = sarBussStandSnList.get(0); + // 若企标顺序表中的顺序号和前端的顺序号不一致,则表示企标顺序号更改了,弃用原有顺序号,保存新的企标顺序号 + if (!standNum.equals(sarBussStandSn.getStandSn())){ + // 弃用原有顺序号 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(SarBussStandSn::getTaskId,taskIds); + updateWrapper.set(SarBussStandSn::getValidFlag,"1"); + updateWrapper.set(SarBussStandSn::getUseStatus,"no"); + updateWrapper.set(SarBussStandSn::getTaskId,null); + sarBussStandSnService.update(updateWrapper); + // 保存新的顺序号 + sarBussStandSn.setId(UUIDUtils.randomUUID20()); + sarBussStandSn.setStandSn(standNum); + sarBussStandSn.setCreationTime(new Date()); + sarBussStandSn.setModifyTime(new Date()); + sarBussStandSnService.save(sarBussStandSn); + } + } + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("STAND_CODE",standCode).eq("VALID_FLAG","0"); + List list = sarBussionessStandEODao.selectList(queryWrapper); + if (list == null || list.isEmpty()){ + return Result.success("校验通过"); + } + for (SarBussionessStand stand :list){ + if (standName.equals(stand.getStandName())){ + logger.info("企标标准号"+ standCode +"和企标名称"+ standName +"已存在"); + return Result.error("企标标准号"+ standCode +"和企标名称"+ standName +"已存在"); + } + logger.info("企标标准号" + standCode + "已存在"); + return Result.error("企标标准号" + standCode + "已存在"); + } + return Result.success("校验通过"); + } + public String updateInfo(List asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>();