lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

通过行政区划下载excel新增

master
徐杰盟 2024-05-29 15:19:22 +08:00
parent b16d5f4738
commit 981c0a4eb6
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/whdc/controller/AddressBookController.java
View File

@ -141,7 +141,7 @@ public class AddressBookController {
} }
// 添加日志 // 添加日志
versionsService.saveInfo(model, VersionsType.ADD); versionsService.saveInfo(model, VersionsType.ADD,model.getAdcd());
model.setId(null); model.setId(null);
boolean save = service.save(model); boolean save = service.save(model);
@ -246,7 +246,11 @@ public class AddressBookController {
// } // }
// // 添加日志 // // 添加日志
// versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE.getName())); // versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE.getName()));
versionsService.saveInfo(model, VersionsType.UPDATE); String adcd = model.getAdcd();
if (StringUtils.isBlank(adcd)){
adcd = byId.getAdcd();
}
versionsService.saveInfo(model, VersionsType.UPDATE,adcd);
boolean data = service.updateById(model); boolean data = service.updateById(model);
if (data) { if (data) {
String organization = model.getOrganization(); String organization = model.getOrganization();
@ -337,7 +341,7 @@ public class AddressBookController {
// } // }
// // 添加日志 // // 添加日志
// versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE_ROLE.getName())); // versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE_ROLE.getName()));
versionsService.saveInfo(byId, VersionsType.UPDATE_ROLE); versionsService.saveInfo(byId, VersionsType.UPDATE_ROLE,byId.getAdcd());
// 只修改角色 // 只修改角色
@ -389,7 +393,7 @@ public class AddressBookController {
// } // }
// // 添加日志 // // 添加日志
// versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.DEL.getName())); // versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.DEL.getName()));
versionsService.saveInfo(model, VersionsType.DEL); versionsService.saveInfo(model, VersionsType.DEL,model.getAdcd());
return ResultJson.ok(service.removeById(id)); return ResultJson.ok(service.removeById(id));

2
src/main/java/com/whdc/service/IVersionsService.java
View File

@ -24,5 +24,5 @@ public interface IVersionsService extends IService<Versions> {
// 获取所有规则 // 获取所有规则
List<Versions> find(Versions dto); List<Versions> find(Versions dto);
boolean saveInfo(AddressBook model, VersionsType versionsType); boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd);
} }

5
src/main/java/com/whdc/service/impl/VersionsServiceImpl.java
View File

@ -3,7 +3,6 @@ package com.whdc.service.impl;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.whdc.mapper.VersionsMapper; import com.whdc.mapper.VersionsMapper;
import com.whdc.model.dto.CommDto; import com.whdc.model.dto.CommDto;
@ -44,7 +43,7 @@ public class VersionsServiceImpl extends ServiceImpl<VersionsMapper, Versions> i
} }
@Override @Override
public boolean saveInfo(AddressBook model, VersionsType versionsType) { public boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd) {
Integer version = 0; Integer version = 0;
@ -64,7 +63,7 @@ public class VersionsServiceImpl extends ServiceImpl<VersionsMapper, Versions> i
// 添加日志 // 添加日志
Versions entity = new Versions(null, Versions entity = new Versions(null,
JSON.toJSONString(model), model.getId(), ++version, String.valueOf(StpUtil.getLoginId()), new Date(),versionsType.getName(), JSON.toJSONString(model), model.getId(), ++version, adcd,String.valueOf(StpUtil.getLoginId()), new Date(),versionsType.getName(),
null, null null, null
); );