UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改BeanUtil.copyProperties方法

Browse Source
dev2.0
anthonywj 2 years ago
parent 2a790a07d7
commit 629dddb9f9
41 changed files with 139 additions and 101 deletions
Show Stats Download Patch File Download Diff File

17
src/main/java/com/glxp/api/controller/auth/AuthAdminController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.auth; package com.glxp.api.controller.auth;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
@ -80,7 +81,7 @@ public class AuthAdminController {
// // 视图列表 // // 视图列表
// List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> { // List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> {
// AuthAdminResponse authAdminResponse = new AuthAdminResponse(); // AuthAdminResponse authAdminResponse = new AuthAdminResponse();
// BeanUtils.copyProperties(item, authAdminResponse); // BeanUtil.copyProperties(item, authAdminResponse);
// List<Long> roles = authRoleAdminList.stream() // List<Long> roles = authRoleAdminList.stream()
// .filter(authRoleAdmin -> authAdminResponse.getId().equals(authRoleAdmin.getAdmin_id())) // .filter(authRoleAdmin -> authAdminResponse.getId().equals(authRoleAdmin.getAdmin_id()))
// .map(AuthRoleAdmin::getRole_id) // .map(AuthRoleAdmin::getRole_id)
@ -112,7 +113,7 @@ public class AuthAdminController {
// pageSimpleResponse.setTotal(pageInfo.getTotal()); // pageSimpleResponse.setTotal(pageInfo.getTotal());
// List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> { // List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> {
// AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); // AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
// BeanUtils.copyProperties(e, authAdminRoleResponse); // BeanUtil.copyProperties(e, authAdminRoleResponse);
// return authAdminRoleResponse; // return authAdminRoleResponse;
// }).collect(Collectors.toList()); // }).collect(Collectors.toList());
// pageSimpleResponse.setList(authAdminRoleResponses); // pageSimpleResponse.setList(authAdminRoleResponses);
@ -139,7 +140,7 @@ public class AuthAdminController {
// pageSimpleResponse.setTotal(pageInfo.getTotal()); // pageSimpleResponse.setTotal(pageInfo.getTotal());
// List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> { // List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> {
// AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); // AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
// BeanUtils.copyProperties(e, authAdminRoleResponse); // BeanUtil.copyProperties(e, authAdminRoleResponse);
// return authAdminRoleResponse; // return authAdminRoleResponse;
// }).collect(Collectors.toList()); // }).collect(Collectors.toList());
// pageSimpleResponse.setList(authAdminRoleResponses); // pageSimpleResponse.setList(authAdminRoleResponses);
@ -160,7 +161,7 @@ public class AuthAdminController {
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> { List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> {
AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
BeanUtils.copyProperties(e, authAdminRoleResponse); BeanUtil.copyProperties(e, authAdminRoleResponse);
return authAdminRoleResponse; return authAdminRoleResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
pageSimpleResponse.setList(authAdminRoleResponses); pageSimpleResponse.setList(authAdminRoleResponses);
@ -181,7 +182,7 @@ public class AuthAdminController {
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> { List<AuthAdminRoleResponse> authAdminRoleResponses = authRoleList.stream().map(e -> {
AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse();
BeanUtils.copyProperties(e, authAdminRoleResponse); BeanUtil.copyProperties(e, authAdminRoleResponse);
return authAdminRoleResponse; return authAdminRoleResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
pageSimpleResponse.setList(authAdminRoleResponses); pageSimpleResponse.setList(authAdminRoleResponses);
@ -221,7 +222,7 @@ public class AuthAdminController {
// } // }
// //
// AuthAdmin authAdmin = new AuthAdmin(); // AuthAdmin authAdmin = new AuthAdmin();
// BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); // BeanUtil.copyProperties(authAdminSaveRequest, authAdmin);
// //
// if (authAdmin.getPassWord() != null) { // if (authAdmin.getPassWord() != null) {
// authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); // authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
@ -278,7 +279,7 @@ public class AuthAdminController {
// } // }
// //
// AuthAdmin authAdmin = new AuthAdmin(); // AuthAdmin authAdmin = new AuthAdmin();
// BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); // BeanUtil.copyProperties(authAdminSaveRequest, authAdmin);
// if (authAdmin.getPassWord() != null) { // if (authAdmin.getPassWord() != null) {
// authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); // authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
// } // }
@ -317,7 +318,7 @@ public class AuthAdminController {
// authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId()); // authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId());
// } // }
// AuthAdmin authAdmin = new AuthAdmin(); // AuthAdmin authAdmin = new AuthAdmin();
// BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); // BeanUtil.copyProperties(authAdminSaveRequest, authAdmin);
// authAdmin.setLastModifyTime(new Date()); // authAdmin.setLastModifyTime(new Date());
// boolean b = authAdminService.updateAuthAdmin(authAdmin); // boolean b = authAdminService.updateAuthAdmin(authAdmin);
// if (!b) { // if (!b) {

3
src/main/java/com/glxp/api/controller/auth/AuthUserController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.auth; package com.glxp.api.controller.auth;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -45,7 +46,7 @@ public class AuthUserController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
AuthAdmin authAdmin = new AuthAdmin(); AuthAdmin authAdmin = new AuthAdmin();
BeanUtils.copyProperties(authUserSaveRequest, authAdmin); BeanUtil.copyProperties(authUserSaveRequest, authAdmin);
authAdmin.setId(getUserId()); authAdmin.setId(getUserId());
authAdmin.setLastModifyTime(new Date()); authAdmin.setLastModifyTime(new Date());
boolean b = authAdminService.updateAuthAdmin(authAdmin); boolean b = authAdminService.updateAuthAdmin(authAdmin);

5
src/main/java/com/glxp/api/controller/auth/LoginController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.auth; package com.glxp.api.controller.auth;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -218,7 +219,7 @@ public class LoginController extends BaseController {
Long id = Long.valueOf(adminId); Long id = Long.valueOf(adminId);
AuthAdmin authAdmin = authAdminService.findById(id); AuthAdmin authAdmin = authAdminService.findById(id);
LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse();
BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); BeanUtil.copyProperties(authAdmin, loginUserInfoResponse);
DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocDeptCode()); DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocDeptCode());
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocInvCode()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocInvCode());
loginUserInfoResponse.setLocDeptName(deptEntity.getName()); loginUserInfoResponse.setLocDeptName(deptEntity.getName());
@ -236,7 +237,7 @@ public class LoginController extends BaseController {
Long id = Long.valueOf(adminId); Long id = Long.valueOf(adminId);
AuthAdmin authAdmin = authAdminService.findById(id); AuthAdmin authAdmin = authAdminService.findById(id);
LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse();
BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); BeanUtil.copyProperties(authAdmin, loginUserInfoResponse);
CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId()); CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
if ("110".equals(authAdmin.getCustomerId())) { if ("110".equals(authAdmin.getCustomerId())) {
loginUserInfoResponse.setCompanyName(authAdmin.getEmployeeName()); loginUserInfoResponse.setCompanyName(authAdmin.getEmployeeName());

7
src/main/java/com/glxp/api/controller/auth/SysUserController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
@ -72,7 +73,7 @@ public class SysUserController extends BaseController {
//查询对应角色和部门 //查询对应角色和部门
List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> { List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> {
AuthAdminResponse authAdminResponse = new AuthAdminResponse(); AuthAdminResponse authAdminResponse = new AuthAdminResponse();
BeanUtils.copyProperties(item, authAdminResponse); BeanUtil.copyProperties(item, authAdminResponse);
List<Long> roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId()); List<Long> roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId());
List<DeptUserResponse> deptUserResponses = null; List<DeptUserResponse> deptUserResponses = null;
if ("key".equals(filterAuthUserRequest.getKey())) { if ("key".equals(filterAuthUserRequest.getKey())) {
@ -184,7 +185,7 @@ public class SysUserController extends BaseController {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在"); return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在");
} }
AuthAdmin authAdmin = new AuthAdmin(); AuthAdmin authAdmin = new AuthAdmin();
BeanUtils.copyProperties(authUserSaveRequest, authAdmin); BeanUtil.copyProperties(authUserSaveRequest, authAdmin);
if (authAdmin.getPassWord() != null) { if (authAdmin.getPassWord() != null) {
authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
} }
@ -281,7 +282,7 @@ public class SysUserController extends BaseController {
} }
AuthAdmin authAdmin = new AuthAdmin(); AuthAdmin authAdmin = new AuthAdmin();
BeanUtils.copyProperties(authUserSaveRequest, authAdmin); BeanUtil.copyProperties(authUserSaveRequest, authAdmin);
if (authAdmin.getPassWord() != null) { if (authAdmin.getPassWord() != null) {
authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
} }

2
src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
Unescape Escape View File

@ -350,7 +350,7 @@ public class BasicBussinessTypeController extends BaseController {
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest); List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest);
for (BasicBussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { for (BasicBussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
BussinessTypExportResponse bussinessTypExportResponse = new BussinessTypExportResponse(); BussinessTypExportResponse bussinessTypExportResponse = new BussinessTypExportResponse();
BeanUtils.copyProperties(bussinessTypeEntity, bussinessTypExportResponse); BeanUtil.copyProperties(bussinessTypeEntity, bussinessTypExportResponse);
bussinessTypExportResponses.add(bussinessTypExportResponse); bussinessTypExportResponses.add(bussinessTypExportResponse);
} }
String json = JSONObject.toJSON(bussinessTypExportResponses).toString(); String json = JSONObject.toJSON(bussinessTypExportResponses).toString();

11
src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
@ -123,7 +124,7 @@ public class BasicCorpController {
} }
BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity(); BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity();
BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); BeanUtil.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
basicUnitMaintainEntity.setErpId(CustomUtil.getId()); basicUnitMaintainEntity.setErpId(CustomUtil.getId());
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
basicUnitMaintainEntity.setUpdateTime(new Date()); basicUnitMaintainEntity.setUpdateTime(new Date());
@ -168,7 +169,7 @@ public class BasicCorpController {
List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item ->
{ {
BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse();
BeanUtils.copyProperties(item, basicUnitMaintainResponse); BeanUtil.copyProperties(item, basicUnitMaintainResponse);
basicUnitMaintainResponse.setUnitId(item.getErpId()); basicUnitMaintainResponse.setUnitId(item.getErpId());
return basicUnitMaintainResponse; return basicUnitMaintainResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@ -195,7 +196,7 @@ public class BasicCorpController {
List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item ->
{ {
BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse();
BeanUtils.copyProperties(item, basicUnitMaintainResponse); BeanUtil.copyProperties(item, basicUnitMaintainResponse);
basicUnitMaintainResponse.setUnitId(item.getErpId()); basicUnitMaintainResponse.setUnitId(item.getErpId());
return basicUnitMaintainResponse; return basicUnitMaintainResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@ -392,14 +393,14 @@ public class BasicCorpController {
// //
// } else { // } else {
// FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); // FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
// BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); // BeanUtil.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
// filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); // filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
// List<ThrCorpEntity> thrCorpEntities // List<ThrCorpEntity> thrCorpEntities
// = thrCorpService.filterThrCorps(filterThrCorpRequest); // = thrCorpService.filterThrCorps(filterThrCorpRequest);
// List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item -> // List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
// { // {
// ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); // ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
// BeanUtils.copyProperties(item, thrCorpEntity); // BeanUtil.copyProperties(item, thrCorpEntity);
// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(item.getUnitId(), unitMaintainFilterRequest.getThirdSys()); // BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(item.getUnitId(), unitMaintainFilterRequest.getThirdSys());
// if (basicUnitMaintainEntity != null) { // if (basicUnitMaintainEntity != null) {
// thrCorpEntity.setChecked(true); // thrCorpEntity.setChecked(true);

5
src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
@ -188,7 +189,7 @@ public class BasicProductsExportLogController {
List<UdiRlDlResponse> udiRlDlResponses = udiRelevanceResponses.stream().map(item -> List<UdiRlDlResponse> udiRlDlResponses = udiRelevanceResponses.stream().map(item ->
{ {
UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse(); UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse();
BeanUtils.copyProperties(item, udiRlDlResponse); BeanUtil.copyProperties(item, udiRlDlResponse);
return udiRlDlResponse; return udiRlDlResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
PageInfo<UdiRelevanceResponse> pageInfo; PageInfo<UdiRelevanceResponse> pageInfo;
@ -227,7 +228,7 @@ public class BasicProductsExportLogController {
List<UdiRlDlResponse> udiRlDlResponses = udiRelevanceResponses.stream().map(item -> List<UdiRlDlResponse> udiRlDlResponses = udiRelevanceResponses.stream().map(item ->
{ {
UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse(); UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse();
BeanUtils.copyProperties(item, udiRlDlResponse); BeanUtil.copyProperties(item, udiRlDlResponse);
return udiRlDlResponse; return udiRlDlResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
PageInfo<UdiRelevanceResponse> pageInfo; PageInfo<UdiRelevanceResponse> pageInfo;

3
src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -306,7 +307,7 @@ public class UdiContrastController {
ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), thrSystemEntity.getThirdId()); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), thrSystemEntity.getThirdId());
UdiProductEntity UdiInfoRequest = new UdiProductEntity(); UdiProductEntity UdiInfoRequest = new UdiProductEntity();
BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest); BeanUtil.copyProperties(thrProductsEntity, UdiInfoRequest);
UdiInfoRequest.setNameCode(thrProductsEntity.getCode()); UdiInfoRequest.setNameCode(thrProductsEntity.getCode());
UdiInfoRequest.setCpmctymc(thrProductsEntity.getName()); UdiInfoRequest.setCpmctymc(thrProductsEntity.getName());
UdiInfoRequest.setManufactory(thrProductsEntity.getManufactory()); UdiInfoRequest.setManufactory(thrProductsEntity.getManufactory());

7
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -232,8 +233,8 @@ public class UdiRelevanceController extends BaseController {
if (CollUtil.isNotEmpty(udiInfoEntities)) { if (CollUtil.isNotEmpty(udiInfoEntities)) {
for (UdiProductEntity udiProductEntity : udiInfoEntities) { for (UdiProductEntity udiProductEntity : udiInfoEntities) {
UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse();
BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse); BeanUtil.copyProperties(udiProductEntity, udiRelevanceResponse);
BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse); BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
udiRelevanceResponses.add(udiRelevanceResponse); udiRelevanceResponses.add(udiRelevanceResponse);
} }
} }
@ -312,7 +313,7 @@ public class UdiRelevanceController extends BaseController {
//更新关联表 //更新关联表
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
BeanUtils.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity); BeanUtil.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity);
udiRelevanceEntity.setId(udiRelevanceSaveRequest.getId()); udiRelevanceEntity.setId(udiRelevanceSaveRequest.getId());
udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setUpdateTime(new Date());
udiRelevanceEntity.setModifyTime(new Date()); udiRelevanceEntity.setModifyTime(new Date());

3
src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -244,7 +245,7 @@ public class UdiRlSupController extends BaseController {
udiRelevanceEntity.setLockStatus(1); udiRelevanceEntity.setLockStatus(1);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
UdiProductEntity udiProductEntity = new UdiProductEntity(); UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity); BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity);
udiProductEntity.setId(IdUtil.getSnowflakeNextId()); udiProductEntity.setId(IdUtil.getSnowflakeNextId());
udiProductService.insertUdiInfo(udiProductEntity); udiProductService.insertUdiInfo(udiProductEntity);
return ResultVOUtils.success("选入成功！"); return ResultVOUtils.success("选入成功！");

3
src/main/java/com/glxp/api/controller/basic/UdiSyncController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -58,7 +59,7 @@ public class UdiSyncController {
nameCode = filterUdiRelRequest.getNameCode(); nameCode = filterUdiRelRequest.getNameCode();
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
BeanUtils.copyProperties(filterUdiRelRequest, productInfoFilterRequest); BeanUtil.copyProperties(filterUdiRelRequest, productInfoFilterRequest);
if (StrUtil.isNotEmpty(nameCode)) { if (StrUtil.isNotEmpty(nameCode)) {
productInfoFilterRequest.setNameCode(nameCode); productInfoFilterRequest.setNameCode(nameCode);
} else { } else {

4
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -370,7 +370,7 @@ public class IoOrderController extends BaseController {
orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo()); orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo());
for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) { for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) {
IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity();
BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); BeanUtil.copyProperties(orderDetailCodeEntity, orderDetailBizEntity);
orderDetailBizEntity.setId(null); orderDetailBizEntity.setId(null);
getSomeBiz(orderDetailBizEntities, orderDetailBizEntity); getSomeBiz(orderDetailBizEntities, orderDetailBizEntity);
orderDetailBizService.insert(orderDetailBizEntity); orderDetailBizService.insert(orderDetailBizEntity);
@ -524,7 +524,7 @@ public class IoOrderController extends BaseController {
if (CollUtil.isNotEmpty(orderResponses)) { if (CollUtil.isNotEmpty(orderResponses)) {
for (IoOrderResponse orderResponse : orderResponses) { for (IoOrderResponse orderResponse : orderResponses) {
PdaBusOrderResponse pdaBusOrderResponse = new PdaBusOrderResponse(); PdaBusOrderResponse pdaBusOrderResponse = new PdaBusOrderResponse();
BeanUtils.copyProperties(orderResponse, pdaBusOrderResponse); BeanUtil.copyProperties(orderResponse, pdaBusOrderResponse);
FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest(); FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
filterOrderDetailBizRequest.setOrderIdFk(orderResponse.getBillNo()); filterOrderDetailBizRequest.setOrderIdFk(orderResponse.getBillNo());
List<IoOrderDetailBizResponse> orderDetailBizEntities = orderDetailBizService.filterList(filterOrderDetailBizRequest); List<IoOrderDetailBizResponse> orderDetailBizEntities = orderDetailBizService.filterList(filterOrderDetailBizRequest);

5
src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.purchase; package com.glxp.api.controller.purchase;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -156,7 +157,7 @@ public class PurApplyController {
Long userId = customerService.getUserId(); Long userId = customerService.getUserId();
PurApplyEntity purApplyEntity = new PurApplyEntity(); PurApplyEntity purApplyEntity = new PurApplyEntity();
BeanUtils.copyProperties(purApplyRequest, purApplyEntity); BeanUtil.copyProperties(purApplyRequest, purApplyEntity);
purApplyEntity.setUpdateTime(new Date()); purApplyEntity.setUpdateTime(new Date());
purApplyEntity.setAuditTime(new Date()); purApplyEntity.setAuditTime(new Date());
purApplyEntity.setAuditUser(userId + ""); purApplyEntity.setAuditUser(userId + "");
@ -190,7 +191,7 @@ public class PurApplyController {
if (CollUtil.isNotEmpty(purApplyDetailEntities)) { if (CollUtil.isNotEmpty(purApplyDetailEntities)) {
for (PurApplyDetailEntity purApplyDetailEntity : purApplyDetailEntities) { for (PurApplyDetailEntity purApplyDetailEntity : purApplyDetailEntities) {
PurPlanDetailEntity purPlanDetailEntity = new PurPlanDetailEntity(); PurPlanDetailEntity purPlanDetailEntity = new PurPlanDetailEntity();
BeanUtils.copyProperties(purApplyDetailEntity, purPlanDetailEntity); BeanUtil.copyProperties(purApplyDetailEntity, purPlanDetailEntity);
purPlanDetailEntity.setOrderIdFk(purPlanEntity.getId() + ""); purPlanDetailEntity.setOrderIdFk(purPlanEntity.getId() + "");
purPlanDetailService.insert(purPlanDetailEntity); purPlanDetailService.insert(purPlanDetailEntity);
} }

3
src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.purchase; package com.glxp.api.controller.purchase;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -463,7 +464,7 @@ public class PurDeliveryController extends BaseController {
List<PurDeliveryDetailEntity> purDeliveryDetailEntities = purOrderDetailEntities.stream() List<PurDeliveryDetailEntity> purDeliveryDetailEntities = purOrderDetailEntities.stream()
.map(e -> { .map(e -> {
PurDeliveryDetailEntity d = new PurDeliveryDetailEntity(); PurDeliveryDetailEntity d = new PurDeliveryDetailEntity();
BeanUtils.copyProperties(e, d); BeanUtil.copyProperties(e, d);
return d; return d;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());

3
src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.purchase; package com.glxp.api.controller.purchase;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -335,7 +336,7 @@ public class PurOrderController {
List<PurOrderDetailEntity> purOrderDetailEntityList = purApplyDetailEntityList.stream() List<PurOrderDetailEntity> purOrderDetailEntityList = purApplyDetailEntityList.stream()
.map(e -> { .map(e -> {
PurOrderDetailEntity d = new PurOrderDetailEntity(); PurOrderDetailEntity d = new PurOrderDetailEntity();
BeanUtils.copyProperties(e, d); BeanUtil.copyProperties(e, d);
return d; return d;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());

3
src/main/java/com/glxp/api/controller/purchase/PurPlanController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.purchase; package com.glxp.api.controller.purchase;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -288,7 +289,7 @@ public class PurPlanController {
List<PurPlanDetailEntity> purPlanDetailEntityList = purApplyDetailEntityList.stream() List<PurPlanDetailEntity> purPlanDetailEntityList = purApplyDetailEntityList.stream()
.map(e-> { .map(e-> {
PurPlanDetailEntity d = new PurPlanDetailEntity(); PurPlanDetailEntity d = new PurPlanDetailEntity();
BeanUtils.copyProperties(e, d); BeanUtil.copyProperties(e, d);
return d; return d;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());

3
src/main/java/com/glxp/api/controller/purchase/SupCertController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.purchase; package com.glxp.api.controller.purchase;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -305,7 +306,7 @@ public class SupCertController {
@Log(title = "资质证书", businessType = BusinessType.UPDATE) @Log(title = "资质证书", businessType = BusinessType.UPDATE)
public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) { public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) {
SupCertEntity supCertEntity = new SupCertEntity(); SupCertEntity supCertEntity = new SupCertEntity();
BeanUtils.copyProperties(postSupCertRequest, supCertEntity); BeanUtil.copyProperties(postSupCertRequest, supCertEntity);
if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) { if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) {

3
src/main/java/com/glxp/api/controller/purchase/SupProductController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.purchase; package com.glxp.api.controller.purchase;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -162,7 +163,7 @@ public class SupProductController {
return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！");
} else { } else {
supProductEntity = new SupProductEntity(); supProductEntity = new SupProductEntity();
BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); BeanUtil.copyProperties(udiRelevanceResponse, supProductEntity);
supProductEntity.setProductId(selectProductBindRequest.getProductId()); supProductEntity.setProductId(selectProductBindRequest.getProductId());
supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + "");

7
src/main/java/com/glxp/api/controller/sup/CustomerController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.sup; package com.glxp.api.controller.sup;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -103,7 +104,7 @@ public class CustomerController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity(); CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity();
BeanUtils.copyProperties(customerDetailEntity, customerInfoEntity); BeanUtil.copyProperties(customerDetailEntity, customerInfoEntity);
customerInfoEntity.setCustomerId((Long.valueOf(customerDetailEntity.getCustomerId()))); customerInfoEntity.setCustomerId((Long.valueOf(customerDetailEntity.getCustomerId())));
boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity); boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity);
//同时修改用户关联的角色 //同时修改用户关联的角色
@ -155,11 +156,11 @@ public class CustomerController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity(); CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity();
BeanUtils.copyProperties(customerDetailEntity, customerInfoEntity); BeanUtil.copyProperties(customerDetailEntity, customerInfoEntity);
boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity); boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity);
CustomerContactEntity customerContactEntity = new CustomerContactEntity(); CustomerContactEntity customerContactEntity = new CustomerContactEntity();
BeanUtils.copyProperties(customerDetailEntity, customerContactEntity); BeanUtil.copyProperties(customerDetailEntity, customerContactEntity);
boolean c = customerContactService.updateCustomerContact(customerContactEntity); boolean c = customerContactService.updateCustomerContact(customerContactEntity);
if (!b) { if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

3
src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.sync; package com.glxp.api.controller.sync;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Dict;
@ -689,7 +690,7 @@ public class SpsSyncDownloadController {
for (IoCodeEntity warehouseEntity : warehouseEntityList) { for (IoCodeEntity warehouseEntity : warehouseEntityList) {
if (warehouseEntity.getOrderId().equals(orderEntity.getBillNo())) { if (warehouseEntity.getOrderId().equals(orderEntity.getBillNo())) {
IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
BeanUtils.copyProperties(warehouseEntity, codeTempEntity); BeanUtil.copyProperties(warehouseEntity, codeTempEntity);
codeTempEntity.setId(null); codeTempEntity.setId(null);
codeMappert.insert(codeTempEntity); codeMappert.insert(codeTempEntity);
} }

5
src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.system; package com.glxp.api.controller.system;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -67,7 +68,7 @@ public class SysMenuHelpController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity(); SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity();
BeanUtils.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); BeanUtil.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity);
sysMenuHelpService.insertMenuHelp(sysMenuHelpEntity); sysMenuHelpService.insertMenuHelp(sysMenuHelpEntity);
return ResultVOUtils.success("成功"); return ResultVOUtils.success("成功");
} }
@ -81,7 +82,7 @@ public class SysMenuHelpController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity(); SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity();
BeanUtils.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); BeanUtil.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity);
sysMenuHelpService.updateMenuHelp(sysMenuHelpEntity); sysMenuHelpService.updateMenuHelp(sysMenuHelpEntity);
return ResultVOUtils.success("成功"); return ResultVOUtils.success("成功");
} }

5
src/main/java/com/glxp/api/controller/system/SysParamConfigController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.system; package com.glxp.api.controller.system;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -54,7 +55,7 @@ public class SysParamConfigController {
List<SystemParamConfigEntity> systemParamConfigEntityList = systemParamConfigService.queryPage(filterParamConfigRequest); List<SystemParamConfigEntity> systemParamConfigEntityList = systemParamConfigService.queryPage(filterParamConfigRequest);
List<SystemParamConfigResponse> systemParamConfigResponseList = systemParamConfigEntityList.stream().map(item -> { List<SystemParamConfigResponse> systemParamConfigResponseList = systemParamConfigEntityList.stream().map(item -> {
SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse(); SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse();
BeanUtils.copyProperties(item, systemParamConfigResponse); BeanUtil.copyProperties(item, systemParamConfigResponse);
return systemParamConfigResponse; return systemParamConfigResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@ -76,7 +77,7 @@ public class SysParamConfigController {
} }
SystemParamConfigEntity systemParamConfigEntity = new SystemParamConfigEntity(); SystemParamConfigEntity systemParamConfigEntity = new SystemParamConfigEntity();
BeanUtils.copyProperties(sysParamConfigSaveRequest, systemParamConfigEntity); BeanUtil.copyProperties(sysParamConfigSaveRequest, systemParamConfigEntity);
boolean b = systemParamConfigService.insert(systemParamConfigEntity); boolean b = systemParamConfigService.insert(systemParamConfigEntity);
if (!b) { if (!b) {

7
src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.system; package com.glxp.api.controller.system;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -57,7 +58,7 @@ public class SysPdfModuleController {
List<SystemPDFModuleEntity> systemPDFModuleEntityList = systemPDFModuleService.queryPage(filterPDFModuleRequest); List<SystemPDFModuleEntity> systemPDFModuleEntityList = systemPDFModuleService.queryPage(filterPDFModuleRequest);
List<SystemPDFModuleResponse> systemPDFModuleResponseList = systemPDFModuleEntityList.stream().map(item -> { List<SystemPDFModuleResponse> systemPDFModuleResponseList = systemPDFModuleEntityList.stream().map(item -> {
SystemPDFModuleResponse systemPDFModuleResponse = new SystemPDFModuleResponse(); SystemPDFModuleResponse systemPDFModuleResponse = new SystemPDFModuleResponse();
BeanUtils.copyProperties(item, systemPDFModuleResponse); BeanUtil.copyProperties(item, systemPDFModuleResponse);
if (item.getTemplateId() != 0) { if (item.getTemplateId() != 0) {
SystemPDFTemplateEntity systemPDFTemplateEntity = SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(item.getTemplateId())); systemPDFTemplateService.selectById(String.valueOf(item.getTemplateId()));
@ -133,7 +134,7 @@ public class SysPdfModuleController {
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
List<SystemPDFModuleSelectResponse> systemPDFModuleSelectResponses = systemPDFModuleEntityList.stream().map(e -> { List<SystemPDFModuleSelectResponse> systemPDFModuleSelectResponses = systemPDFModuleEntityList.stream().map(e -> {
SystemPDFModuleSelectResponse systemPDFModuleSelectResponse = new SystemPDFModuleSelectResponse(); SystemPDFModuleSelectResponse systemPDFModuleSelectResponse = new SystemPDFModuleSelectResponse();
BeanUtils.copyProperties(e, systemPDFModuleSelectResponse); BeanUtil.copyProperties(e, systemPDFModuleSelectResponse);
systemPDFModuleSelectResponse.setIdStr(String.valueOf(e.getId())); systemPDFModuleSelectResponse.setIdStr(String.valueOf(e.getId()));
return systemPDFModuleSelectResponse; return systemPDFModuleSelectResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@ -154,7 +155,7 @@ public class SysPdfModuleController {
} }
SystemPDFModuleEntity systemPDFModuleEntity = new SystemPDFModuleEntity(); SystemPDFModuleEntity systemPDFModuleEntity = new SystemPDFModuleEntity();
BeanUtils.copyProperties(sysPdfModuleSaveRequest, systemPDFModuleEntity); BeanUtil.copyProperties(sysPdfModuleSaveRequest, systemPDFModuleEntity);
systemPDFModuleEntity.setCreate_time(new Date()); systemPDFModuleEntity.setCreate_time(new Date());
systemPDFModuleEntity.setUpdate_time(new Date()); systemPDFModuleEntity.setUpdate_time(new Date());

5
src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -211,13 +212,13 @@ public class ThrCorpExportLogController {
return udiDlDeviceResponse; return udiDlDeviceResponse;
} else { } else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); BeanUtil.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
List<ThrCorpsResponse> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); List<ThrCorpsResponse> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest);
List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item -> List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
{ {
ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity); BeanUtil.copyProperties(item, thrCorpEntity);
return thrCorpEntity; return thrCorpEntity;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
PageInfo<ThrCorpEntity> pageInfo; PageInfo<ThrCorpEntity> pageInfo;

21
src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -124,8 +125,8 @@ public class ThrOrderController {
if (subErpOrders != null && subErpOrders.size() > 0) { if (subErpOrders != null && subErpOrders.size() > 0) {
for (ThrOrderResponse.SubErpOrder subErpOrder : subErpOrders) { for (ThrOrderResponse.SubErpOrder subErpOrder : subErpOrders) {
ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity(); ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity();
BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity); BeanUtil.copyProperties(erpOrderResponse, thrOrderDetailEntity);
BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity); BeanUtil.copyProperties(subErpOrder, thrOrderDetailEntity);
thrOrderDetailEntity.setGenKeyFk(finalGenKey); thrOrderDetailEntity.setGenKeyFk(finalGenKey);
thrOrderDetailEntity.setThirdSysFk(postThrOrderRequest.getThirdSys()); thrOrderDetailEntity.setThirdSysFk(postThrOrderRequest.getThirdSys());
thrOrderDetailEntity.setUpdateTime(new Date()); thrOrderDetailEntity.setUpdateTime(new Date());
@ -331,7 +332,7 @@ public class ThrOrderController {
for (String id : ids) { for (String id : ids) {
ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id)); ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id));
UploadSmpRequest uploadSmpRequest = new UploadSmpRequest(); UploadSmpRequest uploadSmpRequest = new UploadSmpRequest();
BeanUtils.copyProperties(thrOrderEntity, uploadSmpRequest); BeanUtil.copyProperties(thrOrderEntity, uploadSmpRequest);
uploadSmpRequest.setType(1); uploadSmpRequest.setType(1);
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(id); filterThrOrderDetailRequest.setOrderIdFk(id);
@ -340,7 +341,7 @@ public class ThrOrderController {
List<UploadSmpRequest.SubErpOrder> subErpOrders = new ArrayList<>(); List<UploadSmpRequest.SubErpOrder> subErpOrders = new ArrayList<>();
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
UploadSmpRequest.SubErpOrder subErpOrder = new UploadSmpRequest.SubErpOrder(); UploadSmpRequest.SubErpOrder subErpOrder = new UploadSmpRequest.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrders.add(subErpOrder); subErpOrders.add(subErpOrder);
} }
uploadSmpRequest.setSubErpOrders(subErpOrders); uploadSmpRequest.setSubErpOrders(subErpOrders);
@ -386,7 +387,7 @@ public class ThrOrderController {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());
filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit());
List<ThrOrderResponse> erpOrderResponses = new ArrayList<>(); List<ThrOrderResponse> erpOrderResponses = new ArrayList<>();
@ -397,12 +398,12 @@ public class ThrOrderController {
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); ThrOrderResponse erpOrderResponse = new ThrOrderResponse();
BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse);
List<ThrOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>(); List<ThrOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>();
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrders.add(subErpOrder); subErpOrders.add(subErpOrder);
} }
} }
@ -434,7 +435,7 @@ public class ThrOrderController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());
filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit());
@ -447,12 +448,12 @@ public class ThrOrderController {
List<ThrOrderDetailEntity> thrOrderDetailEntities = List<ThrOrderDetailEntity> thrOrderDetailEntities =
thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); ThrOrderResponse erpOrderResponse = new ThrOrderResponse();
BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse);
List<ThrOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>(); List<ThrOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>();
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrder.setCount(thrOrderDetailEntity.getCount()); subErpOrder.setCount(thrOrderDetailEntity.getCount());
subErpOrder.setReCount(thrOrderDetailEntity.getReCount()); subErpOrder.setReCount(thrOrderDetailEntity.getReCount());
subErpOrders.add(subErpOrder); subErpOrders.add(subErpOrder);

13
src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
@ -128,7 +129,7 @@ public class ThrProductsAddDiController {
} }
SupplementRequest supplementRequest = new SupplementRequest(); SupplementRequest supplementRequest = new SupplementRequest();
BeanUtils.copyProperties(addThrDiProductsRequest, supplementRequest); BeanUtil.copyProperties(addThrDiProductsRequest, supplementRequest);
String vailResult = supplementVailUtil.vail(supplementRequest, SupplementVailUtil.SUP_ADD); String vailResult = supplementVailUtil.vail(supplementRequest, SupplementVailUtil.SUP_ADD);
if (vailResult != null) if (vailResult != null)
return ResultVOUtils.error(500, vailResult); return ResultVOUtils.error(500, vailResult);
@ -187,7 +188,7 @@ public class ThrProductsAddDiController {
//第三方产品审核通过 //第三方产品审核通过
if (thrProductsAddDiEntity.getType() == 2) { if (thrProductsAddDiEntity.getType() == 2) {
ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
BeanUtils.copyProperties(thrProductsAddDiEntity, thrProductsEntity); BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
thrProductsService.insertThrProducts(thrProductsEntity); thrProductsService.insertThrProducts(thrProductsEntity);
ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys(); ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys();
if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk())) if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk()))
@ -228,7 +229,7 @@ public class ThrProductsAddDiController {
udiProductEntity.setNameCode(null); udiProductEntity.setNameCode(null);
udiProductService.updateUdiInfoByUuid(udiProductEntity); udiProductService.updateUdiInfoByUuid(udiProductEntity);
UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceEntity1); BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceEntity1);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1);
// udiInfoService.updateUdiInfo(udiInfoEntity); // udiInfoService.updateUdiInfo(udiInfoEntity);
//回填关联关系到关联表 //回填关联关系到关联表
@ -323,7 +324,7 @@ public class ThrProductsAddDiController {
String customerId = getCustomerId() + ""; String customerId = getCustomerId() + "";
if (customerId.equals("110")) { if (customerId.equals("110")) {
ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
BeanUtils.copyProperties(thrProductsAdddiEntity, thrProductsEntity); BeanUtil.copyProperties(thrProductsAdddiEntity, thrProductsEntity);
thrProductsService.insertThrProducts(thrProductsEntity); thrProductsService.insertThrProducts(thrProductsEntity);
} else { } else {
@ -333,7 +334,7 @@ public class ThrProductsAddDiController {
if (StrUtil.isNotEmpty(thrProductsAdddiEntity.getRelId())) { if (StrUtil.isNotEmpty(thrProductsAdddiEntity.getRelId())) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(Long.valueOf(thrProductsAdddiEntity.getRelId())); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(Long.valueOf(thrProductsAdddiEntity.getRelId()));
if (udiRelevanceResponse != null) { if (udiRelevanceResponse != null) {
BeanUtils.copyProperties(udiRelevanceResponse, thrProductsAdddiEntity); BeanUtil.copyProperties(udiRelevanceResponse, thrProductsAdddiEntity);
thrProductsAdddiEntity.setName(udiRelevanceResponse.getCpmctymc()); thrProductsAdddiEntity.setName(udiRelevanceResponse.getCpmctymc());
thrProductsAdddiEntity.setManufactory(udiRelevanceResponse.getYlqxzcrbarmc()); thrProductsAdddiEntity.setManufactory(udiRelevanceResponse.getYlqxzcrbarmc());
thrProductsAdddiEntity.setSpec(udiRelevanceResponse.getGgxh()); thrProductsAdddiEntity.setSpec(udiRelevanceResponse.getGgxh());
@ -383,7 +384,7 @@ public class ThrProductsAddDiController {
//第三方产品审核通过 //第三方产品审核通过
if (thrProductsAddDiEntity.getType() == 2) { if (thrProductsAddDiEntity.getType() == 2) {
ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
BeanUtils.copyProperties(thrProductsAddDiEntity, thrProductsEntity); BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
thrProductsService.insertThrProducts(thrProductsEntity); thrProductsService.insertThrProducts(thrProductsEntity);
ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys(); ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys();
if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk())) if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk()))

3
src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -136,7 +137,7 @@ public class ThrProductsController {
if (null == thrProductsEntity) if (null == thrProductsEntity)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
BeanUtils.copyProperties(thrProductsEntity, filterThrProductsRequest); BeanUtil.copyProperties(thrProductsEntity, filterThrProductsRequest);
List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest); List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest);
if (thrProductsEntities.size() == 0) { if (thrProductsEntities.size() == 0) {
thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId())); thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId()));

3
src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.thrsys; package com.glxp.api.controller.thrsys;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -85,7 +86,7 @@ public class ThrSystemController {
List<BasicThirdSysResponse> basicThirdSysResponses = basicThirdSysEntities.stream().map(item -> List<BasicThirdSysResponse> basicThirdSysResponses = basicThirdSysEntities.stream().map(item ->
{ {
BasicThirdSysResponse basicThirdSysResponse = new BasicThirdSysResponse(); BasicThirdSysResponse basicThirdSysResponse = new BasicThirdSysResponse();
BeanUtils.copyProperties(item, basicThirdSysResponse); BeanUtil.copyProperties(item, basicThirdSysResponse);
return basicThirdSysResponse; return basicThirdSysResponse;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
basicThirdSysResponses.add(new BasicThirdSysResponse("ybbm", "医保编码")); basicThirdSysResponses.add(new BasicThirdSysResponse("ybbm", "医保编码"));

3
src/main/java/com/glxp/api/http/ErpBasicClient.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.http; package com.glxp.api.http;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
@ -38,7 +39,7 @@ public class ErpBasicClient {
//获取往来单位 //获取往来单位
public BaseResponse<PageSimpleResponse<ThrCorpsResponse>> getErpCrop(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { public BaseResponse<PageSimpleResponse<ThrCorpsResponse>> getErpCrop(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) {
UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest();
BeanUtils.copyProperties(thrUnitMaintainFilterRequest, udiwmsUnitRequest); BeanUtil.copyProperties(thrUnitMaintainFilterRequest, udiwmsUnitRequest);
udiwmsUnitRequest.setUnitId(thrUnitMaintainFilterRequest.getErpId()); udiwmsUnitRequest.setUnitId(thrUnitMaintainFilterRequest.getErpId());
ThrSystemEntity thrSystemEntity = basicThirdSysService.selectByThirdId(thrUnitMaintainFilterRequest.getThirdSys()); ThrSystemEntity thrSystemEntity = basicThirdSysService.selectByThirdId(thrUnitMaintainFilterRequest.getThirdSys());

5
src/main/java/com/glxp/api/http/NmpaUdiClient.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.http; package com.glxp.api.http;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.ProductInfoEntity;
@ -38,7 +39,7 @@ public class NmpaUdiClient {
String myUuid = UuidUtils.getUUId(); String myUuid = UuidUtils.getUUId();
for (ProductInfoEntity productInfoEntity : productInfoEntityList) { for (ProductInfoEntity productInfoEntity : productInfoEntityList) {
UdiProductEntity udiProductEntity = new UdiProductEntity(); UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtils.copyProperties(productInfoEntity, udiProductEntity); BeanUtil.copyProperties(productInfoEntity, udiProductEntity);
udiProductEntity.setUuid(myUuid); udiProductEntity.setUuid(myUuid);
udiProductEntity.setOriginUuid(productInfoEntity.getUuid()); udiProductEntity.setOriginUuid(productInfoEntity.getUuid());
udiProductEntity.setQxlb(productInfoEntity.getCplx()); udiProductEntity.setQxlb(productInfoEntity.getCplx());
@ -81,7 +82,7 @@ public class NmpaUdiClient {
List<UdiProductEntity> udiInfoEntities = new ArrayList<>(); List<UdiProductEntity> udiInfoEntities = new ArrayList<>();
for (ProductInfoEntity productInfoEntity : datas) { for (ProductInfoEntity productInfoEntity : datas) {
UdiProductEntity udiProductEntity = new UdiProductEntity(); UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtils.copyProperties(productInfoEntity, udiProductEntity); BeanUtil.copyProperties(productInfoEntity, udiProductEntity);
udiProductEntity.setQxlb(productInfoEntity.getCplx()); udiProductEntity.setQxlb(productInfoEntity.getCplx());
udiProductEntity.setCplb(productInfoEntity.getHchzsb()); udiProductEntity.setCplb(productInfoEntity.getHchzsb());
udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);

3
src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.basic; package com.glxp.api.service.basic;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
@ -64,7 +65,7 @@ public class BasicUpdateProductService {
if (thrProductsEntities != null && thrProductsEntities.size() > 0) { if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0); ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0);
UdiProductEntity udiProductEntity = new UdiProductEntity(); UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); BeanUtil.copyProperties(thrProductsEntity, udiProductEntity);
udiProductEntity.setNameCode(thrProductsEntity.getCode()); udiProductEntity.setNameCode(thrProductsEntity.getCode());
udiProductEntity.setCpmctymc(thrProductsEntity.getName()); udiProductEntity.setCpmctymc(thrProductsEntity.getName());
udiProductEntity.setManufactory(thrProductsEntity.getManufactory()); udiProductEntity.setManufactory(thrProductsEntity.getManufactory());

5
src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.basic; package com.glxp.api.service.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.basic.UdiRlSupEntity;
@ -39,8 +40,8 @@ public class CompanyProductsRelService {
UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
udiInfoRequest.setUuid(udiRelevanceEntity.getUuid()); udiInfoRequest.setUuid(udiRelevanceEntity.getUuid());
SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest();
BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest); BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest);
BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity); BeanUtil.copyProperties(supplementRequest, udiRelevanceEntity);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
udiProductService.updateUdiInfoNotAll(udiInfoRequest); udiProductService.updateUdiInfoNotAll(udiInfoRequest);
companyProductRelevanceEntity.setCreateTime(new Date()); companyProductRelevanceEntity.setCreateTime(new Date());

3
src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.basic.impl; package com.glxp.api.service.basic.impl;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.basic.ProductInfoDao; import com.glxp.api.dao.basic.ProductInfoDao;
import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.ProductInfoEntity;
@ -140,7 +141,7 @@ public class ProductInfoServiceImpl implements ProductInfoService {
public Long filterUdiNoPageCount(ProductInfoFilterRequest request) { public Long filterUdiNoPageCount(ProductInfoFilterRequest request) {
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
BeanUtils.copyProperties(request, productInfoFilterRequest); BeanUtil.copyProperties(request, productInfoFilterRequest);
if (productInfoFilterRequest.getPage() != null) { if (productInfoFilterRequest.getPage() != null) {
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();

3
src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.inout.impl; package com.glxp.api.service.inout.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -43,7 +44,7 @@ public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoO
public boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest) { public boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity); BeanUtil.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity);
ioOrderInvoiceEntity.setUpdateTime(new Date()); ioOrderInvoiceEntity.setUpdateTime(new Date());
return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity) > 0; return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity) > 0;
} }

2
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -515,7 +515,7 @@ public class IoOrderServiceImpl implements IoOrderService {
List<IoCodeTempEntity> codeTempEntities = new ArrayList<>(); List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
for (IoCodeEntity codeEntity : codeEntityList) { for (IoCodeEntity codeEntity : codeEntityList) {
IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
BeanUtils.copyProperties(codeEntity, codeTempEntity); BeanUtil.copyProperties(codeEntity, codeTempEntity);
codeTempEntity.setId(null); codeTempEntity.setId(null);
codeTempEntities.add(codeTempEntity); codeTempEntities.add(codeTempEntity);
} }

27
src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.thrsys; package com.glxp.api.service.thrsys;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.io.file.FileWriter; import cn.hutool.core.io.file.FileWriter;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -77,7 +78,7 @@ public class ThrCorpsDlService {
thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( thrCorpImportDetailEntities = thrCorpsResponseList.stream().map(
item -> { item -> {
ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity();
BeanUtils.copyProperties(item, thrCorpEntity); BeanUtil.copyProperties(item, thrCorpEntity);
thrCorpEntity.setUnitId(item.getUnitId()); thrCorpEntity.setUnitId(item.getUnitId());
thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setUpdateTime(new Date());
thrCorpEntity.setCreateTime(new Date()); thrCorpEntity.setCreateTime(new Date());
@ -95,7 +96,7 @@ public class ThrCorpsDlService {
List<ThrCorpEntity> thrCorpEntities = temps.stream().map( List<ThrCorpEntity> thrCorpEntities = temps.stream().map(
item -> { item -> {
ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); ThrCorpEntity thrProductsEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrProductsEntity); BeanUtil.copyProperties(item, thrProductsEntity);
thrProductsEntity.setThirdSysFk(thirdSys); thrProductsEntity.setThirdSysFk(thirdSys);
thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setUpdateTime(new Date());
thrProductsEntity.setCreateTime(new Date()); thrProductsEntity.setCreateTime(new Date());
@ -135,7 +136,7 @@ public class ThrCorpsDlService {
List<ThrCorpEntity> thrCorpEntities = thrCorpImportDetailEntities.stream().map( List<ThrCorpEntity> thrCorpEntities = thrCorpImportDetailEntities.stream().map(
item -> { item -> {
ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); ThrCorpEntity thrProductsEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrProductsEntity); BeanUtil.copyProperties(item, thrProductsEntity);
thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setUpdateTime(new Date());
thrProductsEntity.setThirdSysFk(thirdSys); thrProductsEntity.setThirdSysFk(thirdSys);
return thrProductsEntity; return thrProductsEntity;
@ -206,7 +207,7 @@ public class ThrCorpsDlService {
} else { } else {
//根据查询条件一键导出数据库往来单位 //根据查询条件一键导出数据库往来单位
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest);
filterThrCorpRequest.setPage(null); filterThrCorpRequest.setPage(null);
List<List<String>> genDatas = genExcelData(filterThrCorpRequest); List<List<String>> genDatas = genExcelData(filterThrCorpRequest);
if (genDatas != null && genDatas.size() > 0) { if (genDatas != null && genDatas.size() > 0) {
@ -234,7 +235,7 @@ public class ThrCorpsDlService {
thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( thrCorpImportDetailEntities = thrCorpsResponseList.stream().map(
item -> { item -> {
ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity();
BeanUtils.copyProperties(item, thrCorpEntity); BeanUtil.copyProperties(item, thrCorpEntity);
thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setGenKeyFk(finalGenKey);
thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setUpdateTime(new Date());
thrCorpEntity.setThirdSysFk(thirdSys); thrCorpEntity.setThirdSysFk(thirdSys);
@ -245,7 +246,7 @@ public class ThrCorpsDlService {
thrCorpEntities = thrCorpImportDetailEntities.stream().map( thrCorpEntities = thrCorpImportDetailEntities.stream().map(
item -> { item -> {
ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity); BeanUtil.copyProperties(item, thrCorpEntity);
// thrCorpEntity.setUnitId(item.getId()); // thrCorpEntity.setUnitId(item.getId());
thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setUpdateTime(new Date());
thrCorpEntity.setThirdSysFk(thirdSys); thrCorpEntity.setThirdSysFk(thirdSys);
@ -280,7 +281,7 @@ public class ThrCorpsDlService {
thrCorpImportDetailEntities = erpUnitsResponses.stream().map( thrCorpImportDetailEntities = erpUnitsResponses.stream().map(
item -> { item -> {
ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity();
BeanUtils.copyProperties(item, thrCorpEntity); BeanUtil.copyProperties(item, thrCorpEntity);
thrCorpEntity.setUnitId(item.getUnitId()); thrCorpEntity.setUnitId(item.getUnitId());
thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setGenKeyFk(finalGenKey);
thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setUpdateTime(new Date());
@ -340,7 +341,7 @@ public class ThrCorpsDlService {
List<ThrCorpEntity> thrCorpEntities = erpUnitsResponses.stream().map( List<ThrCorpEntity> thrCorpEntities = erpUnitsResponses.stream().map(
item -> { item -> {
ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); ThrCorpEntity thrProductsEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrProductsEntity); BeanUtil.copyProperties(item, thrProductsEntity);
thrProductsEntity.setUnitId(item.getId()); thrProductsEntity.setUnitId(item.getId());
return thrProductsEntity; return thrProductsEntity;
} }
@ -359,7 +360,7 @@ public class ThrCorpsDlService {
thrCorpEntityList = thrCorpsResponseList.stream().map( thrCorpEntityList = thrCorpsResponseList.stream().map(
item -> { item -> {
ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity); BeanUtil.copyProperties(item, thrCorpEntity);
return thrCorpEntity; return thrCorpEntity;
} }
).collect(Collectors.toList()); ).collect(Collectors.toList());
@ -421,14 +422,14 @@ public class ThrCorpsDlService {
//根据查询条件一键导出数据库往来单位 //根据查询条件一键导出数据库往来单位
List<ThrCorpEntity> thrCorpEntityList = new ArrayList<>(); List<ThrCorpEntity> thrCorpEntityList = new ArrayList<>();
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest);
filterThrCorpRequest.setPage(null); filterThrCorpRequest.setPage(null);
List<ThrCorpsResponse> thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest); List<ThrCorpsResponse> thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest);
if (thrCorpsResponseList.size() > 0) { if (thrCorpsResponseList.size() > 0) {
thrCorpEntityList = thrCorpsResponseList.stream().map( thrCorpEntityList = thrCorpsResponseList.stream().map(
item -> { item -> {
ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity); BeanUtil.copyProperties(item, thrCorpEntity);
return thrCorpEntity; return thrCorpEntity;
} }
).collect(Collectors.toList()); ).collect(Collectors.toList());
@ -478,14 +479,14 @@ public class ThrCorpsDlService {
//根据查询条件一键导出数据库往来单位 //根据查询条件一键导出数据库往来单位
List<ThrCorpEntity> thrCorpEntityList = new ArrayList<>(); List<ThrCorpEntity> thrCorpEntityList = new ArrayList<>();
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest);
filterThrCorpRequest.setPage(null); filterThrCorpRequest.setPage(null);
List<ThrCorpsResponse> thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest); List<ThrCorpsResponse> thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest);
if (thrCorpsResponseList.size() > 0) { if (thrCorpsResponseList.size() > 0) {
thrCorpEntityList = thrCorpsResponseList.stream().map( thrCorpEntityList = thrCorpsResponseList.stream().map(
item -> { item -> {
ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity); BeanUtil.copyProperties(item, thrCorpEntity);
return thrCorpEntity; return thrCorpEntity;
} }
).collect(Collectors.toList()); ).collect(Collectors.toList());

3
src/main/java/com/glxp/api/service/thrsys/ThrDataService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.thrsys; package com.glxp.api.service.thrsys;
import cn.hutool.core.bean.BeanUtil;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity;
@ -52,7 +53,7 @@ public class ThrDataService {
List<ThrProductsResponse> erpProductsResponses = udiDlDeviceResponse.getData().getList(); List<ThrProductsResponse> erpProductsResponses = udiDlDeviceResponse.getData().getList();
if (erpProductsResponses != null) { if (erpProductsResponses != null) {
ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
BeanUtils.copyProperties(erpProductsResponses.get(0), thrProductsEntity); BeanUtil.copyProperties(erpProductsResponses.get(0), thrProductsEntity);
return thrProductsEntity; return thrProductsEntity;
} }
} }

7
src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.service.thrsys; package com.glxp.api.service.thrsys;
import cn.hutool.core.bean.BeanUtil;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
@ -57,7 +58,7 @@ public class ThrInvProductsDlService {
List<ThrInvProductsImportDetailEntity> thrProductsEntities = ThrInvProductResponses.stream().map( List<ThrInvProductsImportDetailEntity> thrProductsEntities = ThrInvProductResponses.stream().map(
item -> { item -> {
ThrInvProductsImportDetailEntity thrProductsEntity = new ThrInvProductsImportDetailEntity(); ThrInvProductsImportDetailEntity thrProductsEntity = new ThrInvProductsImportDetailEntity();
BeanUtils.copyProperties(item, thrProductsEntity); BeanUtil.copyProperties(item, thrProductsEntity);
thrProductsEntity.setInventoryCode(item.getCode()); thrProductsEntity.setInventoryCode(item.getCode());
thrProductsEntity.setInventoryName(item.getName()); thrProductsEntity.setInventoryName(item.getName());
thrProductsEntity.setGenKeyFk(genKey); thrProductsEntity.setGenKeyFk(genKey);
@ -78,7 +79,7 @@ public class ThrInvProductsDlService {
List<ThrInvProductsEntity> thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map( List<ThrInvProductsEntity> thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map(
item -> { item -> {
ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity();
BeanUtils.copyProperties(item, thrInvProductsEntity); BeanUtil.copyProperties(item, thrInvProductsEntity);
thrInvProductsEntity.setUpdateTime(new Date()); thrInvProductsEntity.setUpdateTime(new Date());
thrInvProductsEntity.setCreateTime(new Date()); thrInvProductsEntity.setCreateTime(new Date());
thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId()));
@ -114,7 +115,7 @@ public class ThrInvProductsDlService {
List<ThrInvProductsEntity> thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map( List<ThrInvProductsEntity> thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map(
item -> { item -> {
ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity();
BeanUtils.copyProperties(item, thrInvProductsEntity); BeanUtil.copyProperties(item, thrInvProductsEntity);
thrInvProductsEntity.setUpdateTime(new Date()); thrInvProductsEntity.setUpdateTime(new Date());
thrInvProductsEntity.setCreateTime(new Date()); thrInvProductsEntity.setCreateTime(new Date());
thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId()));

5
src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.thrsys.impl; package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.dao.thrsys.ThrOrderImportLogDao; import com.glxp.api.dao.thrsys.ThrOrderImportLogDao;
@ -95,7 +96,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService {
for (List<ThrOrderImportDetailEntity> datas : map.values()) { for (List<ThrOrderImportDetailEntity> datas : map.values()) {
ThrOrderImportDetailEntity thrOrderImportDetailEntity = datas.get(0); ThrOrderImportDetailEntity thrOrderImportDetailEntity = datas.get(0);
ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtils.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); BeanUtil.copyProperties(thrOrderImportDetailEntity, thrOrderEntity);
thrOrderEntity.setUpdateTime(new Date()); thrOrderEntity.setUpdateTime(new Date());
// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(thrOrderEntity.getBillType()); // BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(thrOrderEntity.getBillType());
// if (bussinessTypeEntity != null) { // if (bussinessTypeEntity != null) {
@ -108,7 +109,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService {
{ {
ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
thrOrderDetailEntity.setUpdateTime(new Date()); thrOrderDetailEntity.setUpdateTime(new Date());
BeanUtils.copyProperties(item, thrOrderDetailEntity); BeanUtil.copyProperties(item, thrOrderDetailEntity);
thrOrderDetailEntity.setOrderIdFk(finalThrOrderEntity.getId() + ""); thrOrderDetailEntity.setOrderIdFk(finalThrOrderEntity.getId() + "");
return thrOrderDetailEntity; return thrOrderDetailEntity;

9
src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.thrsys.impl; package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
@ -59,8 +60,8 @@ public class ThrOrderServiceImpl implements ThrOrderService {
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ThrErpOrderResponse thrErpOrderResponse = new ThrErpOrderResponse(); ThrErpOrderResponse thrErpOrderResponse = new ThrErpOrderResponse();
BeanUtils.copyProperties(thrOrderEntity, thrErpOrderResponse); BeanUtil.copyProperties(thrOrderEntity, thrErpOrderResponse);
BeanUtils.copyProperties(thrOrderDetailEntity, thrErpOrderResponse); BeanUtil.copyProperties(thrOrderDetailEntity, thrErpOrderResponse);
thrErpOrderResponse.setCompanyid(thrOrderEntity.getCorpId()); thrErpOrderResponse.setCompanyid(thrOrderEntity.getCorpId());
thrErpOrderResponse.setCompanyname(thrOrderEntity.getCorpName()); thrErpOrderResponse.setCompanyname(thrOrderEntity.getCorpName());
thrErpOrderResponse.setErpOrderId(thrOrderEntity.getBillNo()); thrErpOrderResponse.setErpOrderId(thrOrderEntity.getBillNo());
@ -93,12 +94,12 @@ public class ThrOrderServiceImpl implements ThrOrderService {
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); ThrOrderResponse erpOrderResponse = new ThrOrderResponse();
BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse);
List<ThrOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>(); List<ThrOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>();
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrders.add(subErpOrder); subErpOrders.add(subErpOrder);
} }
} }

3
src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.thrsys.impl; package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
@ -93,7 +94,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
for (String uuid : uuids) { for (String uuid : uuids) {
ProductInfoEntity productInfoEntity = productInfoService.selectByUuid(uuid).get(0); ProductInfoEntity productInfoEntity = productInfoService.selectByUuid(uuid).get(0);
ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity(); ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity();
BeanUtils.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity); BeanUtil.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity);
thrProductsAddDiEntity.setCustomerId(customerId + ""); thrProductsAddDiEntity.setCustomerId(customerId + "");
thrProductsAddDiEntity.setUuid(uuid); thrProductsAddDiEntity.setUuid(uuid);
thrProductsAddDiEntity.setType(1); thrProductsAddDiEntity.setType(1);

Write Preview
Loading…
Cancel
Save