ubcs.git - Gitblit

			@@ -416,6 +416,11 @@
			// //默认的属性都不用从前端拷贝
			// //设置编码需要的默认属性的内容
			copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
			cbo.setOid(VciBaseUtil.getPk());
			cbo.setCreateTime(new Date());
			cbo.setLastModifyTime(new Date());
			cbo.setCreator(AuthUtil.getUser().getUserName());
			cbo.setLastModifier(AuthUtil.getUser().getUserName());
			// //TODO:因为默认的属性都不拷贝，目前集团码叫name，并没有从DTO拷贝到cbo里。增加一个单独处理，以后再看要不要调整
			cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
			// //end -- modify by lihang @20220407
			@@ -799,35 +804,27 @@
			// BeanUtils.
			// BeanUtils.copyProperties(orderDTO.getData(),cbo);
			// cbo.setMaterialtype(Short.valueOf("1001"));
			// orderDTO.getData().forEach((key, value) -> {
			// if (!edit \|\| (!checkUnAttrUnEdit(key) &&
			// !VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
			// try {
			// cbo.setAttributeValue(key, value);
			// } catch (Exception e) {
			// logger.error("设置属性的值错误", e);
			// }
			// }
			// });
			orderDTO.getData().forEach((key, value) -> {
			if (!edit \|\| (!checkUnAttrUnEdit(key) &&
			!VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
			try {
			cbo.getData().put(cbo.getData().containsKey(key.toUpperCase())?key.toUpperCase():key, value);
			} catch (Exception e) {
			logger.error("设置属性的值错误", e);
			}
			}
			});
			// BeanMap beanMap = BeanMap.create(cbo);
			// beanMap.putAll(orderDTO.getData());

			try {

			BeanUtilForVCI.copyPropertiesIgnoreNull(BeanUtilForVCI.convertMap(BaseModel.class, orderDTO.getData()), cbo);
			Map<String, String> data = new HashMap<>();
			data.put(CODE_CLASSIFY_OID_FIELD, classifyFullInfo.getCurrentClassifyVO().getOid());
			data.put(CODE_TEMPLATE_OID_FIELD, templateVO.getOid());
			data.put(CODE_FULL_PATH_FILED, fullPath);
			cbo.setData(data);
			cbo.setOid(VciBaseUtil.getPk());
			cbo.setCreateTime(new Date());
			Map<String, String> data = new HashMap<>();
			data.put(cbo.getData().containsKey(CODE_CLASSIFY_OID_FIELD.toUpperCase())?CODE_CLASSIFY_OID_FIELD.toUpperCase():CODE_CLASSIFY_OID_FIELD, classifyFullInfo.getCurrentClassifyVO().getOid());
			data.put(cbo.getData().containsKey(CODE_TEMPLATE_OID_FIELD.toUpperCase())?CODE_TEMPLATE_OID_FIELD.toUpperCase():CODE_TEMPLATE_OID_FIELD, templateVO.getOid());
			data.put(cbo.getData().containsKey(CODE_FULL_PATH_FILED.toUpperCase())?CODE_FULL_PATH_FILED.toUpperCase():CODE_FULL_PATH_FILED, fullPath);
			cbo.getData().putAll(data);
			cbo.setLastModifyTime(new Date());
			cbo.setCreator(AuthUtil.getUser().getUserName());
			cbo.setLastModifier(AuthUtil.getUser().getUserName());
			// cbo.setCodeclsfid(classifyFullInfo.getCurrentClassifyVO().getOid());
			// cbo.setTemplateOid(templateVO.getOid());
			// cbo.setCodeclsfpath(fullPath);
			cbo.setTs(new Date());
			if (!edit && StringUtils.isBlank(orderDTO.getLcStatus())) {
			//TODO 先写固定，后面生命周期好了在编写
			@@ -2108,17 +2105,10 @@
			if (CollectionUtils.isEmpty(cbos)) {
			throw new VciBaseException(DATA_OID_NOT_EXIST);
			}
			// QueryWrapper<CodeWupin> btmWrapper = new QueryWrapper<>();
			// btmWrapper.eq("OID",orderDTO.getOid());
			// CodeWupin cbo = codeWupinMapper.selectOne(btmWrapper);
			BaseModel cbo = cbos.get(0);
			// CodeClstemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
			// CodeRuleVO ruleVO = ruleService.getObjectHasSecByOid(orderDTO.getCodeRuleOid());

			if (cbo != null) {
			if (cbo == null) {
			throw new VciBaseException(DATA_OID_NOT_EXIST);
			}
			// ClientBusinessObject cbo = cbos.get(0);
			if (!cbo.getTs().toString().contains(VciDateUtil.date2Str(orderDTO.getTs(), VciDateUtil.DateTimeFormat))) {
			throw new VciBaseException("数据不是最新的，可能他人已经修改，请刷新后再试");
			}
			@@ -2128,9 +2118,16 @@

			//注意模板不能使用数据存储的时候的模板，因为可能会变化

			//1. 判断必输项
			String codeClassifyOid=cbo.getData().get(CODE_CLASSIFY_OID_FIELD.toUpperCase());
			orderDTO.setCodeClassifyOid(codeClassifyOid);
			// CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
			// CodeClassifyTemplateVO templateVO= this.getUsedTemplateByClassifyOid(orderDTO.getCodeClassifyOid());


			CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
			checkRequiredAttrOnOrder(templateVO, orderDTO);
			orderDTO.setTemplateOid(templateVO.getOid());
			//1. 判断必输项
			checkRequiredAttrOnOrder(templateVO, orderDTO);
			//2.先注入，再组合，最后校验
			switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
			//3.处理组合规则。组合规则不能使用编码的属性，因为编码的生成可能是需要属性的
			@@ -2147,46 +2144,18 @@
			copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, true);
			//企业码和集团码的不修改
			cbo.setDescription(orderDTO.getDescription());
			cbo.setName(orderDTO.getName());
			// cbo.setName(orderDTO.getName());
			try {
			cbo.setDescription(StringUtils.isBlank(orderDTO.getDescription()) ? "" : orderDTO.getDescription());
			cbo.setName(orderDTO.getName());
			//// cbo.setAttributeValueWithNoCheck("description", orderDTO.getDescription());
			// cbo.setAttributeValue("name", orderDTO.getName());
			} catch (Exception e) {
			e.printStackTrace();
			}
			// cbo.getData().putAll(orderDTO.getData());
			cbo.setLastModifyTime(new Date());
			cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
			updateBatchByBaseModel(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), Collections.singletonList(cbo));
			// codeWupinMapper.updateById(cbo);
			//
			// List<CodeWupinEntity> cboList = new ArrayList<>();
			//
			// //备注
			// cbo.setDescription(orderDTO.getDescription());
			// cboList.add(cbo);
			////
			//// cboList.add(cbo);
			// List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(),cboList);
			//
			//
			// List<String> charList = new ArrayList<>();
			// for (CodeWupinEntity wupinEntity : cboList) {
			// charList.add(wupinEntity.getId());
			// }
			// batchSaveSelectChar(templateVO, charList);
			// return codeList.size() > 0 ? codeList.get(0) : "";


			//修改的时候，编码是不变的
			// BatchCBO batchCBO = new BatchCBO();
			// batchCBO.getUpdateCbos().add(cbo);
			// List<ClientBusinessObject> cboList = new ArrayList<>();
			// cboList.add(cbo);
			// boService.persistenceBatch(batchCBO);
			batchSaveSelectChar(templateVO, Collections.singletonList(cbo));
			// batchSaveSelectChar(templateVO, Arrays.asList(cbo.getId()));
			}

			/**
			@@ -3423,7 +3392,7 @@

			List<Map> maps = commonsMapper.selectBySql("select * from ( select rownum rn, t.* from (select * from " + listR.getData().get(0).getTableName() + SPACE
			+ (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId()) ? (" where lastr = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastr").toString())
			+ " and lastv =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : "where") + SPACE + "1=1"
			+ " and lastv =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : "where") + SPACE + "1=1 and "
			+ lcstatusSql + namesql + codesql + ") t where rownum <=" + num1 + ") where rn >=" + num2
			);
			List<BaseModel> baseModels = new ArrayList<>();
			@@ -3467,7 +3436,7 @@
			}
			int total = commonsMapper.queryCountBySql("select count(*) from " + listR.getData().get(0).getTableName() + SPACE
			+ (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId()) ? (" where lastr = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastr").toString())
			+ "and lastv = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : "where") + SPACE + "1=1"
			+ "and lastv = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : "where") + SPACE + "1=1 and "
			+ lcstatusSql + namesql + codesql
			);
			IPage<BaseModel> objectDataGrid = new Page<>();