yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(order):订单统计功能;

Browse Source
master
jiyufei 4 months ago
parent b559779158
commit 307bacd5dd
9 changed files with 649 additions and 378 deletions
Show Stats Download Patch File Download Diff File

6
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/EnterpriserecyclestationService.java
Unescape View File

@ -43,4 +43,10 @@ public interface EnterpriserecyclestationService extends IService<Enterpriserecy
//根据所属组织查询回收站
List<EnterpriserecyclestationEntity> getListByCompanyId(String company_id);
/**
* 根据所属组织查询回收站 加入管理员判断
* @param companyId
* @return
*/
List<EnterpriserecyclestationEntity> queryByEnterpriseId(String companyId);
}

18
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleOrderService.java
Unescape View File

@ -2,7 +2,9 @@ package jnpf.service;
import jnpf.model.recycleorder.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
public interface RecycleOrderService extends IService<RecycleOrderEntity> {
List<RecycleOrderEntity> getList(RecycleOrderPagination recycleOrderPagination);
List<RecycleOrderEntity> getTypeList(RecycleOrderPagination recycleOrderPagination,String dataType);
List<RecycleOrderEntity> getTypeList(RecycleOrderPagination recycleOrderPagination, String dataType);
RecycleOrderEntity getInfo(String id);
@ -27,12 +29,20 @@ public interface RecycleOrderService extends IService<RecycleOrderEntity> {
boolean update(String id, RecycleOrderEntity entity);
//子表方法
List<RecycleOrderProductEntity> getRecycleOrderProductList(String id,RecycleOrderPagination recycleOrderPagination);
List<RecycleOrderProductEntity> getRecycleOrderProductList(String id, RecycleOrderPagination recycleOrderPagination);
List<RecycleOrderProductEntity> getRecycleOrderProductList(String id);
//副表数据方法
String checkForm(RecycleOrderForm form,int i);
String checkForm(RecycleOrderForm form, int i);
void saveOrUpdate(RecycleOrderForm recycleOrderForm,String id, boolean isSave) throws Exception;
void saveOrUpdate(RecycleOrderForm recycleOrderForm, String id, boolean isSave) throws Exception;
/**
* 计算
*
* @param request 请求体
* @return list
*/
List<RecycleOrderResponse> compute(RecycleOrderRequest request);
}

18
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriserecyclestationServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package jnpf.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jnpf.entity.*;
import jnpf.mapper.EnterpriserecyclestationMapper;
import jnpf.service.*;
@ -26,6 +27,7 @@ import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -685,4 +687,20 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
List<EnterpriserecyclestationEntity> list = this.list(wrapper);
return list;
}
@Override
public List<EnterpriserecyclestationEntity> queryByEnterpriseId(String companyId) {
LambdaQueryWrapper<EnterpriserecyclestationEntity> wrapper = new LambdaQueryWrapper<>(EnterpriserecyclestationEntity.class)
.eq(EnterpriserecyclestationEntity::getStationStatus, 1);
//如果不是管理员只查自己的
if (userProvider.get().getIsAdministrator()) {
if (StringUtils.isNoneBlank(companyId)) {
wrapper.eq(EnterpriserecyclestationEntity::getEnterpriseId, companyId);
}
} else {
UserInfo userInfo = userProvider.get();
wrapper.eq(EnterpriserecyclestationEntity::getEnterpriseId, userInfo.getOrganizeId());
}
return this.list(wrapper);
}
}

692
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java
Unescape View File

