FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

恢复

Browse Source
This commit is contained in:
CD
2022-12-02 18:13:41 +08:00
parent 2559c51c45
commit 6175ae4785
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java
+2 -2
View File
@@ -70,9 +70,9 @@ public class EsRevisePlanLogServiceImpl extends ServiceImpl<EsRevisePlanLogDao,
case "4":
//更名
String renameEs = (String) qbfsForm.get("renameEs");
if(!esName.equals(renameEs)) {
//if(!esName.equals(renameEs)) {
msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;";
}
//}
break;
}
if (ObjectUtils.isNotEmpty(esId)&&ObjectUtils.isEmpty(esId1)&&ObjectUtils.isEmpty(esId2)) {
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+7 -7
View File
@@ -87,13 +87,13 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
public String modPlan(EsRevisePlan esRevisePlan) {
List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
//添加日志信息 日志数据进行组合 对象数据转换为json 仅支持修改企业名称
EsRevisePlan selectById = esRevisePlanDao.selectById(esRevisePlan.getId());
HashMap<String, String> mapJson = new HashMap<>();
mapJson.put("type","4");
mapJson.put("esId",esRevisePlan.getId());
mapJson.put("esName",selectById.getEsName());
mapJson.put("renameEs",esRevisePlan.getEsName());
esRevisePlanLogService.addLog(JSON.parseObject(JSON.toJSONString(mapJson)));
// EsRevisePlan selectById = esRevisePlanDao.selectById(esRevisePlan.getId());
// HashMap<String, String> mapJson = new HashMap<>();
// mapJson.put("type","4");
// mapJson.put("esId",esRevisePlan.getId());
// mapJson.put("esName",selectById.getEsName());
// mapJson.put("renameEs",esRevisePlan.getEsName());
// esRevisePlanLogService.addLog(JSON.parseObject(JSON.toJSONString(mapJson)));
if (esRevisePlans.size()>0){
return "企标名称不能重复,请更换新的企标名称。";
}else {