hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整代码，子表不新增操作日志

This commit is contained in:
hecan 2024-06-21 09:29:09 +08:00
parent c6d4f8ad3a
commit 299ba86d60
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
View File

@ -137,13 +137,13 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
Map<String, Object> map = new HashMap<>();//将主表数据存到map中 Map<String, Object> map = new HashMap<>();//将主表数据存到map中
Map<String, Object> mapDetails = new HashMap<>();//将子表数据存到map中 Map<String, Object> mapDetails = new HashMap<>();//将子表数据存到map中
if (comparisonEntities != null && comparisonEntities.size() > 0) { if (comparisonEntities != null && comparisonEntities.size() > 0) {
map=spliceMainMap(comparisonEntities,jsonObjectMain,map,comparisonEntity); map = spliceMainMap(comparisonEntities, jsonObjectMain, map, comparisonEntity);
mapDetails=spliceDetailMap(comparisonEntities,mapDetails,comparisonDetailsEntity,jsonArray); mapDetails = spliceDetailMap(comparisonEntities, mapDetails, comparisonDetailsEntity, jsonArray);
String uuid=null; String uuid = null;
if(jsonObjectMain.getString("id")==null){ if (jsonObjectMain.getString("id") == null) {
uuid = UUIDUtils.getUUID(); uuid = UUIDUtils.getUUID();
map.put("id", uuid); map.put("id", uuid);
}else{ } else {
uuid = jsonObjectMain.getString("id"); uuid = jsonObjectMain.getString("id");
map.put("id", jsonObjectMain.getString("id")); map.put("id", jsonObjectMain.getString("id"));
} }
@ -153,47 +153,48 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
map.put("create_time", new Date()); map.put("create_time", new Date());
map.put("modify_time", new Date()); map.put("modify_time", new Date());
map.put("sts", "Y"); map.put("sts", "Y");
map.put("data_status","Y");//新增状态 map.put("data_status", "Y");//新增状态
map.put("add_status","0");//新增状态 map.put("add_status", "0");//新增状态
map.put("update_status","1");//修改状态 map.put("update_status", "1");//修改状态
map.put("delete_status","1");//删除状态 map.put("delete_status", "1");//删除状态
ComparisonEntity comparisonEntityRule = comparisonEntities.get(0); ComparisonEntity comparisonEntityRule = comparisonEntities.get(0);
//查询单据规则 //查询单据规则 只查询主表得，明细表不用
try { try {
comparisonEntityRule= comparisonDao.queryComparisonById(comparisonEntityRule); ComparisonEntity comparisonEntityRules = comparisonDao.queryComparisonById(comparisonEntityRule);
String documentRule =comparisonEntityRule.getDocumentRule();; //"KH-2024-05-30-1"; String documentRule = comparisonEntityRules.getDocumentRule();
logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}",documentRule); ; //"KH-2024-05-30-1";
if(documentRule !=null){ logger.info("通用数据保存接口中根据mId查询出来的单据规则为:{}", documentRule);
if (documentRule != null) {
//获取规则前缀 CK //获取规则前缀 CK
String rulePrefix=documentRule.substring(0,documentRule.indexOf("-")); String rulePrefix = documentRule.substring(0, documentRule.indexOf("-"));
//获取规则中间日期 yyyy-MM-dd //获取规则中间日期 yyyy-MM-dd
String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-")); String ruleDate = documentRule.substring(documentRule.indexOf("-") + 1, documentRule.lastIndexOf("-"));
String ruleMiddle = getRuleDate(ruleDate); String ruleMiddle = getRuleDate(ruleDate);
//获取规则后缀 //获取规则后缀
String ruleSuffixLength= documentRule.substring(documentRule.lastIndexOf("-")+1); String ruleSuffixLength = documentRule.substring(documentRule.lastIndexOf("-") + 1);
int ruleSuffix = ruleSuffixLength.length(); int ruleSuffix = ruleSuffixLength.length();
//生成单据规则 //生成单据规则
comparisonEntity.setRulePrefix(rulePrefix); comparisonEntityRule.setRulePrefix(rulePrefix);
comparisonEntity.setRuleMiddle(ruleMiddle); comparisonEntityRule.setRuleMiddle(ruleMiddle);
comparisonEntity.setRuleSuffix(ruleSuffix); comparisonEntityRule.setRuleSuffix(ruleSuffix);
try { try {
//新生成单据规则保存到数据库 //新生成单据规则保存到数据库
comparisonEntityRule = comparisonDao.queryComparisonRule(comparisonEntity); ComparisonEntity comparisonEntityRuleGz = comparisonDao.queryComparisonRule(comparisonEntityRule);
map.put("document_rule", comparisonEntityRule.getDocumentRule());//单据规则 map.put("document_rule", comparisonEntityRuleGz.getDocumentRule());//单据规则
map.put("document_rule_num", comparisonEntityRule.getDocumentRuleNum());//单据规则流水号 map.put("document_rule_num", comparisonEntityRuleGz.getDocumentRuleNum());//单据规则流水号
comparisonEntity.setMap(map); comparisonEntityRule.setMap(map);
} catch (Exception e) { } catch (Exception e) {
logger.info("保存通用数据时候生成单据规则错误:{}", e.getMessage()); logger.info("保存通用数据时候生成单据规则错误:{}", e.getMessage());
return BaseResult.getFailureMessageEntity("保存失败"); return BaseResult.getFailureMessageEntity("保存失败");
} }
} }
}catch (Exception e){ } catch (Exception e) {
logger.info("通用数据保存接口中查询单据规则错误:{}",e.getMessage()); logger.info("通用数据保存接口中查询单据规则错误:{}", e.getMessage());
return BaseResult.getFailureMessageEntity("保存失败"); return BaseResult.getFailureMessageEntity("保存失败");
} }
try { try {
//保存主表数据 //保存主表数据
ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntity); ComparisonEntity comparisonEntityOne = comparisonDao.saveComparison(comparisonEntityRule);
//保存子表数据 //保存子表数据
if (mapDetails != null && mapDetails.size() > 0) { if (mapDetails != null && mapDetails.size() > 0) {
String uuidDetail = UUIDUtils.getUUID(); String uuidDetail = UUIDUtils.getUUID();
@ -211,10 +212,10 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
//comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne); //comparisonEntityOne.setComparisonDetailsEntity(comparisonDetailsEntityOne);
map.put("details",mapDetails); map.put("details",mapDetails);
//保存操作日志 //保存操作日志
controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log"); //controlsLogDaoimpl.saveControlsLog(uuidDetail,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonDetailsEntity.getDbName()+"_option_log");
} }
//保存操作日志 //保存操作日志
controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntity.getDbName()+"_option_log"); controlsLogDaoimpl.saveControlsLog(uuid,jsonObject.getString("appName"),jsonObject.getString("appCode"),jsonObject.toJSONString(),"接口新增",jsonObject.getString("optionName"),comparisonEntityRule.getDbName()+"_option_log");
return BaseResult.getSuccessMessageEntity("保存成功", map); return BaseResult.getSuccessMessageEntity("保存成功", map);
} catch (Exception e) { } catch (Exception e) {
logger.info("保存通用数据时候错误:{}", e.getMessage()); logger.info("保存通用数据时候错误:{}", e.getMessage());