|
|
|
|
@ -5,19 +5,28 @@ import jnpf.mapper.YysPackageReportMapper;
|
|
|
|
|
import jnpf.service.*;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import jnpf.model.yyspackagereport.*;
|
|
|
|
|
|
|
|
|
|
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 lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
import jnpf.database.model.superQuery.SuperJsonModel;
|
|
|
|
|
@ -25,13 +34,17 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
* yysPackageReport
|
|
|
|
|
* 版本： V3.5
|
|
|
|
|
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
|
|
|
|
|
@ -39,6 +52,7 @@ import jnpf.permission.entity.UserEntity;
|
|
|
|
|
* 日期： 2024-08-07
|
|
|
|
|
*/
|
|
|
|
|
@Service
|
|
|
|
|
@Slf4j
|
|
|
|
|
public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMapper, YysPackageReportEntity> implements YysPackageReportService {
|
|
|
|
|
@Autowired
|
|
|
|
|
private GeneraterSwapUtil generaterSwapUtil;
|
|
|
|
|
@ -50,7 +64,10 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
|
public List<YysPackageReportEntity> getList(YysPackageReportPagination yysPackageReportPagination) {
|
|
|
|
|
return getTypeList(yysPackageReportPagination, yysPackageReportPagination.getDataType());
|
|
|
|
|
}
|
|
|
|
|
/** 列表查询 */
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 列表查询
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public List<YysPackageReportEntity> getTypeList(YysPackageReportPagination yysPackageReportPagination, String dataType) {
|
|
|
|
|
String userId = userProvider.get().getUserId();
|
|
|
|
|
@ -244,21 +261,22 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
|
yysPackageReportQueryWrapper.lambda().isNull(YysPackageReportEntity::getDeleteMark);
|
|
|
|
|
|
|
|
|
|
//排序
|
|
|
|
|
if(StringUtil.isEmpty(yysPackageReportPagination.getSidx())){
|
|
|
|
|
yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId);
|
|
|
|
|
}else{
|
|
|
|
|
try {
|
|
|
|
|
String sidx = yysPackageReportPagination.getSidx();
|
|
|
|
|
String[] strs= sidx.split("_name");
|
|
|
|
|
YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity();
|
|
|
|
|
Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]);
|
|
|
|
|
declaredField.setAccessible(true);
|
|
|
|
|
String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
|
yysPackageReportQueryWrapper="asc".equals(yysPackageReportPagination.getSort().toLowerCase())?yysPackageReportQueryWrapper.orderByAsc(value):yysPackageReportQueryWrapper.orderByDesc(value);
|
|
|
|
|
} catch (NoSuchFieldException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
yysPackageReportQueryWrapper.last("ORDER BY CAST(sort AS UNSIGNED)");
|
|
|
|
|
// if (StringUtil.isEmpty(yysPackageReportPagination.getSidx())) {
|
|
|
|
|
// yysPackageReportQueryWrapper.lambda().orderByDesc(YysPackageReportEntity::getId);
|
|
|
|
|
// } else {
|
|
|
|
|
// try {
|
|
|
|
|
// String sidx = yysPackageReportPagination.getSidx();
|
|
|
|
|
// String[] strs = sidx.split("_name");
|
|
|
|
|
// YysPackageReportEntity yysPackageReportEntity = new YysPackageReportEntity();
|
|
|
|
|
// Field declaredField = yysPackageReportEntity.getClass().getDeclaredField(strs[0]);
|
|
|
|
|
// declaredField.setAccessible(true);
|
|
|
|
|
// String value = declaredField.getAnnotation(TableField.class).value();
|
|
|
|
|
// yysPackageReportQueryWrapper = "asc".equals(yysPackageReportPagination.getSort().toLowerCase()) ? yysPackageReportQueryWrapper.orderByAsc(value) : yysPackageReportQueryWrapper.orderByDesc(value);
|
|
|
|
|
// } catch (NoSuchFieldException e) {
|
|
|
|
|
// e.printStackTrace();
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
if ("0".equals(dataType)) {
|
|
|
|
|
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
|
|
|
|
|
@ -273,27 +291,34 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
|
return this.list(yysPackageReportQueryWrapper);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public YysPackageReportEntity getInfo(String id) {
|
|
|
|
|
QueryWrapper<YysPackageReportEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(YysPackageReportEntity::getId, id);
|
|
|
|
|
return this.getOne(queryWrapper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void create(YysPackageReportEntity entity) {
|
|
|
|
|
this.save(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean update(String id, YysPackageReportEntity entity) {
|
|
|
|
|
return this.updateById(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void delete(YysPackageReportEntity entity) {
|
|
|
|
|
if (entity != null) {
|
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 验证表单唯一字段，正则，非空 i-0新增-1修改
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String checkForm(YysPackageReportForm form, int i) {
|
|
|
|
|
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
|
|
|
|
|
@ -320,8 +345,10 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
|
}
|
|
|
|
|
return countRecover;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 新增修改数据(事务回滚)
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @param yysPackageReportForm
|
|
|
|
|
* @return
|
|
|
|
|
@ -337,11 +364,29 @@ public class YysPackageReportServiceImpl extends ServiceImpl<YysPackageReportMap
|
|
|
|
|
|
|
|
|
|
if (isSave) {
|
|
|
|
|
String mainId = RandomUtil.uuId();
|
|
|
|
|
entity.setCreatorTime(DateUtil.getNowDate());
|
|
|
|
|
entity.setCreatorUserId(userInfo.getUserId());
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
entity.setVersion(0);
|
|
|
|
|
} else {
|
|
|
|
|
entity.setLastModifyTime(DateUtil.getNowDate());
|
|
|
|
|
entity.setLastModifyUserId(userInfo.getUserId());
|
|
|
|
|
}
|
|
|
|
|
this.saveOrUpdate(entity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public String batchConfirm(String id) {
|
|
|
|
|
log.info("确认单据，id：{}", id);
|
|
|
|
|
YysPackageReportEntity entity = this.getById(id);
|
|
|
|
|
if (ObjectUtil.isNull(entity)) {
|
|
|
|
|
return "fail";
|
|
|
|
|
}
|
|
|
|
|
entity.setStatus("2");
|
|
|
|
|
boolean result = this.updateById(entity);
|
|
|
|
|
if (result) {
|
|
|
|
|
return "success";
|
|
|
|
|
}
|
|
|
|
|
return "fail";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
jiyufei
3 months ago