|
@@ -11,6 +11,7 @@ import thyyxxk.webserver.entity.lc.company.LcCompany;
|
|
|
import thyyxxk.webserver.entity.lc.company.LcCompanyParam;
|
|
|
import thyyxxk.webserver.entity.lc.purchasePlan.LcPurchasePlanDetail;
|
|
|
|
|
|
+import java.util.List;
|
|
|
import java.util.UUID;
|
|
|
|
|
|
@Slf4j
|
|
@@ -24,14 +25,20 @@ public class LcCompanyService {
|
|
|
return dao.selectById(id);
|
|
|
}
|
|
|
|
|
|
- public Page<LcCompany> getLcCompanyList(LcCompanyParam lcCompanyParam) {
|
|
|
- Page<LcCompany> page = new Page<>(lcCompanyParam.getPageNumber(), lcCompanyParam.getPageSize());
|
|
|
+ public Object getLcCompanyList(LcCompanyParam lcCompanyParam) {
|
|
|
LambdaQueryWrapper<LcCompany> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(lcCompanyParam.getCompanyName())) {
|
|
|
queryWrapper.like(LcCompany::getCompanyName, lcCompanyParam.getCompanyName());
|
|
|
}
|
|
|
|
|
|
- return dao.selectPage(page, queryWrapper);
|
|
|
+ Integer pageNumber = lcCompanyParam.getPageNumber();
|
|
|
+ Integer pageSize = lcCompanyParam.getPageSize();
|
|
|
+ if (pageNumber != null && pageSize != null) {
|
|
|
+ Page<LcCompany> page = new Page<>(pageNumber, pageSize);
|
|
|
+ return dao.selectPage(page, queryWrapper);
|
|
|
+ } else {
|
|
|
+ return dao.selectList(queryWrapper);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public int insertLcCompany(LcCompany lcCompany) {
|
|
@@ -40,6 +47,16 @@ public class LcCompanyService {
|
|
|
num = dao.updateById(lcCompany);
|
|
|
} else {
|
|
|
lcCompany.setId(UUID.randomUUID().toString().replace("-", ""));
|
|
|
+ String serialNo = dao.getSerialNo(lcCompany.getCompanyType());
|
|
|
+ lcCompany.setSerialNo(serialNo);
|
|
|
+ String companyCode = "";
|
|
|
+ if("0".equals(lcCompany.getCompanyType())) {
|
|
|
+ companyCode = "XS0";
|
|
|
+ } else {
|
|
|
+ companyCode = "SC1";
|
|
|
+ }
|
|
|
+ companyCode += serialNo;
|
|
|
+ lcCompany.setCompanyCode(companyCode);
|
|
|
num = dao.insert(lcCompany);
|
|
|
|
|
|
}
|