opt: 库区,仓库,仓位修改时间,人字段修改
This commit is contained in:
@@ -97,11 +97,11 @@ public class Sectattr {
|
|||||||
/**
|
/**
|
||||||
* 修改人
|
* 修改人
|
||||||
*/
|
*/
|
||||||
private String update_optid;
|
private String update_id;
|
||||||
/**
|
/**
|
||||||
* 修改人姓名
|
* 修改人姓名
|
||||||
*/
|
*/
|
||||||
private String update_optname;
|
private String update_name;
|
||||||
/**
|
/**
|
||||||
* 修改时间
|
* 修改时间
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -125,12 +125,12 @@ public class SectattrDto implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* 修改人
|
* 修改人
|
||||||
*/
|
*/
|
||||||
private String update_optid;
|
private String update_id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改人姓名
|
* 修改人姓名
|
||||||
*/
|
*/
|
||||||
private String update_optname;
|
private String update_name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改时间
|
* 修改时间
|
||||||
|
|||||||
@@ -124,8 +124,8 @@ public class SectattrServiceImpl extends ServiceImpl<SectattrMapper, Sectattr> i
|
|||||||
dto.setSect_id(IdUtil.getSnowflake(1, 1).nextId());
|
dto.setSect_id(IdUtil.getSnowflake(1, 1).nextId());
|
||||||
dto.setCreate_id(currentUserId);
|
dto.setCreate_id(currentUserId);
|
||||||
dto.setCreate_name(nickName);
|
dto.setCreate_name(nickName);
|
||||||
dto.setUpdate_optid(currentUserId);
|
dto.setUpdate_id(currentUserId);
|
||||||
dto.setUpdate_optname(nickName);
|
dto.setUpdate_name(nickName);
|
||||||
dto.setUpdate_time(now);
|
dto.setUpdate_time(now);
|
||||||
dto.setCreate_time(now);
|
dto.setCreate_time(now);
|
||||||
StorattrDto storattrDto = storattrService.findById(dto.getStor_id());
|
StorattrDto storattrDto = storattrService.findById(dto.getStor_id());
|
||||||
@@ -149,8 +149,8 @@ public class SectattrServiceImpl extends ServiceImpl<SectattrMapper, Sectattr> i
|
|||||||
|
|
||||||
String now = DateUtil.now();
|
String now = DateUtil.now();
|
||||||
dto.setUpdate_time(now);
|
dto.setUpdate_time(now);
|
||||||
dto.setUpdate_optid(currentUserId);
|
dto.setUpdate_id(currentUserId);
|
||||||
dto.setUpdate_optname(nickName);
|
dto.setUpdate_name(nickName);
|
||||||
StorattrDto storattrDto = storattrService.findById(dto.getStor_id());
|
StorattrDto storattrDto = storattrService.findById(dto.getStor_id());
|
||||||
dto.setStor_name(storattrDto.getStor_name());
|
dto.setStor_name(storattrDto.getStor_name());
|
||||||
|
|
||||||
@@ -176,8 +176,8 @@ public class SectattrServiceImpl extends ServiceImpl<SectattrMapper, Sectattr> i
|
|||||||
sectattr.setSect_id(String.valueOf(sect_id));
|
sectattr.setSect_id(String.valueOf(sect_id));
|
||||||
sectattr.set_delete(true);
|
sectattr.set_delete(true);
|
||||||
sectattr.setUpdate_time(now);
|
sectattr.setUpdate_time(now);
|
||||||
sectattr.setUpdate_optid(currentUserId);
|
sectattr.setUpdate_id(currentUserId);
|
||||||
sectattr.setUpdate_optname(nickName);
|
sectattr.setUpdate_name(nickName);
|
||||||
sectattrMapper.updateById(sectattr);
|
sectattrMapper.updateById(sectattr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,9 +114,9 @@ public class Storattr implements Serializable {
|
|||||||
|
|
||||||
private String create_time;
|
private String create_time;
|
||||||
|
|
||||||
private String update_optid;
|
private String update_id;
|
||||||
|
|
||||||
private String update_optname;
|
private String update_name;
|
||||||
|
|
||||||
private String update_time;
|
private String update_time;
|
||||||
|
|
||||||
|
|||||||
@@ -106,9 +106,9 @@ public class StorattrDto implements Serializable {
|
|||||||
|
|
||||||
private String create_time;
|
private String create_time;
|
||||||
|
|
||||||
private String update_optid;
|
private String update_id;
|
||||||
|
|
||||||
private String update_optname;
|
private String update_name;
|
||||||
|
|
||||||
private String update_time;
|
private String update_time;
|
||||||
|
|
||||||
|
|||||||
@@ -101,8 +101,8 @@ public class StorattrServiceImpl extends ServiceImpl<StorattrMapper, Storattr> i
|
|||||||
dto.setStor_id(IdUtil.getSnowflake(1, 1).nextId());
|
dto.setStor_id(IdUtil.getSnowflake(1, 1).nextId());
|
||||||
dto.setCreate_id(currentUserId);
|
dto.setCreate_id(currentUserId);
|
||||||
dto.setCreate_name(nickName);
|
dto.setCreate_name(nickName);
|
||||||
dto.setUpdate_optid(currentUserId);
|
dto.setUpdate_id(currentUserId);
|
||||||
dto.setUpdate_optname(nickName);
|
dto.setUpdate_name(nickName);
|
||||||
dto.setUpdate_time(now);
|
dto.setUpdate_time(now);
|
||||||
dto.setCreate_time(now);
|
dto.setCreate_time(now);
|
||||||
|
|
||||||
@@ -133,8 +133,8 @@ public class StorattrServiceImpl extends ServiceImpl<StorattrMapper, Storattr> i
|
|||||||
|
|
||||||
String now = DateUtil.now();
|
String now = DateUtil.now();
|
||||||
dto.setUpdate_time(now);
|
dto.setUpdate_time(now);
|
||||||
dto.setUpdate_optid(currentUserId);
|
dto.setUpdate_id(currentUserId);
|
||||||
dto.setUpdate_optname(nickName);
|
dto.setUpdate_name(nickName);
|
||||||
dto.setSyscompanyid(dto.getSysdeptid());
|
dto.setSyscompanyid(dto.getSysdeptid());
|
||||||
|
|
||||||
storattrMapper.updateById(BeanUtil.copyProperties(dto, Storattr.class));
|
storattrMapper.updateById(BeanUtil.copyProperties(dto, Storattr.class));
|
||||||
@@ -151,8 +151,8 @@ public class StorattrServiceImpl extends ServiceImpl<StorattrMapper, Storattr> i
|
|||||||
Storattr storattr = new Storattr();
|
Storattr storattr = new Storattr();
|
||||||
storattr.setStor_id(stor_id);
|
storattr.setStor_id(stor_id);
|
||||||
storattr.setIs_delete("1");
|
storattr.setIs_delete("1");
|
||||||
storattr.setUpdate_optid(currentUserId);
|
storattr.setUpdate_id(currentUserId);
|
||||||
storattr.setUpdate_optname(nickName);
|
storattr.setUpdate_name(nickName);
|
||||||
storattr.setUpdate_time(now);
|
storattr.setUpdate_time(now);
|
||||||
storattrMapper.updateById(storattr);
|
storattrMapper.updateById(storattr);
|
||||||
}
|
}
|
||||||
@@ -216,8 +216,8 @@ public class StorattrServiceImpl extends ServiceImpl<StorattrMapper, Storattr> i
|
|||||||
is_used = "0";
|
is_used = "0";
|
||||||
}
|
}
|
||||||
storattr.setIs_used(is_used);
|
storattr.setIs_used(is_used);
|
||||||
storattr.setUpdate_optid(currentUserId);
|
storattr.setUpdate_id(currentUserId);
|
||||||
storattr.setUpdate_optname(nickName);
|
storattr.setUpdate_name(nickName);
|
||||||
storattr.setUpdate_time(now);
|
storattr.setUpdate_time(now);
|
||||||
storattrMapper.updateById(storattr);
|
storattrMapper.updateById(storattr);
|
||||||
|
|
||||||
@@ -225,16 +225,16 @@ public class StorattrServiceImpl extends ServiceImpl<StorattrMapper, Storattr> i
|
|||||||
Long stor_id = storattr.getStor_id();
|
Long stor_id = storattr.getStor_id();
|
||||||
Structattr structattr = new Structattr();
|
Structattr structattr = new Structattr();
|
||||||
structattr.setIs_used(is_used);
|
structattr.setIs_used(is_used);
|
||||||
structattr.setUpdate_optid(currentUserId);
|
structattr.setUpdate_id(currentUserId);
|
||||||
structattr.setUpdate_optname(nickName);
|
structattr.setUpdate_name(nickName);
|
||||||
structattr.setUpdate_time(now);
|
structattr.setUpdate_time(now);
|
||||||
structattrServiceImpl.update(structattr,
|
structattrServiceImpl.update(structattr,
|
||||||
Wrappers.lambdaUpdate(Structattr.class).eq(Structattr::getStor_id, stor_id));
|
Wrappers.lambdaUpdate(Structattr.class).eq(Structattr::getStor_id, stor_id));
|
||||||
|
|
||||||
Sectattr sectattr = new Sectattr();
|
Sectattr sectattr = new Sectattr();
|
||||||
sectattr.setIs_used(is_used);
|
sectattr.setIs_used(is_used);
|
||||||
sectattr.setUpdate_optid(currentUserId);
|
sectattr.setUpdate_id(currentUserId);
|
||||||
sectattr.setUpdate_optname(nickName);
|
sectattr.setUpdate_name(nickName);
|
||||||
sectattr.setUpdate_time(now);
|
sectattr.setUpdate_time(now);
|
||||||
sectattrServiceImpl.update(sectattr,
|
sectattrServiceImpl.update(sectattr,
|
||||||
Wrappers.lambdaUpdate(Sectattr.class).eq(Sectattr::getStor_id, stor_id));
|
Wrappers.lambdaUpdate(Sectattr.class).eq(Sectattr::getStor_id, stor_id));
|
||||||
|
|||||||
@@ -135,12 +135,12 @@ public class Structattr implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* 修改人
|
* 修改人
|
||||||
*/
|
*/
|
||||||
private String update_optid;
|
private String update_id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改人姓名
|
* 修改人姓名
|
||||||
*/
|
*/
|
||||||
private String update_optname;
|
private String update_name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改时间
|
* 修改时间
|
||||||
|
|||||||
@@ -135,12 +135,12 @@ public class StructattrDto implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* 修改人
|
* 修改人
|
||||||
*/
|
*/
|
||||||
private String update_optid;
|
private String update_id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改人姓名
|
* 修改人姓名
|
||||||
*/
|
*/
|
||||||
private String update_optname;
|
private String update_name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改时间
|
* 修改时间
|
||||||
|
|||||||
@@ -181,8 +181,8 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
|
|||||||
dto.setStruct_id(IdUtil.getSnowflake(1, 1).nextId());
|
dto.setStruct_id(IdUtil.getSnowflake(1, 1).nextId());
|
||||||
dto.setCreate_id(currentUserId);
|
dto.setCreate_id(currentUserId);
|
||||||
dto.setCreate_name(nickName);
|
dto.setCreate_name(nickName);
|
||||||
dto.setUpdate_optid(currentUserId);
|
dto.setUpdate_id(currentUserId);
|
||||||
dto.setUpdate_optname(nickName);
|
dto.setUpdate_name(nickName);
|
||||||
dto.setUpdate_time(now);
|
dto.setUpdate_time(now);
|
||||||
dto.setCreate_time(now);
|
dto.setCreate_time(now);
|
||||||
SectattrDto sectattrDto = sectattrService.findById(dto.getSect_id());
|
SectattrDto sectattrDto = sectattrService.findById(dto.getSect_id());
|
||||||
@@ -226,8 +226,8 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
|
|||||||
|
|
||||||
String now = DateUtil.now();
|
String now = DateUtil.now();
|
||||||
dto.setUpdate_time(now);
|
dto.setUpdate_time(now);
|
||||||
dto.setUpdate_optid(currentUserId);
|
dto.setUpdate_id(currentUserId);
|
||||||
dto.setUpdate_optname(nickName);
|
dto.setUpdate_name(nickName);
|
||||||
SectattrDto sectattrDto = sectattrService.findById(dto.getSect_id());
|
SectattrDto sectattrDto = sectattrService.findById(dto.getSect_id());
|
||||||
if (ObjectUtil.isNotEmpty(sectattrDto)) {
|
if (ObjectUtil.isNotEmpty(sectattrDto)) {
|
||||||
StorattrDto storattrDto = storattrService.findById(sectattrDto.getStor_id());
|
StorattrDto storattrDto = storattrService.findById(sectattrDto.getStor_id());
|
||||||
@@ -252,8 +252,8 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
|
|||||||
JSONObject param = new JSONObject();
|
JSONObject param = new JSONObject();
|
||||||
param.put("struct_id", String.valueOf(struct_id));
|
param.put("struct_id", String.valueOf(struct_id));
|
||||||
param.put("is_delete", "1");
|
param.put("is_delete", "1");
|
||||||
param.put("update_optid", currentUserId);
|
param.put("update_id", currentUserId);
|
||||||
param.put("update_optname", nickName);
|
param.put("update_name", nickName);
|
||||||
param.put("update_time", now);
|
param.put("update_time", now);
|
||||||
structattrMapper.updateById(BeanUtil.copyProperties(param, Structattr.class));
|
structattrMapper.updateById(BeanUtil.copyProperties(param, Structattr.class));
|
||||||
}
|
}
|
||||||
@@ -279,8 +279,8 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
|
|||||||
is_used = "0";
|
is_used = "0";
|
||||||
}
|
}
|
||||||
json.put("is_used", is_used);
|
json.put("is_used", is_used);
|
||||||
json.put("update_optid", currentUserId);
|
json.put("update_id", currentUserId);
|
||||||
json.put("update_optname", nickName);
|
json.put("update_name", nickName);
|
||||||
json.put("update_time", now);
|
json.put("update_time", now);
|
||||||
structattrMapper.updateById(BeanUtil.copyProperties(json, Structattr.class));
|
structattrMapper.updateById(BeanUtil.copyProperties(json, Structattr.class));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user