|
@@ -13,14 +13,12 @@ import com.dk.common.service.BaseService;
|
|
|
import com.dk.mdm.mapper.common.CommonMapper;
|
|
import com.dk.mdm.mapper.common.CommonMapper;
|
|
|
import com.dk.mdm.infrastructure.util.AuthUtils;
|
|
import com.dk.mdm.infrastructure.util.AuthUtils;
|
|
|
import com.dk.mdm.mapper.mst.StaffMapper;
|
|
import com.dk.mdm.mapper.mst.StaffMapper;
|
|
|
-import com.dk.common.model.response.mst.StaffResponse;
|
|
|
|
|
-import com.dk.mdm.model.pojo.mst.Staff;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.postgresql.util.PGobject;
|
|
import org.postgresql.util.PGobject;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
|
|
+import java.time.LocalDate;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -136,8 +134,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
table = mode + "." + table;
|
|
table = mode + "." + table;
|
|
|
param.put("table", table);
|
|
param.put("table", table);
|
|
|
// 默认有效标识为true
|
|
// 默认有效标识为true
|
|
|
- if(param.get("noFlgValid") == null && param.get("flgValid") == null ){
|
|
|
|
|
- param.put("flgValid",true);
|
|
|
|
|
|
|
+ if (param.get("noFlgValid") == null && param.get("flgValid") == null) {
|
|
|
|
|
+ param.put("flgValid", true);
|
|
|
}
|
|
}
|
|
|
// 获取最大序号
|
|
// 获取最大序号
|
|
|
Integer maxDisplayNo = commonMapper.getMaxDisplayNo(param);
|
|
Integer maxDisplayNo = commonMapper.getMaxDisplayNo(param);
|
|
@@ -177,6 +175,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
List<Map<String, Object>> list = commonMapper.getOrg(param);
|
|
List<Map<String, Object>> list = commonMapper.getOrg(param);
|
|
|
return ResponseResultUtil.success(list);
|
|
return ResponseResultUtil.success(list);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* @desc : 只获取二级部门 按照level_code 排序
|
|
* @desc : 只获取二级部门 按照level_code 排序
|
|
|
* @author : 王英杰
|
|
* @author : 王英杰
|
|
@@ -187,6 +186,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
List<Map<String, Object>> list = commonMapper.getProcureOrg(param);
|
|
List<Map<String, Object>> list = commonMapper.getProcureOrg(param);
|
|
|
return ResponseResultUtil.success(list);
|
|
return ResponseResultUtil.success(list);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* @desc : 获取部门
|
|
* @desc : 获取部门
|
|
|
* @author : 姜宁
|
|
* @author : 姜宁
|
|
@@ -289,10 +289,10 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
StaffEntity staff = authUtils.getStaff();
|
|
StaffEntity staff = authUtils.getStaff();
|
|
|
param.put("cpId", staff.getCpId());
|
|
param.put("cpId", staff.getCpId());
|
|
|
// 选择对象的时候用
|
|
// 选择对象的时候用
|
|
|
- if (param.get("supplier-customerList")!=null
|
|
|
|
|
- && param.get("supplier-customerList")!=""
|
|
|
|
|
- && !(param.get("supplier-customerList") + "").contains(",") ){
|
|
|
|
|
- param.put("objType", Integer.parseInt(param.get("supplier-customerList").toString()) );
|
|
|
|
|
|
|
+ if (param.get("supplier-customerList") != null
|
|
|
|
|
+ && param.get("supplier-customerList") != ""
|
|
|
|
|
+ && !(param.get("supplier-customerList") + "").contains(",")) {
|
|
|
|
|
+ param.put("objType", Integer.parseInt(param.get("supplier-customerList").toString()));
|
|
|
}
|
|
}
|
|
|
return param;
|
|
return param;
|
|
|
}
|
|
}
|
|
@@ -390,9 +390,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取商品(销售订单开单用)
|
|
|
|
|
|
|
+ * @desc : 获取商品(销售订单开单用)
|
|
|
* @author : 付斌
|
|
* @author : 付斌
|
|
|
- * @date : 2024-03-09 9:57
|
|
|
|
|
|
|
+ * @date : 2024-03-09 9:57
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsForOrder(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsForOrder(Map<String, Object> param) {
|
|
|
// 获取系统基础数据
|
|
// 获取系统基础数据
|
|
@@ -401,9 +401,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取商品(销售订单开单用)(分页)
|
|
|
|
|
|
|
+ * @desc : 获取商品(销售订单开单用)(分页)
|
|
|
* @author : 付斌
|
|
* @author : 付斌
|
|
|
- * @date : 2024-03-09 9:57
|
|
|
|
|
|
|
+ * @date : 2024-03-09 9:57
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForOrderByPage(Map<String, Object> param) {
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForOrderByPage(Map<String, Object> param) {
|
|
|
// 校验分页参数
|
|
// 校验分页参数
|
|
@@ -418,9 +418,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取商品(采购订单开单用)
|
|
|
|
|
|
|
+ * @desc : 获取商品(采购订单开单用)
|
|
|
* @author : 常皓宁
|
|
* @author : 常皓宁
|
|
|
- * @date : 2024/3/9 10:08
|
|
|
|
|
|
|
+ * @date : 2024/3/9 10:08
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchase(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchase(Map<String, Object> param) {
|
|
|
// 获取系统基础数据
|
|
// 获取系统基础数据
|
|
@@ -429,9 +429,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取商品(采购订单开单用)(分页)
|
|
|
|
|
|
|
+ * @desc : 获取商品(采购订单开单用)(分页)
|
|
|
* @author : 常皓宁
|
|
* @author : 常皓宁
|
|
|
- * @date : 2024/3/9 10:08
|
|
|
|
|
|
|
+ * @date : 2024/3/9 10:08
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseByPage(Map<String, Object> param) {
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseByPage(Map<String, Object> param) {
|
|
|
// 校验分页参数
|
|
// 校验分页参数
|
|
@@ -547,7 +547,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(Map<String, Object> param) {
|
|
|
// 有效的品牌 230529
|
|
// 有效的品牌 230529
|
|
|
- param.put("flgValid",true);
|
|
|
|
|
|
|
+ param.put("flgValid", true);
|
|
|
List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
|
|
List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
|
|
|
return ResponseResultUtil.success(list);
|
|
return ResponseResultUtil.success(list);
|
|
|
}
|
|
}
|
|
@@ -689,7 +689,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryNoPage(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryNoPage(Map<String, Object> param) {
|
|
|
List<Map<String, Object>> list = commonMapper.getGoodsCategory(param);
|
|
List<Map<String, Object>> list = commonMapper.getGoodsCategory(param);
|
|
|
return ResponseResultUtil.success(list);
|
|
return ResponseResultUtil.success(list);
|
|
|
- } /**
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
* @desc : 商品种类查询 树形
|
|
* @desc : 商品种类查询 树形
|
|
|
* @author : 王英杰
|
|
* @author : 王英杰
|
|
|
* @date : 2024/2/26 10:36
|
|
* @date : 2024/2/26 10:36
|
|
@@ -706,7 +708,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getInitData(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getInitData(Map<String, Object> param) {
|
|
|
//判断前台是否传 dataSourceCode
|
|
//判断前台是否传 dataSourceCode
|
|
|
- if (!param.containsKey("dataSourceCode") && param.get("dataSourceCode") == null) {
|
|
|
|
|
|
|
+ if (!param.containsKey("dataSourceCode") && param.get("dataSourceCode") == null) {
|
|
|
return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.DATASOURCECODE_NOT.getMessage());
|
|
return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.DATASOURCECODE_NOT.getMessage());
|
|
|
}
|
|
}
|
|
|
String dataSourceCode = param.get("dataSourceCode").toString();
|
|
String dataSourceCode = param.get("dataSourceCode").toString();
|
|
@@ -714,18 +716,18 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
|
|
|
|
|
List<Map<String, Object>> list = null;
|
|
List<Map<String, Object>> list = null;
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
- if(param.containsKey("searchText") && param.get("searchText") != null){
|
|
|
|
|
- map.put("searchText",param.get("searchText").toString());
|
|
|
|
|
|
|
+ if (param.containsKey("searchText") && param.get("searchText") != null) {
|
|
|
|
|
+ map.put("searchText", param.get("searchText").toString());
|
|
|
}
|
|
}
|
|
|
//客户来源
|
|
//客户来源
|
|
|
if (dataSourceCode.equals("customerFrom")) {
|
|
if (dataSourceCode.equals("customerFrom")) {
|
|
|
- map.put("dictCode","基础资料-来源");
|
|
|
|
|
|
|
+ map.put("dictCode", "基础资料-来源");
|
|
|
list = commonMapper.getDictionaryData(map);
|
|
list = commonMapper.getDictionaryData(map);
|
|
|
}
|
|
}
|
|
|
// 基础资料的信息 入库原因
|
|
// 基础资料的信息 入库原因
|
|
|
if (dataSourceCode.equals("baseData")) {
|
|
if (dataSourceCode.equals("baseData")) {
|
|
|
- map.put("dictCode",param.get("dictCode").toString()); // 需要前台传过dictCode
|
|
|
|
|
- if (!param.containsKey("dictCode") && param.get("dictCode") == null) {
|
|
|
|
|
|
|
+ map.put("dictCode", param.get("dictCode").toString()); // 需要前台传过dictCode
|
|
|
|
|
+ if (!param.containsKey("dictCode") && param.get("dictCode") == null) {
|
|
|
return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.DATASOURCECODE_NOT.getMessage());
|
|
return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.DATASOURCECODE_NOT.getMessage());
|
|
|
}
|
|
}
|
|
|
list = commonMapper.getDictionaryData(map);
|
|
list = commonMapper.getDictionaryData(map);
|
|
@@ -768,32 +770,32 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
//客户意向
|
|
//客户意向
|
|
|
if (dataSourceCode.equals("customerIntention")) {
|
|
if (dataSourceCode.equals("customerIntention")) {
|
|
|
- map.put("kindType","客户意向");
|
|
|
|
|
|
|
+ map.put("kindType", "客户意向");
|
|
|
list = commonMapper.getDataKind(map);
|
|
list = commonMapper.getDataKind(map);
|
|
|
}
|
|
}
|
|
|
//留店时长
|
|
//留店时长
|
|
|
if (dataSourceCode.equals("storeRetentionTime")) {
|
|
if (dataSourceCode.equals("storeRetentionTime")) {
|
|
|
- map.put("kindType","留店时长");
|
|
|
|
|
|
|
+ map.put("kindType", "留店时长");
|
|
|
list = commonMapper.getDataKind(map);
|
|
list = commonMapper.getDataKind(map);
|
|
|
}
|
|
}
|
|
|
//邀约结果
|
|
//邀约结果
|
|
|
if (dataSourceCode.equals("inviteResult")) {
|
|
if (dataSourceCode.equals("inviteResult")) {
|
|
|
- map.put("kindType","邀约结果");
|
|
|
|
|
|
|
+ map.put("kindType", "邀约结果");
|
|
|
list = commonMapper.getDataKind(map);
|
|
list = commonMapper.getDataKind(map);
|
|
|
}
|
|
}
|
|
|
//量尺状态
|
|
//量尺状态
|
|
|
if (dataSourceCode.equals("scaleStatus")) {
|
|
if (dataSourceCode.equals("scaleStatus")) {
|
|
|
- map.put("kindType","量尺状态");
|
|
|
|
|
|
|
+ map.put("kindType", "量尺状态");
|
|
|
list = commonMapper.getDataKind(map);
|
|
list = commonMapper.getDataKind(map);
|
|
|
}
|
|
}
|
|
|
//跟进方式
|
|
//跟进方式
|
|
|
if (dataSourceCode.equals("followType")) {
|
|
if (dataSourceCode.equals("followType")) {
|
|
|
- map.put("kindType","跟进方式");
|
|
|
|
|
|
|
+ map.put("kindType", "跟进方式");
|
|
|
list = commonMapper.getDataKind(map);
|
|
list = commonMapper.getDataKind(map);
|
|
|
}
|
|
}
|
|
|
//供应商类别
|
|
//供应商类别
|
|
|
if (dataSourceCode.equals("supType")) {
|
|
if (dataSourceCode.equals("supType")) {
|
|
|
- map.put("kindType","供应商类别");
|
|
|
|
|
|
|
+ map.put("kindType", "供应商类别");
|
|
|
list = commonMapper.getDataKind(map);
|
|
list = commonMapper.getDataKind(map);
|
|
|
}
|
|
}
|
|
|
// 初始款项
|
|
// 初始款项
|
|
@@ -811,11 +813,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取供应商和客户数据
|
|
|
|
|
- * @date : 2024/3/13 15:09
|
|
|
|
|
|
|
+ * @desc : 获取供应商和客户数据
|
|
|
|
|
+ * @date : 2024/3/13 15:09
|
|
|
* @author : 寇珊珊
|
|
* @author : 寇珊珊
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getSupplierAndCustomer(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getSupplierAndCustomer(Map<String, Object> param) {
|
|
@@ -824,11 +824,11 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
return ResponseResultUtil.success(list);
|
|
return ResponseResultUtil.success(list);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取供应商和客户数据(分页)
|
|
|
|
|
- * @date : 2024/3/13 14:02
|
|
|
|
|
|
|
+ * @desc : 获取供应商和客户数据(分页)
|
|
|
|
|
+ * @date : 2024/3/13 14:02
|
|
|
* @author : 寇珊珊
|
|
* @author : 寇珊珊
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getSupplierAndCustomerByPage(Map<String, Object> param) {
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getSupplierAndCustomerByPage(Map<String, Object> param) {
|
|
@@ -852,8 +852,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取组织机构
|
|
|
|
|
- * @date : 2024/3/13 17:01
|
|
|
|
|
|
|
+ * @desc : 获取组织机构
|
|
|
|
|
+ * @date : 2024/3/13 17:01
|
|
|
* @author : 寇珊珊
|
|
* @author : 寇珊珊
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getOrganization(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getOrganization(Map<String, Object> param) {
|
|
@@ -864,8 +864,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取组织机构(分页)
|
|
|
|
|
- * @date : 2024/3/13 17:01
|
|
|
|
|
|
|
+ * @desc : 获取组织机构(分页)
|
|
|
|
|
+ * @date : 2024/3/13 17:01
|
|
|
* @author : 寇珊珊
|
|
* @author : 寇珊珊
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getOrganizationByPage(Map<String, Object> param) {
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getOrganizationByPage(Map<String, Object> param) {
|
|
@@ -887,9 +887,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取资金账户(下拉)
|
|
|
|
|
|
|
+ * @desc : 获取资金账户(下拉)
|
|
|
* @author : 付斌
|
|
* @author : 付斌
|
|
|
- * @date : 2024-03-14 11:34
|
|
|
|
|
|
|
+ * @date : 2024-03-14 11:34
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getMac(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getMac(Map<String, Object> param) {
|
|
|
// 获取组织机构
|
|
// 获取组织机构
|
|
@@ -925,9 +925,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取多业务部门
|
|
|
|
|
|
|
+ * @desc : 获取多业务部门
|
|
|
* @author : 付斌
|
|
* @author : 付斌
|
|
|
- * @date : 2024-03-20 16:54
|
|
|
|
|
|
|
+ * @date : 2024-03-20 16:54
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> selectMultiOrg(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> selectMultiOrg(Map<String, Object> param) {
|
|
|
List<Map<String, Object>> list = commonMapper.selectMultiOrg(param);
|
|
List<Map<String, Object>> list = commonMapper.selectMultiOrg(param);
|
|
@@ -935,9 +935,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取多业务员
|
|
|
|
|
|
|
+ * @desc : 获取多业务员
|
|
|
* @author : 付斌
|
|
* @author : 付斌
|
|
|
- * @date : 2024-03-20 16:54
|
|
|
|
|
|
|
+ * @date : 2024-03-20 16:54
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> selectMultiStaff(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> selectMultiStaff(Map<String, Object> param) {
|
|
|
List<Map<String, Object>> list = commonMapper.selectMultiStaff(param);
|
|
List<Map<String, Object>> list = commonMapper.selectMultiStaff(param);
|
|
@@ -945,9 +945,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 组织仓库
|
|
|
|
|
|
|
+ * @desc : 组织仓库
|
|
|
* @author : 宋扬
|
|
* @author : 宋扬
|
|
|
- * @date : 2024/3/22 15:47
|
|
|
|
|
|
|
+ * @date : 2024/3/22 15:47
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> selectMultiWarehouse(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> selectMultiWarehouse(Map<String, Object> param) {
|
|
|
List<Map<String, Object>> list = commonMapper.selectMultiWarehouse(param);
|
|
List<Map<String, Object>> list = commonMapper.selectMultiWarehouse(param);
|
|
@@ -955,9 +955,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 组织资金账户
|
|
|
|
|
|
|
+ * @desc : 组织资金账户
|
|
|
* @author : 宋扬
|
|
* @author : 宋扬
|
|
|
- * @date : 2024/3/22 15:54
|
|
|
|
|
|
|
+ * @date : 2024/3/22 15:54
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> selectMultiMoneyAccount(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> selectMultiMoneyAccount(Map<String, Object> param) {
|
|
|
List<Map<String, Object>> list = commonMapper.selectMultiMoneyAccount(param);
|
|
List<Map<String, Object>> list = commonMapper.selectMultiMoneyAccount(param);
|
|
@@ -965,9 +965,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取商品(采购订单开单用)
|
|
|
|
|
|
|
+ * @desc : 获取商品(采购订单开单用)
|
|
|
* @author : 常皓宁
|
|
* @author : 常皓宁
|
|
|
- * @date : 2024/3/9 10:08
|
|
|
|
|
|
|
+ * @date : 2024/3/9 10:08
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchaseReturn(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsForPurchaseReturn(Map<String, Object> param) {
|
|
|
// 获取系统基础数据
|
|
// 获取系统基础数据
|
|
@@ -976,9 +976,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取商品(采购订单开单用)(分页)
|
|
|
|
|
|
|
+ * @desc : 获取商品(采购订单开单用)(分页)
|
|
|
* @author : 常皓宁
|
|
* @author : 常皓宁
|
|
|
- * @date : 2024/3/9 10:08
|
|
|
|
|
|
|
+ * @date : 2024/3/9 10:08
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseReturnByPage(Map<String, Object> param) {
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForPurchaseReturnByPage(Map<String, Object> param) {
|
|
|
// 校验分页参数
|
|
// 校验分页参数
|
|
@@ -992,9 +992,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取员工的范围权限类型
|
|
|
|
|
|
|
+ * @desc : 获取员工的范围权限类型
|
|
|
* @author : 常皓宁
|
|
* @author : 常皓宁
|
|
|
- * @date : 2024/4/2 10:06
|
|
|
|
|
|
|
+ * @date : 2024/4/2 10:06
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getPurviewType(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getPurviewType(Map<String, Object> param) {
|
|
|
// 获取供应商和客户
|
|
// 获取供应商和客户
|
|
@@ -1003,9 +1003,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取组织仓库
|
|
|
|
|
|
|
+ * @desc : 获取组织仓库
|
|
|
* @author : 付斌
|
|
* @author : 付斌
|
|
|
- * @date : 2024-04-10 13:30
|
|
|
|
|
|
|
+ * @date : 2024-04-10 13:30
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getOrgWh(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getOrgWh(Map<String, Object> param) {
|
|
|
List<Map<String, Object>> list = commonMapper.getOrgWh(param);
|
|
List<Map<String, Object>> list = commonMapper.getOrgWh(param);
|
|
@@ -1018,8 +1018,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取商品(其他入库开单用)
|
|
|
|
|
- * @date : 2024/4/20 11:21
|
|
|
|
|
|
|
+ * @desc : 获取商品(其他入库开单用)
|
|
|
|
|
+ * @date : 2024/4/20 11:21
|
|
|
* @author : 寇珊珊
|
|
* @author : 寇珊珊
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsForInto(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getGoodsForInto(Map<String, Object> param) {
|
|
@@ -1029,8 +1029,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取商品(其他入库开单用)(分页)
|
|
|
|
|
- * @date : 2024/4/20 11:21
|
|
|
|
|
|
|
+ * @desc : 获取商品(其他入库开单用)(分页)
|
|
|
|
|
+ * @date : 2024/4/20 11:21
|
|
|
* @author : 寇珊珊
|
|
* @author : 寇珊珊
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForIntoByPage(Map<String, Object> param) {
|
|
public ResponseResultVO<PageList<Map<String, Object>>> getGoodsForIntoByPage(Map<String, Object> param) {
|
|
@@ -1045,8 +1045,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 销售分析-我的 门店助手的 销售金额 收款金额 库存成本
|
|
|
|
|
- * @date : 2024/4/20 11:21
|
|
|
|
|
|
|
+ * @desc : 销售分析-我的 门店助手的 销售金额 收款金额 库存成本
|
|
|
|
|
+ * @date : 2024/4/20 11:21
|
|
|
* @author : 姜永辉
|
|
* @author : 姜永辉
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<Map<String, Object>> getHomeOrderRecCost(Map<String, Object> param) {
|
|
public ResponseResultVO<Map<String, Object>> getHomeOrderRecCost(Map<String, Object> param) {
|
|
@@ -1054,6 +1054,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
JSONObject jObject = JSONObject.parseObject(m.get("f_get_home_order_rec_cost").toString());
|
|
JSONObject jObject = JSONObject.parseObject(m.get("f_get_home_order_rec_cost").toString());
|
|
|
return ResponseResultUtil.success(jObject);
|
|
return ResponseResultUtil.success(jObject);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* @desc : 获取商品系列不分页
|
|
* @desc : 获取商品系列不分页
|
|
|
* @author : 刘尧
|
|
* @author : 刘尧
|
|
@@ -1085,12 +1086,43 @@ public class CommonService extends BaseService<Map<String, Object>> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * @desc : 获取公司
|
|
|
|
|
|
|
+ * @desc : 获取公司
|
|
|
* @author : 付斌
|
|
* @author : 付斌
|
|
|
- * @date : 2024-06-19 10:00
|
|
|
|
|
|
|
+ * @date : 2024-06-19 10:00
|
|
|
*/
|
|
*/
|
|
|
public ResponseResultVO<List<Map<String, Object>>> getCompany(Map<String, Object> param) {
|
|
public ResponseResultVO<List<Map<String, Object>>> getCompany(Map<String, Object> param) {
|
|
|
List<Map<String, Object>> list = commonMapper.getCompany(param);
|
|
List<Map<String, Object>> list = commonMapper.getCompany(param);
|
|
|
return ResponseResultUtil.success(list);
|
|
return ResponseResultUtil.success(list);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * @desc : 查询首页试试数据
|
|
|
|
|
+ * @author : 付斌
|
|
|
|
|
+ * @date : 2024-06-19 11:02
|
|
|
|
|
+ */
|
|
|
|
|
+ public ResponseResultVO<Map<String, Object>> getRealTimeData(Map<String, Object> param) {
|
|
|
|
|
+ String realTimeDataType = param.get("realTimeDataType").toString();
|
|
|
|
|
+ if ("经营日报".equals(realTimeDataType)) {
|
|
|
|
|
+ param.put("createTimeStart", LocalDate.now());
|
|
|
|
|
+ param.put("createTimeEnd", LocalDate.now().plusDays(1));
|
|
|
|
|
+ } else if ("经营月报".equals(realTimeDataType)) {
|
|
|
|
|
+ param.put("createTimeStart", LocalDate.now().withDayOfMonth(1));
|
|
|
|
|
+ param.put("createTimeEnd", LocalDate.now().plusMonths(1).withDayOfMonth(1));
|
|
|
|
|
+ }
|
|
|
|
|
+ List<Map<String, Object>> list1 = commonMapper.getRealTimeData1(param);
|
|
|
|
|
+ List<Map<String, Object>> list2 = commonMapper.getRealTimeData2(param);
|
|
|
|
|
+ List<Map<String, Object>> list3 = commonMapper.getRealTimeData3(param);
|
|
|
|
|
+ List<Map<String, Object>> list4 = commonMapper.getRealTimeData4(param);
|
|
|
|
|
+
|
|
|
|
|
+ Map<String, Object> res = new HashMap<>();
|
|
|
|
|
+ res.put("orderQty", list1.get(0).get("orderQty"));
|
|
|
|
|
+ res.put("orderAmt", list1.get(0).get("orderAmt"));
|
|
|
|
|
+ res.put("outQty", list2.get(0).get("outQty"));
|
|
|
|
|
+ res.put("outAmt", list2.get(0).get("outAmt"));
|
|
|
|
|
+ res.put("returnQty", list3.get(0).get("returnQty"));
|
|
|
|
|
+ res.put("returnAmt", list3.get(0).get("returnAmt"));
|
|
|
|
|
+ res.put("cusQty", list4.get(0).get("cusQty"));
|
|
|
|
|
+ res.put("cusAmt", list4.get(0).get("cusAmt"));
|
|
|
|
|
+ return ResponseResultUtil.success(res);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|