@ -1,43 +1,46 @@
package jnpf.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import jnpf.base.UserInfo;
import jnpf.base.model.ColumnDataModel;
import jnpf.constant.PermissionConst;
import jnpf.entity.*;
import jnpf.database.model.superQuery.SuperJsonModel;
import jnpf.entity.EnterpriserecyclestationEntity;
import jnpf.entity.RecycleOrderEntity;
import jnpf.entity.RecycleOrderProductEntity;
import jnpf.mapper.RecycleOrderMapper;
import jnpf.mapper.RecycleOrderProductMapper;
import jnpf.model.QueryModel;
import jnpf.model.recycleorder.*;
import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.OrganizeService;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.recycleorder.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import jnpf.service.EnterpriserecyclestationService;
import jnpf.service.RecycleOrderProductService;
import jnpf.service.RecycleOrderService;
import jnpf.util.*;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
*
* RecycleOrder
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -45,7 +48,7 @@ import javax.annotation.Resource;
* 日期： 2024-02-01
*/
@Service
public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, RecycleOrderEntity> implements RecycleOrderService{
public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, RecycleOrderEntity> implements RecycleOrderService {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Resource
@ -57,439 +60,460 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
@Autowired
private RecycleOrderProductService recycleOrderProductService;
@Resource
private EnterpriserecyclestationService enterprisestationService;
@Override
public List<RecycleOrderEntity> getList(RecycleOrderPagination recycleOrderPagination){
return getTypeList(recycleOrderPagination,recycleOrderPagination.getDataType());
public List<RecycleOrderEntity> getList(RecycleOrderPagination recycleOrderPagination) {
return getTypeList(recycleOrderPagination, recycleOrderPagination.getDataType());
}
/** 列表查询 */
/**
* 列表查询
*/
@Override
public List<RecycleOrderEntity> getTypeList(RecycleOrderPagination recycleOrderPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
public List<RecycleOrderEntity> getTypeList(RecycleOrderPagination recycleOrderPagination, String dataType) {
String userId = userProvider.get().getUserId();
List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? RecycleOrderConstant.getAppColumnData() : RecycleOrderConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int recycleOrderNum =0;
QueryWrapper<RecycleOrderEntity> recycleOrderQueryWrapper=new QueryWrapper<>();
int total = 0;
int recycleOrderNum = 0;
QueryWrapper<RecycleOrderEntity> recycleOrderQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getSuperQueryJson())){
String superOp = "";
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = recycleOrderPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<RecycleOrderEntity> recycleOrderSuperWrapper = new QueryWrapper<>();
recycleOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleOrderSuperWrapper,RecycleOrderEntity.class,queryJson,"0"));
recycleOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleOrderSuperWrapper, RecycleOrderEntity.class, queryJson, "0"));
int recycleOrderNum1 = recycleOrderSuperWrapper.getExpression().getNormal().size();
if (recycleOrderNum1>0){
List<String> recycleOrderList =this.list(recycleOrderSuperWrapper).stream().map(RecycleOrderEntity::getId).collect(Collectors.toList());
if (recycleOrderNum1 > 0) {
List<String> recycleOrderList = this.list(recycleOrderSuperWrapper).stream().map(RecycleOrderEntity::getId).collect(Collectors.toList());
allSuperList.addAll(recycleOrderList);
intersectionSuperList.add(recycleOrderList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
} else {
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<RecycleOrderEntity> recycleOrderSuperWrapper = new QueryWrapper<>();
recycleOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleOrderSuperWrapper,RecycleOrderEntity.class,ruleJson,"0"));
recycleOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleOrderSuperWrapper, RecycleOrderEntity.class, ruleJson, "0"));
int recycleOrderNum1 = recycleOrderSuperWrapper.getExpression().getNormal().size();
if (recycleOrderNum1>0){
List<String> recycleOrderList =this.list(recycleOrderSuperWrapper).stream().map(RecycleOrderEntity::getId).collect(Collectors.toList());
if (recycleOrderNum1 > 0) {
List<String> recycleOrderList = this.list(recycleOrderSuperWrapper).stream().map(RecycleOrderEntity::getId).collect(Collectors.toList());
allRuleList.addAll(recycleOrderList);
intersectionRuleList.add(recycleOrderList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
} else {
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object recycleOrderObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleOrderQueryWrapper,RecycleOrderEntity.class,recycleOrderPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleOrderObj)){
return new ArrayList<>();
} else {
recycleOrderQueryWrapper = (QueryWrapper<RecycleOrderEntity>)recycleOrderObj;
if( recycleOrderQueryWrapper.getExpression().getNormal().size()>0){
recycleOrderNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object recycleOrderObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleOrderQueryWrapper,RecycleOrderEntity.class,recycleOrderPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleOrderObj)){
return new ArrayList<>();
} else {
recycleOrderQueryWrapper = (QueryWrapper<RecycleOrderEntity>)recycleOrderObj;
if( recycleOrderQueryWrapper.getExpression().getNormal().size()>0){
recycleOrderNum++;
}
boolean pcPermission = true;
boolean appPermission = false;
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object recycleOrderObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleOrderQueryWrapper, RecycleOrderEntity.class, recycleOrderPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(recycleOrderObj)) {
return new ArrayList<>();
} else {
recycleOrderQueryWrapper = (QueryWrapper<RecycleOrderEntity>) recycleOrderObj;
if (recycleOrderQueryWrapper.getExpression().getNormal().size() > 0) {
recycleOrderNum++;
}
}
}
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object recycleOrderObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleOrderQueryWrapper, RecycleOrderEntity.class, recycleOrderPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(recycleOrderObj)) {
return new ArrayList<>();
} else {
recycleOrderQueryWrapper = (QueryWrapper<RecycleOrderEntity>) recycleOrderObj;
if (recycleOrderQueryWrapper.getExpression().getNormal().size() > 0) {
recycleOrderNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getOrderNumber())){
recycleOrderNum++;
}
}
if (isPc) {
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getOrderNumber())) {
recycleOrderNum++;
String value = recycleOrderPagination.getOrderNumber() instanceof List ?
JsonUtil.getObjectToString(recycleOrderPagination.getOrderNumber()) :
String.valueOf(recycleOrderPagination.getOrderNumber());
recycleOrderQueryWrapper.lambda().like(RecycleOrderEntity::getOrderNumber,value);
JsonUtil.getObjectToString(recycleOrderPagination.getOrderNumber()) :
String.valueOf(recycleOrderPagination.getOrderNumber());
recycleOrderQueryWrapper.lambda().like(RecycleOrderEntity::getOrderNumber, value);
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getOrderTypeId())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getOrderTypeId())) {
recycleOrderNum++;
List<String> idList = new ArrayList<>();
try {
String[][] orderTypeId = JsonUtil.getJsonToBean(recycleOrderPagination.getOrderTypeId(),String[][].class);
for(int i=0;i<orderTypeId.length;i++){
if(orderTypeId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(orderTypeId[i])));
}
}
}catch (Exception e1){
try {
List<String> orderTypeId = JsonUtil.getJsonToList(recycleOrderPagination.getOrderTypeId(),String.class);
if(orderTypeId.size()>0){
idList.addAll(orderTypeId);
}
}catch (Exception e2){
idList.add(String.valueOf(recycleOrderPagination.getOrderTypeId()));
}
}
recycleOrderQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleOrderEntity::getOrderTypeId, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] orderTypeId = JsonUtil.getJsonToBean(recycleOrderPagination.getOrderTypeId(), String[][].class);
for (int i = 0; i < orderTypeId.length; i++) {
if (orderTypeId[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(orderTypeId[i])));
}
}
} catch (Exception e1) {
try {
List<String> orderTypeId = JsonUtil.getJsonToList(recycleOrderPagination.getOrderTypeId(), String.class);
if (orderTypeId.size() > 0) {
idList.addAll(orderTypeId);
}
} catch (Exception e2) {
idList.add(String.valueOf(recycleOrderPagination.getOrderTypeId()));
}
}
recycleOrderQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(RecycleOrderEntity::getOrderTypeId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getOrderClientStatusId())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getOrderClientStatusId())) {
recycleOrderNum++;
List<String> idList = new ArrayList<>();
try {
String[][] orderClientStatusId = JsonUtil.getJsonToBean(recycleOrderPagination.getOrderClientStatusId(),String[][].class);
for(int i=0;i<orderClientStatusId.length;i++){
if(orderClientStatusId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(orderClientStatusId[i])));
}
}
}catch (Exception e1){
try {
List<String> orderClientStatusId = JsonUtil.getJsonToList(recycleOrderPagination.getOrderClientStatusId(),String.class);
if(orderClientStatusId.size()>0){
idList.addAll(orderClientStatusId);
}
}catch (Exception e2){
idList.add(String.valueOf(recycleOrderPagination.getOrderClientStatusId()));
}
}
recycleOrderQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleOrderEntity::getOrderClientStatusId, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] orderClientStatusId = JsonUtil.getJsonToBean(recycleOrderPagination.getOrderClientStatusId(), String[][].class);
for (int i = 0; i < orderClientStatusId.length; i++) {
if (orderClientStatusId[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(orderClientStatusId[i])));
}
}
} catch (Exception e1) {
try {
List<String> orderClientStatusId = JsonUtil.getJsonToList(recycleOrderPagination.getOrderClientStatusId(), String.class);
if (orderClientStatusId.size() > 0) {
idList.addAll(orderClientStatusId);
}
} catch (Exception e2) {
idList.add(String.valueOf(recycleOrderPagination.getOrderClientStatusId()));
}
}
recycleOrderQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(RecycleOrderEntity::getOrderClientStatusId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getOrderStafstatusId())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getOrderStafstatusId())) {
recycleOrderNum++;
List<String> idList = new ArrayList<>();
try {
String[][] orderStafstatusId = JsonUtil.getJsonToBean(recycleOrderPagination.getOrderStafstatusId(),String[][].class);
for(int i=0;i<orderStafstatusId.length;i++){
if(orderStafstatusId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(orderStafstatusId[i])));
}
}
}catch (Exception e1){
try {
List<String> orderStafstatusId = JsonUtil.getJsonToList(recycleOrderPagination.getOrderStafstatusId(),String.class);
if(orderStafstatusId.size()>0){
idList.addAll(orderStafstatusId);
}
}catch (Exception e2){
idList.add(String.valueOf(recycleOrderPagination.getOrderStafstatusId()));
}
}
recycleOrderQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleOrderEntity::getOrderStaffsStatusId, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] orderStafstatusId = JsonUtil.getJsonToBean(recycleOrderPagination.getOrderStafstatusId(), String[][].class);
for (int i = 0; i < orderStafstatusId.length; i++) {
if (orderStafstatusId[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(orderStafstatusId[i])));
}
}
} catch (Exception e1) {
try {
List<String> orderStafstatusId = JsonUtil.getJsonToList(recycleOrderPagination.getOrderStafstatusId(), String.class);
if (orderStafstatusId.size() > 0) {
idList.addAll(orderStafstatusId);
}
} catch (Exception e2) {
idList.add(String.valueOf(recycleOrderPagination.getOrderStafstatusId()));
}
}
recycleOrderQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(RecycleOrderEntity::getOrderStaffsStatusId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getClientMobile())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getClientMobile())) {
recycleOrderNum++;
String value = recycleOrderPagination.getClientMobile() instanceof List ?
JsonUtil.getObjectToString(recycleOrderPagination.getClientMobile()) :
String.valueOf(recycleOrderPagination.getClientMobile());
recycleOrderQueryWrapper.lambda().like(RecycleOrderEntity::getClientMobile,value);
JsonUtil.getObjectToString(recycleOrderPagination.getClientMobile()) :
String.valueOf(recycleOrderPagination.getClientMobile());
recycleOrderQueryWrapper.lambda().like(RecycleOrderEntity::getClientMobile, value);
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getRecycleStationId())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getRecycleStationId())) {
recycleOrderNum++;
List<String> idList = new ArrayList<>();
try {
String[][] recycleStationId = JsonUtil.getJsonToBean(recycleOrderPagination.getRecycleStationId(),String[][].class);
for(int i=0;i<recycleStationId.length;i++){
if(recycleStationId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleStationId[i])));
}
}
}catch (Exception e1){
try {
List<String> recycleStationId = JsonUtil.getJsonToList(recycleOrderPagination.getRecycleStationId(),String.class);
if(recycleStationId.size()>0){
idList.addAll(recycleStationId);
}
}catch (Exception e2){
idList.add(String.valueOf(recycleOrderPagination.getRecycleStationId()));
}
}
recycleOrderQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleOrderEntity::getRecycleStationId, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] recycleStationId = JsonUtil.getJsonToBean(recycleOrderPagination.getRecycleStationId(), String[][].class);
for (int i = 0; i < recycleStationId.length; i++) {
if (recycleStationId[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleStationId[i])));
}
}
} catch (Exception e1) {
try {
List<String> recycleStationId = JsonUtil.getJsonToList(recycleOrderPagination.getRecycleStationId(), String.class);
if (recycleStationId.size() > 0) {
idList.addAll(recycleStationId);
}
} catch (Exception e2) {
idList.add(String.valueOf(recycleOrderPagination.getRecycleStationId()));
}
}
recycleOrderQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(RecycleOrderEntity::getRecycleStationId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getAppointmentTimeStart())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getAppointmentTimeStart())) {
recycleOrderNum++;
List AppointmentTimeStartList = JsonUtil.getJsonToList(recycleOrderPagination.getAppointmentTimeStart(),String.class);
Long fir = Long.valueOf(String.valueOf(AppointmentTimeStartList.get(0)));
Long sec = Long.valueOf(String.valueOf(AppointmentTimeStartList.get(1)));
List AppointmentTimeStartList = JsonUtil.getJsonToList(recycleOrderPagination.getAppointmentTimeStart(), String.class);
Long fir = Long.valueOf(String.valueOf(AppointmentTimeStartList.get(0)));
Long sec = Long.valueOf(String.valueOf(AppointmentTimeStartList.get(1)));
recycleOrderQueryWrapper.lambda().ge(RecycleOrderEntity::getAppointmentTimeStart, new Date(fir))
.le(RecycleOrderEntity::getAppointmentTimeStart, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
recycleOrderQueryWrapper.lambda().ge(RecycleOrderEntity::getAppointmentTimeStart, new Date(fir))
.le(RecycleOrderEntity::getAppointmentTimeStart, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getAppointmentTimeEnd())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getAppointmentTimeEnd())) {
recycleOrderNum++;
List AppointmentTimeEndList = JsonUtil.getJsonToList(recycleOrderPagination.getAppointmentTimeEnd(),String.class);
Long fir = Long.valueOf(String.valueOf(AppointmentTimeEndList.get(0)));
Long sec = Long.valueOf(String.valueOf(AppointmentTimeEndList.get(1)));
List AppointmentTimeEndList = JsonUtil.getJsonToList(recycleOrderPagination.getAppointmentTimeEnd(), String.class);
Long fir = Long.valueOf(String.valueOf(AppointmentTimeEndList.get(0)));
Long sec = Long.valueOf(String.valueOf(AppointmentTimeEndList.get(1)));
recycleOrderQueryWrapper.lambda().ge(RecycleOrderEntity::getAppointmentTimeEnd, new Date(fir))
.le(RecycleOrderEntity::getAppointmentTimeEnd, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
recycleOrderQueryWrapper.lambda().ge(RecycleOrderEntity::getAppointmentTimeEnd, new Date(fir))
.le(RecycleOrderEntity::getAppointmentTimeEnd, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getClientName())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getClientName())) {
recycleOrderNum++;
String value = recycleOrderPagination.getClientName() instanceof List ?
JsonUtil.getObjectToString(recycleOrderPagination.getClientName()) :
String.valueOf(recycleOrderPagination.getClientName());
recycleOrderQueryWrapper.lambda().like(RecycleOrderEntity::getClientName,value);
JsonUtil.getObjectToString(recycleOrderPagination.getClientName()) :
String.valueOf(recycleOrderPagination.getClientName());
recycleOrderQueryWrapper.lambda().like(RecycleOrderEntity::getClientName, value);
}
if(ObjectUtil.isNotEmpty(recycleOrderPagination.getStaffsId())){
recycleOrderNum++;
if (ObjectUtil.isNotEmpty(recycleOrderPagination.getStaffsId())) {
recycleOrderNum++;
List<String> idList = new ArrayList<>();
try {
String[][] staffsId = JsonUtil.getJsonToBean(recycleOrderPagination.getStaffsId(),String[][].class);
for(int i=0;i<staffsId.length;i++){
if(staffsId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(staffsId[i])));
}
}
}catch (Exception e1){
try {
List<String> staffsId = JsonUtil.getJsonToList(recycleOrderPagination.getStaffsId(),String.class);
if(staffsId.size()>0){
idList.addAll(staffsId);
}
}catch (Exception e2){
idList.add(String.valueOf(recycleOrderPagination.getStaffsId()));
}
}
recycleOrderQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleOrderEntity::getStaffsId, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] staffsId = JsonUtil.getJsonToBean(recycleOrderPagination.getStaffsId(), String[][].class);
for (int i = 0; i < staffsId.length; i++) {
if (staffsId[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(staffsId[i])));
}
}
} catch (Exception e1) {
try {
List<String> staffsId = JsonUtil.getJsonToList(recycleOrderPagination.getStaffsId(), String.class);
if (staffsId.size() > 0) {
idList.addAll(staffsId);
}
} catch (Exception e2) {
idList.add(String.valueOf(recycleOrderPagination.getStaffsId()));
}
}
recycleOrderQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(RecycleOrderEntity::getStaffsId, tt).or();
});
});
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
if (total > 0) {
if (intersection.size() == 0) {
intersection.add("jnpfNullList");
}
recycleOrderQueryWrapper.lambda().in(RecycleOrderEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
recycleOrderQueryWrapper.lambda().and(t->t.in(RecycleOrderEntity::getId, finalAllSuperIDlist));
recycleOrderQueryWrapper.lambda().and(t -> t.in(RecycleOrderEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
recycleOrderQueryWrapper.lambda().and(t->t.in(RecycleOrderEntity::getId, finalAllRuleIDlist));
recycleOrderQueryWrapper.lambda().and(t -> t.in(RecycleOrderEntity::getId, finalAllRuleIDlist));
}
//排序
if(StringUtil.isEmpty(recycleOrderPagination.getSidx())){
if (StringUtil.isEmpty(recycleOrderPagination.getSidx())) {
recycleOrderQueryWrapper.lambda().orderByDesc(RecycleOrderEntity::getId);
}else{
} else {
try {
String sidx = recycleOrderPagination.getSidx();
String[] strs= sidx.split("_name");
String[] strs = sidx.split("_name");
RecycleOrderEntity recycleOrderEntity = new RecycleOrderEntity();
Field declaredField = recycleOrderEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
recycleOrderQueryWrapper="asc".equals(recycleOrderPagination.getSort().toLowerCase())?recycleOrderQueryWrapper.orderByAsc(value):recycleOrderQueryWrapper.orderByDesc(value);
recycleOrderQueryWrapper = "asc".equals(recycleOrderPagination.getSort().toLowerCase()) ? recycleOrderQueryWrapper.orderByAsc(value) : recycleOrderQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<RecycleOrderEntity> page=new Page<>(recycleOrderPagination.getCurrentPage(), recycleOrderPagination.getPageSize());
IPage<RecycleOrderEntity> userIPage=this.page(page, recycleOrderQueryWrapper);
return recycleOrderPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<RecycleOrderEntity> page = new Page<>(recycleOrderPagination.getCurrentPage(), recycleOrderPagination.getPageSize());
IPage<RecycleOrderEntity> userIPage = this.page(page, recycleOrderQueryWrapper);
return recycleOrderPagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else {
List<RecycleOrderEntity> list = new ArrayList();
return recycleOrderPagination.setData(list, list.size());
}
}else{
} else {
return this.list(recycleOrderQueryWrapper);
}
}
@Override
public RecycleOrderEntity getInfo(String id){
QueryWrapper<RecycleOrderEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(RecycleOrderEntity::getId,id);
public RecycleOrderEntity getInfo(String id) {
QueryWrapper<RecycleOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(RecycleOrderEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(RecycleOrderEntity entity){
public void create(RecycleOrderEntity entity) {
this.save(entity);
}
@Override
public boolean update(String id, RecycleOrderEntity entity){
public boolean update(String id, RecycleOrderEntity entity) {
return this.updateById(entity);
}
@Override
public void delete(RecycleOrderEntity entity){
if(entity!=null){
public void delete(RecycleOrderEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/** RecycleOrderProduct子表方法 */
/**
* RecycleOrderProduct子表方法
*/
@Override
public List<RecycleOrderProductEntity> getRecycleOrderProductList(String id,RecycleOrderPagination recycleOrderPagination){
Map<String, Object> newtabMap=RecycleOrderConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="recycleOrderProduct";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
public List<RecycleOrderProductEntity> getRecycleOrderProductList(String id, RecycleOrderPagination recycleOrderPagination) {
Map<String, Object> newtabMap = RecycleOrderConstant.TABLEFIELDKEY.entrySet()
.stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
String tableName = "recycleOrderProduct";
tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString();
QueryWrapper<RecycleOrderProductEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = recycleOrderProductService.getChild(recycleOrderPagination,queryWrapper);
queryWrapper = recycleOrderProductService.getChild(recycleOrderPagination, queryWrapper);
queryWrapper.lambda().eq(RecycleOrderProductEntity::getRecycleOrderId, id);
generaterSwapUtil.wrapperHandle(RecycleOrderConstant.getColumnData(), RecycleOrderConstant.getAppColumnData(), queryWrapper,RecycleOrderProductEntity.class,"sub",tableName);
generaterSwapUtil.wrapperHandle(RecycleOrderConstant.getColumnData(), RecycleOrderConstant.getAppColumnData(), queryWrapper, RecycleOrderProductEntity.class, "sub", tableName);
return recycleOrderProductService.list(queryWrapper);
}
/** RecycleOrderProduct子表方法 */
/**
* RecycleOrderProduct子表方法
*/
@Override
public List<RecycleOrderProductEntity> getRecycleOrderProductList(String id){
public List<RecycleOrderProductEntity> getRecycleOrderProductList(String id) {
// QueryWrapper<RecycleOrderProductEntity> queryWrapper = new QueryWrapper<>();
// queryWrapper.lambda().eq(RecycleOrderProductEntity::getRecycleOrderId, id);
// return recycleOrderProductService.list(queryWrapper);
return recycleOrderProductMapper.recycleOrderProductSelect(id);
}
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override
public String checkForm(RecycleOrderForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
public String checkForm(RecycleOrderForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id = "";
String countRecover = "";
if (isUp){
if (isUp) {
id = form.getId();
}
//主表字段验证
if(StringUtil.isNotEmpty(form.getOrderAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getOrderAmount())).matches()){
return "请输入正确的金额";
if (StringUtil.isNotEmpty(form.getOrderAmount())) {
if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getOrderAmount())).matches()) {
return "请输入正确的金额";
}
}
}
if(StringUtil.isEmpty(form.getPredictWeight())){
if (StringUtil.isEmpty(form.getPredictWeight())) {
return "预估重量不能为空";
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
* @param id
* @param recycleOrderForm
* @return
*/
* 新增修改数据(事务回滚)
*
* @param id
* @param recycleOrderForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(RecycleOrderForm recycleOrderForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
public void saveOrUpdate(RecycleOrderForm recycleOrderForm, String id, boolean isSave) throws Exception {
UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
recycleOrderForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(RecycleOrderConstant.getFormData(),recycleOrderForm),RecycleOrderForm.class);
generaterSwapUtil.swapDatetime(RecycleOrderConstant.getFormData(), recycleOrderForm), RecycleOrderForm.class);
RecycleOrderEntity entity = JsonUtil.getJsonToBean(recycleOrderForm, RecycleOrderEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setOrderNumber(generaterSwapUtil.getBillNumber("order", false));
if (isSave) {
String mainId = RandomUtil.uuId();
entity.setOrderNumber(generaterSwapUtil.getBillNumber("order", false));
entity.setId(mainId);
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
@ -497,23 +521,23 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
entity.setLastModifyUserId(null);
String companyId = "";
List<String> organizeIdList = new ArrayList<>();
if(userInfo != null && StringUtil.isNotEmpty(userInfo.getOrganizeId())){
if (userInfo != null && StringUtil.isNotEmpty(userInfo.getOrganizeId())) {
OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
if (organizeEntity==null){
if (organizeEntity == null) {
// organizeEntity.setId("-1");
organizeIdList.add("-1");
}else {
} else {
organizeIdList.add(organizeEntity.getId());
if(PermissionConst.DEPARTMENT.equals(organizeEntity.getCategory())){
if (PermissionConst.DEPARTMENT.equals(organizeEntity.getCategory())) {
userInfo.setDepartmentId(organizeEntity.getId());
do {
//获取父组织
organizeEntity = organizeService.getInfo(organizeEntity.getParentId());
organizeIdList.add(organizeEntity.getId());
}while (PermissionConst.DEPARTMENT.equals(organizeEntity.getCategory()));
} while (PermissionConst.DEPARTMENT.equals(organizeEntity.getCategory()));
companyId = organizeEntity.getId();
}else{
} else {
companyId = organizeEntity.getId();
}
}
@ -524,8 +548,8 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
String organizeId = JSON.toJSONString(organizeIdList);
entity.setCompanyId(companyId);
entity.setOrganizeJsonId(organizeId);
}else{
entity.setOrderNumber(generaterSwapUtil.getBillNumber("order", false));
} else {
entity.setOrderNumber(generaterSwapUtil.getBillNumber("order", false));
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
@ -534,4 +558,64 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
this.saveOrUpdate(entity);
}
@Override
public List<RecycleOrderResponse> compute(RecycleOrderRequest request) {
//查询回收站信息
List<EnterpriserecyclestationEntity> stations = enterprisestationService.queryByEnterpriseId(request.getCompanyId());
if (CollectionUtils.isEmpty(stations)) {
return Collections.emptyList();
}
Map<String, String> stationMap = stations.stream().collect(Collectors.toMap(EnterpriserecyclestationEntity::getId, EnterpriserecyclestationEntity::getStationName));
//查询散户下单
List<RecycleOrderEntity> list = this.list(new LambdaQueryWrapper<>(RecycleOrderEntity.class)
.eq(RecycleOrderEntity::getOrderTypeId, OrderTypeEnum.SH_ORDER.getCode())
.in(RecycleOrderEntity::getRecycleStationId, Lists.newArrayList(stationMap.keySet()))
.ge(RecycleOrderEntity::getCreatorTime, request.getCreatStartTime())
.le(RecycleOrderEntity::getCreatorTime, request.getCreatEndTime()));
List<RecycleOrderResponse> result = Lists.newArrayList();
//总接单数
int takeOrders = 0;
//总金额
BigDecimal totalAmount = BigDecimal.ZERO;
//总单据数量
int totalQuantity = 0;
//根据回收站分组
Map<String, List<RecycleOrderEntity>> collect = list.stream().collect(Collectors.groupingBy(RecycleOrderEntity::getRecycleStationId));
for (Map.Entry<String, List<RecycleOrderEntity>> entry : collect.entrySet()) {
RecycleOrderResponse response = new RecycleOrderResponse();
response.setStationCode(entry.getKey());
response.setStationName(stationMap.get(entry.getKey()));
List<RecycleOrderEntity> root = entry.getValue();
//接单金额
BigDecimal price = root.stream().map(RecycleOrderEntity::getOrderAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
response.setPrice(price);
response.setOrderNums(root.size());
//接单数
int takeOrder = (int) root.stream().filter(obj -> StringUtils.isNoneBlank(obj.getOrderClientStatusId()) &&
!OrderStatusEnum.PENDING.getCode().equals(obj.getOrderClientStatusId()) &&
!OrderStatusEnum.CANCELED.getCode().equals(obj.getOrderClientStatusId())).count();
double percentage = (double) takeOrder / root.size() * 100;
String percentageString = String.format("%.1f", percentage) + "%";
response.setOrderAcceptanceRate(percentageString);
//更新总金额 总接单数 总数
totalAmount = totalAmount.add(price);
takeOrders += takeOrder;
totalQuantity += root.size();
result.add(response);
}
//处理合并
if (CollectionUtils.isNotEmpty(result)) {
RecycleOrderResponse merge = new RecycleOrderResponse();
merge.setStationName("总");
merge.setStationCode("总");
merge.setPrice(totalAmount);
merge.setOrderNums(totalQuantity);
double percentage = (double) takeOrders / totalQuantity * 100;
String percentageString = String.format("%.1f", percentage) + "%";
merge.setOrderAcceptanceRate(percentageString);
result.add(merge);
}
return result;
}
}

166
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleOrderController.java
Unescape View File

@ -15,22 +15,27 @@ import jnpf.model.recycleorder.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
* RecycleOrder
*
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
@ -38,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
*/
@Slf4j
@RestController
@Tag(name = "RecycleOrder" , description = "scm")
@Tag(name = "RecycleOrder", description = "scm")
@RequestMapping("/api/scm/RecycleOrder")
public class RecycleOrderController {
@ -52,27 +57,26 @@ public class RecycleOrderController {
private RecycleOrderService recycleOrderService;
/**
* 列表
*
* @param recycleOrderPagination
* @return
*/
* 列表
*
* @param recycleOrderPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody RecycleOrderPagination recycleOrderPagination)throws IOException{
List<RecycleOrderEntity> list= recycleOrderService.getList(recycleOrderPagination);
List<Map<String, Object>> realList=new ArrayList<>();
public ActionResult list(@RequestBody RecycleOrderPagination recycleOrderPagination) throws IOException {
List<RecycleOrderEntity> list = recycleOrderService.getList(recycleOrderPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (RecycleOrderEntity entity : list) {
Map<String, Object> recycleOrderMap=JsonUtil.entityToMap(entity);
recycleOrderMap.put("id", recycleOrderMap.get("id"));
//副表数据
//子表数据
Map<String, Object> recycleOrderMap = JsonUtil.entityToMap(entity);
recycleOrderMap.put("id", recycleOrderMap.get("id"));
//副表数据
//子表数据
realList.add(recycleOrderMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, RecycleOrderConstant.getFormData(), RecycleOrderConstant.getColumnData(), recycleOrderPagination.getModuleId(),false);
realList = generaterSwapUtil.swapDataList(realList, RecycleOrderConstant.getFormData(), RecycleOrderConstant.getColumnData(), recycleOrderPagination.getModuleId(), false);
//返回对象
PageListVO vo = new PageListVO();
@ -81,112 +85,134 @@ public class RecycleOrderController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建
*
* @param recycleOrderForm
* @return
*/
* 创建
*
* @param recycleOrderForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid RecycleOrderForm recycleOrderForm) {
String b = recycleOrderService.checkForm(recycleOrderForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
String b = recycleOrderService.checkForm(recycleOrderForm, 0);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
try{
recycleOrderService.saveOrUpdate(recycleOrderForm, null ,true);
}catch(Exception e){
try {
recycleOrderService.saveOrUpdate(recycleOrderForm, null, true);
} catch (Exception e) {
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* 编辑
* @param id
* @param recycleOrderForm
* @return
*/
* 编辑
*
* @param id
* @param recycleOrderForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleOrderForm recycleOrderForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid RecycleOrderForm recycleOrderForm,
@RequestParam(value = "isImport", required = false) boolean isImport) {
recycleOrderForm.setId(id);
if (!isImport) {
String b = recycleOrderService.checkForm(recycleOrderForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
String b = recycleOrderService.checkForm(recycleOrderForm, 1);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
}
RecycleOrderEntity entity= recycleOrderService.getInfo(id);
if(entity!=null){
try{
recycleOrderService.saveOrUpdate(recycleOrderForm,id,false);
}catch(Exception e){
RecycleOrderEntity entity = recycleOrderService.getInfo(id);
if (entity != null) {
try {
recycleOrderService.saveOrUpdate(recycleOrderForm, id, false);
} catch (Exception e) {
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
} else {
return ActionResult.fail("更新失败，数据不存在");
}
}
/**
* 删除
* @param id
* @return
*/
* 删除
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
RecycleOrderEntity entity= recycleOrderService.getInfo(id);
if(entity!=null){
public ActionResult delete(@PathVariable("id") String id) {
RecycleOrderEntity entity = recycleOrderService.getInfo(id);
if (entity != null) {
//主表数据删除
recycleOrderService.delete(entity);
}
return ActionResult.success("删除成功");
}
/**
* 表单信息(详情页)
* 详情页面使用-转换数据
* @param id
* @return
*/
* 表单信息(详情页)
* 详情页面使用-转换数据
*
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
RecycleOrderEntity entity= recycleOrderService.getInfo(id);
if(entity==null){
public ActionResult detailInfo(@PathVariable("id") String id) {
RecycleOrderEntity entity = recycleOrderService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在！");
}
Map<String, Object> recycleOrderMap=JsonUtil.entityToMap(entity);
Map<String, Object> recycleOrderMap = JsonUtil.entityToMap(entity);
recycleOrderMap.put("id", recycleOrderMap.get("id"));
//副表数据
//子表数据
List<RecycleOrderProductEntity> recycleOrderProductList = recycleOrderService.getRecycleOrderProductList(entity.getId());
recycleOrderMap.put("tableField172",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recycleOrderProductList)));
recycleOrderMap = generaterSwapUtil.swapDataDetail(recycleOrderMap,RecycleOrderConstant.getFormData(),"520255187403674181",false);
recycleOrderMap.put("tableField172", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recycleOrderProductList)));
recycleOrderMap = generaterSwapUtil.swapDataDetail(recycleOrderMap, RecycleOrderConstant.getFormData(), "520255187403674181", false);
return ActionResult.success(recycleOrderMap);
}
/**
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
* @param id
* @return
*/
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
*
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
RecycleOrderEntity entity= recycleOrderService.getInfo(id);
if(entity==null){
public ActionResult info(@PathVariable("id") String id) {
RecycleOrderEntity entity = recycleOrderService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在！");
}
Map<String, Object> recycleOrderMap=JsonUtil.entityToMap(entity);
Map<String, Object> recycleOrderMap = JsonUtil.entityToMap(entity);
recycleOrderMap.put("id", recycleOrderMap.get("id"));
//副表数据
//子表数据
recycleOrderMap = generaterSwapUtil.swapDataForm(recycleOrderMap,RecycleOrderConstant.getFormData(),RecycleOrderConstant.TABLEFIELDKEY,RecycleOrderConstant.TABLERENAMES);
recycleOrderMap = generaterSwapUtil.swapDataForm(recycleOrderMap, RecycleOrderConstant.getFormData(), RecycleOrderConstant.TABLEFIELDKEY, RecycleOrderConstant.TABLERENAMES);
return ActionResult.success(recycleOrderMap);
}
/**
* 统计计算
*
* @param request 请求体
* @return 统计结果
*/
@Operation(summary = "统计计算")
@PostMapping("/compute")
public ActionResult compute(@RequestBody RecycleOrderRequest request) {
List<RecycleOrderResponse> list = recycleOrderService.compute(request);
return ActionResult.success(list);
}
}

28
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/OrderStatusEnum.java
Unescape View File

@ -0,0 +1,28 @@
package jnpf.model.recycleorder;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 回收订单状态枚举
*/
@Getter
@AllArgsConstructor
public enum OrderStatusEnum {
PENDING("520192817293693253", "待接单"),
UNPROCESSED("520192868833300805", "待上门/待服务"),
RECYCLING("520192993311854917", "回收中"),
FINISHED("520193049964319045", "已完成"),
CANCELED("520193095866782021", "已取消");
@EnumValue // 处理枚举与数据库类型自动转换
private final String code;
// @JsonValue // 标记JSON序列化时展示的字段
private final String desc;
}

28
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/OrderTypeEnum.java
Unescape View File

@ -0,0 +1,28 @@
package jnpf.model.recycleorder;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 回收订单类型枚举
*/
@Getter
@AllArgsConstructor
public enum OrderTypeEnum {
SH_ORDER("520193382480351557", "散户下单"),
TM_RECOVERY("520193458267230533", "定时回收"),
DZ_RECOVERY("520193532170867013", "到站回收"),
ADM_ORDER("521999177572425477", "人工下单");
@EnumValue
private final String code;
private final String desc;
}

26
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderRequest.java
Unescape View File

@ -0,0 +1,26 @@
package jnpf.model.recycleorder;
import lombok.Data;
import java.time.LocalDate;
@Data
public class RecycleOrderRequest {
/**
* 商户id
*/
private String companyId;
/**
* 创建开始时间
*/
private LocalDate creatStartTime;
/**
* 创建结束时间
*/
private LocalDate creatEndTime;
}

45
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycleorder/RecycleOrderResponse.java
Unescape View File

@ -0,0 +1,45 @@
package jnpf.model.recycleorder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class RecycleOrderResponse implements Serializable {
/**
* 回收站编码
*/
private String stationCode;
/**
* 回收站名称
*/
private String stationName;
/**
* 所属商户
*/
private String companyId;
/**
* 下单金额
*/
private BigDecimal price;
/**
* 下单量
*/
private int orderNums;
/**
* 接单率
*/
private String orderAcceptanceRate;
}
Write Preview
Loading…
Cancel
Save