dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xyc 2025-06-19 15:29:45 +08:00
parent 79ee3cc2b7
commit 85a2238148
17 changed files with 221 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyServiceImpl.java
View File

@ -38,6 +38,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
/**
* 企业信息表（每个租户的下属企业信息）;(dl_company)表服务实现类
*
* @author : http://www.chiner.pro
* @date : 2024-7-31
*/
@ -59,16 +60,17 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
private ServicePackageApi servicePackageApi;
/**
* 获得企业信息表（每个租户的下属企业信息）分页
* @param pageReqVO 分页查询条件
* @param page 分页对象
* @author vinjor-M
*/
@Override
public IPage<Company> queryListPage(CompanyReqVO pageReqVO, Page<Company> page) {
return companyMapper.selectListPage(pageReqVO,page);
}
/**
* 获得企业信息表（每个租户的下属企业信息）分页
*
* @param pageReqVO 分页查询条件
* @param page 分页对象
* @author vinjor-M
*/
@Override
public IPage<Company> queryListPage(CompanyReqVO pageReqVO, Page<Company> page) {
return companyMapper.selectListPage(pageReqVO, page);
}
/**
* 新增企业信息
@ -94,16 +96,21 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
deptRespDTO.setCorpId(companyRespVO.getId());
Long deptId = deptApi.saveDept(deptRespDTO);
/*3.新增企业管理员用户信息并配置角色*/
UserDTO userDTO = new UserDTO();
userDTO.setUsername(companyRespVO.getLoginAccount());
userDTO.setNickname(companyRespVO.getContactName());
userDTO.setDeptId(deptId);
userDTO.setPassword(companyRespVO.getPassword());
userDTO.setMobile(companyRespVO.getMobilePhone());
userDTO.setUserType(USER_TYPE_STAFF);
Long userId = adminUserApi.createUser(userDTO);
Set<String> roleCodes = new HashSet<>(Arrays.asList(companyRespVO.getServiceCodes().split(StrUtil.COMMA)));
permissionApi.assignUserRole(userId, roleCodes);
// 查询账号是否存在
Long userId = null;
AdminUserRespDTO adminUserRespDTO = adminUserApi.getUserByUsername(companyRespVO.getLoginAccount());
if (adminUserRespDTO == null) {
UserDTO userDTO = new UserDTO();
userDTO.setUsername(companyRespVO.getLoginAccount());
userDTO.setNickname(companyRespVO.getContactName());
userDTO.setDeptId(deptId);
userDTO.setPassword(companyRespVO.getPassword());
userDTO.setMobile(companyRespVO.getMobilePhone());
userDTO.setUserType(USER_TYPE_STAFF);
userId = adminUserApi.createUser(userDTO);
Set<String> roleCodes = new HashSet<>(Arrays.asList(companyRespVO.getServiceCodes().split(StrUtil.COMMA)));
permissionApi.assignUserRole(userId, roleCodes);
}
} catch (ServiceException e) {
throw exception(new ErrorCode(e.getCode(), e.getMessage()));
}
@ -122,16 +129,16 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
try {
//查出原有数据
Company oldCompany = this.getById(companyRespVO.getId());
if(!companyRespVO.getServiceCodes().equals(oldCompany.getServiceCodes())){
if (!companyRespVO.getServiceCodes().equals(oldCompany.getServiceCodes())) {
//服务发生变化，变更企业管理员的角色权限
Set<String> roleCodes = new HashSet<>(Arrays.asList(companyRespVO.getServiceCodes().split(StrUtil.COMMA)));
//根据企业管理员登录账户查出userId
AdminUserRespDTO adminUserRespDTO = adminUserApi.getUserByUsername(oldCompany.getLoginAccount());
permissionApi.assignUserRole(adminUserRespDTO.getId(),roleCodes);
permissionApi.assignUserRole(adminUserRespDTO.getId(), roleCodes);
}
//正常更新数据
this.updateById(companyRespVO);
}catch (ServiceException e) {
} catch (ServiceException e) {
throw exception(new ErrorCode(e.getCode(), e.getMessage()));
}
}
@ -150,52 +157,53 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
Company company = this.getById(id);
/*1.查出本租户下与本企业名称相同的二级部门，并取出下级所有部门 */
DeptRespDTO parentDept = deptApi.getDeptByParentId(0L);
DeptRespDTO thisDept = deptApi.getDeptByParentIdAndName(parentDept.getId(),company.getCorpName());
DeptRespDTO thisDept = deptApi.getDeptByParentIdAndName(parentDept.getId(), company.getCorpName());
List<DeptRespDTO> allChildDeptList = deptApi.getChildDeptList(thisDept.getId());
allChildDeptList.add(thisDept);
/*2.删除所有部门的用户和部门---这里挨个删除，为了记录日志和级联删除对应的权限 */
Set<Long> deptIds = convertSet(allChildDeptList, DeptRespDTO::getId);
List<AdminUserRespDTO> userRespDTOList = adminUserApi.getUserListByDeptIds(deptIds);
userRespDTOList.forEach(user->adminUserApi.deleteUser(user.getId()));
userRespDTOList.forEach(user -> adminUserApi.deleteUser(user.getId()));
deptApi.deleteDept(deptIds);
/*3.删除本企业 */
this.removeById(id);
}catch (ServiceException e) {
} catch (ServiceException e) {
throw exception(new ErrorCode(e.getCode(), e.getMessage()));
}
}
/**
* 获取所有企业及对应的管理信息
*
* @author 小李
* @date 10:15 2024/8/14
**/
@Override
public List<CompanyRespVO> getCompanyAndManager(){
public List<CompanyRespVO> getCompanyAndManager() {
return baseMapper.getCompanyAndManager();
}
/**
* 通过服务名称查能提供服务的企业 分页
*
* @param company 企业对象，主要是serverCodes
* @author 小李
* @date 14:09 2024/9/23
* @param company 企业对象，主要是serverCodes
**/
@Override
public IPage<Company> getCompanyPageByServer(Company company, Page<Company> page){
public IPage<Company> getCompanyPageByServer(Company company, Page<Company> page) {
return baseMapper.getCompanyPageByServer(company, page);
}
/**
* 查企业能提供的业务
*
* @param id 企业ID
* @author 小李
* @date 10:21 2024/9/24
* @param id 企业ID
**/
@Override
public CompanyToServerVO getCompanyServerById(String id){
public CompanyToServerVO getCompanyServerById(String id) {
// 查企业信息
Company company = baseMapper.selectById(id);
CompanyToServerVO result = BeanUtil.toBean(company, CompanyToServerVO.class);
@ -205,4 +213,4 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
Optional.ofNullable(servicePackageByIds).ifPresent(result::setServicePackages);
return result;
}
}
}

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/common/InspectionRoleCommon.java
View File

@ -27,6 +27,8 @@ import lombok.Getter;
@Getter
public enum InspectionRoleCommon {
TENANT_ADMIN("tenant_admin", 1),
/** 检测业务管理员 */
JIANCE("jiance", 1),

8
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java
View File

@ -51,10 +51,10 @@ public class InspectionEquInfoController extends BaseController {
public CommonResult list(Integer pageNum, Integer pageSize, InspectionEquInfo inspectionEquInfo) throws Exception {
Page page = new Page(pageNum, pageSize);
if (ObjectUtil.isNull(inspectionEquInfo.getPartnerId())) {
ShopMallPartners partners = partnerService.shopInfoByUserId();
inspectionEquInfo.setPartnerId(partners.getPartnerId());
}
// if (ObjectUtil.isNull(inspectionEquInfo.getPartnerId())) {
//// ShopMallPartners partners = partnerService.shopInfoByUserId();
//// inspectionEquInfo.setPartnerId(partners.getPartnerId());
// }
IPage<InspectionEquInfo> list = inspectionEquInfoService.selectInspectionEquInfoList(page, inspectionEquInfo);
return success(list);
}

11
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionStaffController.java
View File

@ -105,6 +105,17 @@ public class InspectionStaffController extends BaseController {
return success(inspectionStaffService.edit(inspectionStaff));
}
/**
* 删除检测员工
*
* @param id
* @return
*/
@DeleteMapping("/delete")
public CommonResult<?> delete(Long id) {
return success(inspectionStaffService.removeById(id));
}
/**
* 模板
*

8
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionUtilController.java
View File

@ -79,7 +79,7 @@ public class InspectionUtilController {
if (CollUtil.isEmpty(inspectionRoles)) {
return success(name);
}
Integer index = Integer.MAX_VALUE;
Integer index = Integer.MAX_VALUE;
for (RoleReqDTO inspectionRole : inspectionRoles) {
InspectionRoleCommon inspectionRoleCommon = InspectionRoleCommon.valueOf(inspectionRole.getCode().toUpperCase());
if (ObjectUtil.isEmpty(inspectionRoleCommon)) {
@ -130,7 +130,7 @@ public class InspectionUtilController {
@GetMapping("/getRoleNameByIds")
public CommonResult<?> getRoleNameByIds(@RequestParam("ids") List<Long> ids) {
Map<Long, List<Long>> idToRoleIds = ids.stream().collect(Collectors.toMap(id -> id, id -> permissionApi.getRoleIdsByUserId(id)));
if (CollUtil.isEmpty(idToRoleIds)){
if (CollUtil.isEmpty(idToRoleIds)) {
return null;
}
List<RoleReqDTO> roleList = roleApi.getRoleList();
@ -140,7 +140,7 @@ public class InspectionUtilController {
Map.Entry::getKey,
item -> {
String name = "未知岗位";
if (CollUtil.isEmpty(item.getValue())){
if (CollUtil.isEmpty(item.getValue())) {
return name;
}
List<RoleReqDTO> roles = roleList.stream().filter(i -> item.getValue().contains(i.getId())).collect(Collectors.toList());
@ -148,7 +148,7 @@ public class InspectionUtilController {
return name;
}
List<RoleReqDTO> inspectionRoles = roles.stream().filter(i -> codes.contains(i.getCode())).collect(Collectors.toList());
if (CollUtil.isEmpty(inspectionRoles)){
if (CollUtil.isEmpty(inspectionRoles)) {
return name;
}
Integer index = Integer.MAX_VALUE;

91
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java
View File

@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.inspection.query.FileByTypeQuery;
import cn.iocoder.yudao.module.inspection.query.OrderTableQuery;
import cn.iocoder.yudao.module.inspection.service.InspectionBusinessChannelService;
import cn.iocoder.yudao.module.inspection.vo.*;
import cn.iocoder.yudao.module.label.vo.LabelRespVO;
import cn.iocoder.yudao.module.partner.entity.PartnerBalanceDetail;
@ -30,6 +31,7 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import cn.iocoder.yudao.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import cn.iocoder.yudao.module.core.controller.BaseController;
@ -58,6 +60,8 @@ public class PartnerOwnController extends BaseController {
private RoleService roleService;
@Autowired
private PermissionApi permissionApi;
@Autowired
private InspectionBusinessChannelService businessChannelService;
/**
* 获取店铺详情
@ -251,10 +255,10 @@ public class PartnerOwnController extends BaseController {
@GetMapping("/canUsegoods")
public CommonResult canUseGoods(Long partnerId) {
LoginUser user = SecurityFrameworkUtils.getLoginUser();
ShopMallPartners partners = partnerList.getById(partnerId);
if (!partners.getUserId().equals(user.getId())) {
return null;
}
// ShopMallPartners partners = partnerList.getById(partnerId);
// if (!partners.getUserId().equals(user.getId())) {
// return null;
// }
return success(partnerList.canUseGoods(partnerId));
}
@ -475,7 +479,7 @@ public class PartnerOwnController extends BaseController {
@GetMapping("/getAppointmentList")
public CommonResult getAppointmentList(Long partnerId, String phoneNum,
Integer pageSize, Integer pageNum,
String carNo,@RequestParam(required = false) String startTime,@RequestParam(required = false) String endTime) throws Exception {
String carNo, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) throws Exception {
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
// ShopMallPartners partnersTmp = partnerList.getById(partnerId);
// if (!partnersTmp.getUserId().equals(user.getId())){
@ -483,7 +487,7 @@ public class PartnerOwnController extends BaseController {
// }
Page<InspectionAppointment> page = new Page<>(pageNum, pageSize);
// ShopMallPartners shopMallPartners = partnerList.shopInfo();
IPage<InspectionAppointment> appointments = partnerList.getAppointmentList(page, null, phoneNum, carNo,startTime,endTime);
IPage<InspectionAppointment> appointments = partnerList.getAppointmentList(page, null, phoneNum, carNo, startTime, endTime);
return success(appointments);
}
@ -547,11 +551,11 @@ public class PartnerOwnController extends BaseController {
public CommonResult listCoupon(Long partnerId, String searchValue,
@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
LoginUser user = SecurityFrameworkUtils.getLoginUser();
ShopMallPartners partnersTmp = partnerList.getById(partnerId);
if (!partnersTmp.getUserId().equals(user.getId())) {
return success(new ArrayList<>());
}
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
// ShopMallPartners partnersTmp = partnerList.getById(partnerId);
// if (!partnersTmp.getUserId().equals(user.getId())) {
// return success(new ArrayList<>());
// }
Page<ShopCouponTemplate> page = new Page<>(pageNum, pageSize);
IPage<ShopCouponTemplate> shopCouponTemplates = partnerList.listCoupon(page, partnerId, searchValue);
return success(shopCouponTemplates);
@ -592,27 +596,11 @@ public class PartnerOwnController extends BaseController {
//获取客户来源
@GetMapping("/getCustomerSource")
public CommonResult getCustomerSource(String searchValue) throws Exception {
ShopMallPartners partners = partnerList.shopInfoByUserId();
String dictStr = "customer_source-" + partners.getPartnerId();
DictTypeDO sysDictType = dictTypeService.getDictType(dictStr);
if (ObjectUtil.isEmpty(sysDictType)) {
//初始化
DictTypeSaveReqVO save = new DictTypeSaveReqVO();
save.setName("客户来源-" + partners.getPartnerName());
save.setStatus(0);
save.setType(dictStr);
dictTypeService.createDictType(save);
}
List<DictDataDO> dataList = dictDataService.getDictDataListByDictType(dictStr);
if (CollectionUtil.isEmpty(dataList)) {
dataList = new ArrayList<>();
}
if (StringUtils.isNotEmpty(searchValue)) {
dataList = dataList.stream().filter(it -> {
return it.getLabel().contains(searchValue);
}).collect(Collectors.toList());
}
return success(dataList);
// 查询渠道与来源表
List<InspectionBusinessChannel> list = businessChannelService.list(Wrappers.<InspectionBusinessChannel>lambdaQuery()
.eq(InspectionBusinessChannel::getType, 1)
.like(StrUtil.isNotEmpty(searchValue), InspectionBusinessChannel::getName, searchValue));
return success(list);
}
//新增客户来源
@ -663,13 +651,15 @@ public class PartnerOwnController extends BaseController {
//获取收款账号
@GetMapping("/getBankAccountList")
public CommonResult getBankAccountList(String searchValue) throws Exception {
ShopMallPartners partners = partnerList.shopInfoByUserId();
String dictStr = "partner_bankList-" + partners.getPartnerId();
// ShopMallPartners partners = partnerList.shopInfoByUserId();
// 获取当前租户id
Long tenantId = SecurityFrameworkUtils.getLoginUser().getTenantId();
String dictStr = "partner_bankList-" + tenantId;
DictTypeDO sysDictType = dictTypeService.getDictType(dictStr);
if (ObjectUtil.isEmpty(sysDictType)) {
//初始化
DictTypeSaveReqVO sysDictTypeSave = new DictTypeSaveReqVO();
sysDictTypeSave.setName("收款账户-" + partners.getPartnerName());
sysDictTypeSave.setName("收款账户-" + tenantId);
sysDictTypeSave.setStatus(0);
sysDictTypeSave.setType(dictStr);
dictTypeService.createDictType(sysDictTypeSave);
@ -740,8 +730,8 @@ public class PartnerOwnController extends BaseController {
//统计表格2
@GetMapping("/staticsTable2")
public CommonResult staticsTable2(String startTime, String endTime) throws Exception {
ShopMallPartners partners = partnerList.shopInfo();
return success(partnerList.staticsTable2(partners.getPartnerId(), startTime, endTime));
// ShopMallPartners partners = partnerList.shopInfo();
return success(partnerList.staticsTable2(null, startTime, endTime));
}
//新统计表格2
@ -759,8 +749,9 @@ public class PartnerOwnController extends BaseController {
/**
* 客户来源统计
*
* @param startTime 开始时间
* @param endTime 结束时间
* @param endTime 结束时间
* @return
*/
@GetMapping("/customerSourceCount")
@ -831,8 +822,8 @@ public class PartnerOwnController extends BaseController {
* @date 14:52 2024/12/10
**/
@GetMapping("/getProjectBelowStandardByIds")
public CommonResult<?> getProjectBelowStandardByIds(@RequestParam(value = "ids") Long[] ids,@RequestParam(value = "status",required = false) String status,@RequestParam(value = "type",required = false) String type) {
return success(partnerList.getProjectBelowStandardByIds(ids,status,type));
public CommonResult<?> getProjectBelowStandardByIds(@RequestParam(value = "ids") Long[] ids, @RequestParam(value = "status", required = false) String status, @RequestParam(value = "type", required = false) String type) {
return success(partnerList.getProjectBelowStandardByIds(ids, status, type));
}
/**
@ -843,8 +834,8 @@ public class PartnerOwnController extends BaseController {
* @date 14:52 2024/12/10
**/
@GetMapping("/getProjectExceptionByIds")
public CommonResult<?> getProjectExceptionByIds(@RequestParam(value = "ids") Long[] ids,@RequestParam(value = "status",required = false) String status,@RequestParam(value = "type",required = false) String type) {
return success(partnerList.getProjectExceptionByIds(ids,status,type));
public CommonResult<?> getProjectExceptionByIds(@RequestParam(value = "ids") Long[] ids, @RequestParam(value = "status", required = false) String status, @RequestParam(value = "type", required = false) String type) {
return success(partnerList.getProjectExceptionByIds(ids, status, type));
}
/**
@ -914,23 +905,25 @@ public class PartnerOwnController extends BaseController {
/**
* 文件统计
* @param startTime 开始时间
* @param endTime 结束时间
*
* @param startTime 开始时间
* @param endTime 结束时间
* @return
*/
@GetMapping("/fileStatistics")
public CommonResult<?> fileStatistics(String servicePackageId,@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime){
return success(partnerList.fileStatistics(servicePackageId,startTime, endTime));
public CommonResult<?> fileStatistics(String servicePackageId, @RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime) {
return success(partnerList.fileStatistics(servicePackageId, startTime, endTime));
}
/**
* 文件统计
*
* @param fileByTypeQuery
* @return
*/
@GetMapping("/getFileByType")
public CommonResult<?> getFileByType(FileByTypeQuery fileByTypeQuery){
return success(partnerList.fileStatisticsList(fileByTypeQuery.getServicePackageId(),fileByTypeQuery.getStartTime(),fileByTypeQuery.getEndTime()));
public CommonResult<?> getFileByType(FileByTypeQuery fileByTypeQuery) {
return success(partnerList.fileStatisticsList(fileByTypeQuery.getServicePackageId(), fileByTypeQuery.getStartTime(), fileByTypeQuery.getEndTime()));
}
}

42
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionGoodsController.java
View File

@ -190,25 +190,25 @@ public class ShopInspectionGoodsController extends BaseController {
List<RoleDO> roleList = roleService.getRoleList(userRoleIdListByUserId);
List<String> roles = roleList.stream().map(RoleDO::getCode).collect(Collectors.toList());
ShopMallPartners partner = new ShopMallPartners();
if (roles.contains("jcshop")) {
LambdaQueryWrapper<ShopMallPartners> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.orderByAsc(ShopMallPartners::getPartnerId).eq(ShopMallPartners::getType, "jc").eq(ShopMallPartners::getIsBanned, "0").last("limit 1");
partner = appInspectionPartnerService.getOne(queryWrapper);
if (ObjectUtil.isEmpty(partner)) {
return error();
}
} else if (roles.contains("jcworker")) {
LambdaQueryWrapper<PartnerWorker> queryWrapperWork = new LambdaQueryWrapper<>();
queryWrapperWork.eq(PartnerWorker::getUserId, user.getId());
queryWrapperWork.last("limit 1");
PartnerWorker worker = partnerWorkerService.getOne(queryWrapperWork);
if (ObjectUtil.isEmpty(worker)) {
return error();
}
partner.setPartnerId(worker.getPartnerId());
}
shopInspectionOrder.setPartnerId(partner.getPartnerId());
// ShopMallPartners partner = new ShopMallPartners();
// if (roles.contains("jcshop")) {
// LambdaQueryWrapper<ShopMallPartners> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.orderByAsc(ShopMallPartners::getPartnerId).eq(ShopMallPartners::getType, "jc").eq(ShopMallPartners::getIsBanned, "0").last("limit 1");
// partner = appInspectionPartnerService.getOne(queryWrapper);
// if (ObjectUtil.isEmpty(partner)) {
// return error();
// }
// } else if (roles.contains("jcworker")) {
// LambdaQueryWrapper<PartnerWorker> queryWrapperWork = new LambdaQueryWrapper<>();
// queryWrapperWork.eq(PartnerWorker::getUserId, user.getId());
// queryWrapperWork.last("limit 1");
// PartnerWorker worker = partnerWorkerService.getOne(queryWrapperWork);
// if (ObjectUtil.isEmpty(worker)) {
// return error();
// }
// partner.setPartnerId(worker.getPartnerId());
// }
// shopInspectionOrder.setPartnerId(partner.getPartnerId());
shopInspectionOrder.setValidationTime(new Date());
Page<OrderInfo> page = new Page<>(pageNo, pageSize);
return CommonResult.success(orderInfoService.queryListPage(shopInspectionOrder, page));
@ -335,8 +335,8 @@ public class ShopInspectionGoodsController extends BaseController {
*/
@GetMapping("/partnerGoodsListCol")
public CommonResult partnerGoodsListCol() throws Exception {
ShopMallPartners partners = appInspectionPartnerService.shopInfoByUserId();
return success(shopInspectionGoodsService.partnerGoodsListCol(partners.getPartnerId()));
// ShopMallPartners partners = appInspectionPartnerService.shopInfoByUserId();
return success(shopInspectionGoodsService.partnerGoodsListCol(19L));
}

24
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java
View File

@ -1079,7 +1079,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
@Override
public IPage<GoodsVo> goodsList(Page<GoodsVo> page, Long partnerId, String isListing, String goodsTitle) {
return baseMapper.manageGoodsList(page, partnerId, isListing, goodsTitle);
return baseMapper.manageGoodsList(page, null, isListing, goodsTitle);
}
@Override
@ -1170,10 +1170,10 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
throw new Exception("不可重复上架！");
}
LoginUser user = SecurityFrameworkUtils.getLoginUser();
ShopMallPartners partners = baseMapper.selectById(goods.getPartnerId());
if (!partners.getUserId().equals(user.getId())) {
return;
}
// ShopMallPartners partners = baseMapper.selectById(goods.getPartnerId());
// if (!partners.getUserId().equals(user.getId())) {
// return;
// }
goods.setIsListing(goods.getIsListing().equals("0") ? "1" : "0");
if (goods.getIsListing().equals("1")) {
@ -1792,10 +1792,10 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
@Override
public void sendCoupon(ShopCouponTemplate template) throws Exception {
LoginUser user = SecurityFrameworkUtils.getLoginUser();
ShopMallPartners partnersTmp = baseMapper.selectById(template.getPartnerId());
if (!partnersTmp.getUserId().equals(user.getId())) {
return;
}
// ShopMallPartners partnersTmp = baseMapper.selectById(template.getPartnerId());
// if (!partnersTmp.getUserId().equals(user.getId())) {
// return;
// }
if (StringUtils.isEmpty(template.getRoleKey())) {
throw new Exception("请选择角色信息");
}
@ -1824,7 +1824,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
@Override
public IPage<ShopCouponTemplate> listCoupon(Page<ShopCouponTemplate> page, Long partnerId, String searchValue) {
LambdaQueryWrapper<ShopCouponTemplate> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ShopCouponTemplate::getPartnerId, partnerId).eq(ShopCouponTemplate::getBindMoudle, "检测项目现金券")
queryWrapper.eq(ShopCouponTemplate::getBindMoudle, "检测项目现金券")
.eq(StringUtils.isNotEmpty(searchValue), ShopCouponTemplate::getTitle, searchValue).orderByDesc(TenantBaseDO::getCreateTime);
return templateService.listCoupon(page, partnerId, searchValue);
@ -1925,7 +1925,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
OrderInfo orderInfo = orderService.getById(inspectionInfo.getInspectionOrderId());
AdminUserDO buyUser = userService.getUser(inspectionInfo.getUserId());
PartnerWorker worker = partnerWorkerService.getById(inspectionInfo.getWorkId());
ShopMallPartners partner = this.getById(orderInfo.getPartnerId());
// ShopMallPartners partner = this.getById(orderInfo.getPartnerId());
AdminUserDO workerUser = userService.getUser(inspectionInfo.getWorkId());
String inspection_work_order = configService.selectConfigByKey("inspection_work_order");
String payType = "未知";
@ -1933,7 +1933,7 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
DictDataDO payType1 = dictDataService.getDictData("pay_type", orderInfo.getPayType());
payType = payType1.getLabel();
}
inspection_work_order = inspection_work_order.replaceAll("title", Optional.ofNullable(partner.getPartnerName()).orElse(""));
// inspection_work_order = inspection_work_order.replaceAll("title", Optional.ofNullable(partner.getPartnerName()).orElse(""));
inspection_work_order = inspection_work_order.replaceAll("buyAdress", Optional.ofNullable(inspectionInfo.getUserAddress()).orElse(""));
inspection_work_order = inspection_work_order.replaceAll("buyName", Optional.ofNullable(buyUser.getNickname()).orElse("未知"));
inspection_work_order = inspection_work_order.replaceAll("buyPhone", Optional.ofNullable(buyUser.getMobile()).orElse("未知"));

14
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
View File

@ -166,7 +166,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
@Transactional(rollbackFor = Exception.class)
public int insertInspectionInfo(InspectionInfo inspectionInfo) throws Exception {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
ShopMallPartners partners = appInspectionPartnerService.shopInfoByUserId();
// ShopMallPartners partners = appInspectionPartnerService.shopInfoByUserId();
if (ObjectUtils.isEmpty(inspectionInfo.getInspectionWorkNodes())) {
throw new RuntimeException("请选择检测项目");
@ -197,7 +197,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
}
InspectionGoodsSku sku = skuService.getById(inspectionInfo.getSkuId());
ShopInspectionGoods goods = goodsService.getById(sku.getGoodsId());
ShopMallPartners partner = appInspectionPartnerService.getById(goods.getPartnerId());
// ShopMallPartners partner = appInspectionPartnerService.getById(goods.getPartnerId());
OrderInfo orderInfo = new OrderInfo();
@ -210,7 +210,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
// 查询订单
orderInfo = orderInfoService.getById(appointment1.getOrderId());
} else {
orderInfo.setPartnerId(partners.getPartnerId());
// orderInfo.setPartnerId(partners.getPartnerId());
orderInfo.setGoodsId(Long.parseLong(goods.getId().toString()));
orderInfo.setGoodsTitle(goods.getTitle());
orderInfo.setGoodsType("jc");
@ -225,7 +225,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
orderInfo.setRealName(user.getNickname());
orderInfo.setIsOnline("0");
orderInfo.setPhonenumber(user.getMobile());
orderInfo.setPartnerName(partner.getPartnerName());
// orderInfo.setPartnerName(partner.getPartnerName());
orderInfo.setOrderNo("线下订单-" + System.currentTimeMillis());
//赊账的情况
orderInfo.setOrderStatus("0");
@ -244,7 +244,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
.eq(OrderInfo::getId, orderInfo.getId())
.set(OrderInfo::getValidationTime, new Date()));
} else {
orderInfo.setPartnerId(partners.getPartnerId());
// orderInfo.setPartnerId(partners.getPartnerId());
orderInfo.setGoodsId(Long.parseLong(goods.getId().toString()));
orderInfo.setGoodsTitle(goods.getTitle());
orderInfo.setGoodsType("jc");
@ -259,7 +259,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
orderInfo.setRealName(user.getNickname());
orderInfo.setIsOnline("0");
orderInfo.setPhonenumber(user.getMobile());
orderInfo.setPartnerName(partner.getPartnerName());
// orderInfo.setPartnerName(partner.getPartnerName());
orderInfo.setOrderNo("线下订单-" + System.currentTimeMillis());
//赊账的情况
orderInfo.setOrderStatus("0");
@ -273,7 +273,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
.set(InspectionAppointment::getOrderId, orderInfo.getId()));
}
inspectionInfo.setInspectionOrderId(orderInfo.getId());
inspectionInfo.setPartnerId(partners.getPartnerId());
// inspectionInfo.setPartnerId(partners.getPartnerId());
inspectionInfo.setWorkerName(workerUser.getNickname());
inspectionInfo.setWorkerPhone(workerUser.getMobile());
if (ObjectUtil.isNull(inspectionInfo.getStartTime())) {

41
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStaffServiceImpl.java
View File

@ -192,12 +192,19 @@ public class InspectionStaffServiceImpl extends ServiceImpl<InspectionStaffMappe
@Transactional(rollbackFor = Exception.class)
public Long saveInspectionStaff(InspectionStaffSaveVo inspectionStaffVo) {
//新增system_users主表
UserSaveReqVO userDTO = BeanUtil.copyProperties(inspectionStaffVo, UserSaveReqVO.class);
userDTO.setId(inspectionStaffVo.getUserId());
//获取当前人的租户id
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
userDTO.setTenantId(loginUser.getTenantId());
Long userId = userService.createUser(userDTO);
// 判断账号是否存在
AdminUserDO one = userService.getOne(Wrappers.<AdminUserDO>lambdaQuery().eq(AdminUserDO::getUsername, inspectionStaffVo.getUsername()).last("LIMIT 1"));
Long userId = null;
if (one == null) {
UserSaveReqVO userDTO = BeanUtil.copyProperties(inspectionStaffVo, UserSaveReqVO.class);
userDTO.setId(inspectionStaffVo.getUserId());
//获取当前人的租户id
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
userDTO.setTenantId(loginUser.getTenantId());
userId = userService.createUser(userDTO);
} else {
userId = one.getId();
}
// //查询检测基础员工角色
// List<RoleDO> role = roleService.getRoleListByCodesTenant(Collections.singletonList(InspectionConstants.INSPECTION_BASE_STAFF_ROLE));
@ -210,14 +217,22 @@ public class InspectionStaffServiceImpl extends ServiceImpl<InspectionStaffMappe
// //设置角色为检测基础员工
// permissionService.assignUserRole(userId, roleIds);
InspectionStaff inspectionStaff = BeanUtil.copyProperties(inspectionStaffVo, InspectionStaff.class);
inspectionStaff.setUserId(userId);
//新增检测员工子表
this.save(inspectionStaff);
if (ObjectUtil.isNotEmpty(inspectionStaffVo.getFileList())) {
addFile(inspectionStaffVo.getFileList(), inspectionStaffVo.getNickname(), null, inspectionStaff.getUserId());
// 查询子表中是否存在
InspectionStaff staff = this.getOne(Wrappers.<InspectionStaff>lambdaQuery().eq(InspectionStaff::getUserId, userId));
if (ObjectUtil.isNull(staff)) {
InspectionStaff inspectionStaff = BeanUtil.copyProperties(inspectionStaffVo, InspectionStaff.class);
inspectionStaff.setUserId(userId);
//新增检测员工子表
this.save(inspectionStaff);
if (ObjectUtil.isNotEmpty(inspectionStaffVo.getFileList())) {
addFile(inspectionStaffVo.getFileList(), inspectionStaffVo.getNickname(), null, inspectionStaff.getUserId());
}
return inspectionStaff.getUserId();
}else {
throw new RuntimeException("该员工已存在");
}
return inspectionStaff.getUserId();
}
/**

6
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ProjectRoyaltyServiceImpl.java
View File

@ -70,8 +70,8 @@ public class ProjectRoyaltyServiceImpl extends ServiceImpl<ProjectRoyaltyMapper,
@Override
public List<ProjectRoyalty> getProjectRoyaltyList(String projectId) {
try {
ShopMallPartners one = appInspectionPartnerService.shopInfoByUserId();
return baseMapper.selectListByProjrctId(projectId, one.getPartnerId().toString());
// ShopMallPartners one = appInspectionPartnerService.shopInfoByUserId();
return baseMapper.selectListByProjrctId(projectId, null);
} catch (Exception e) {
throw new RuntimeException(e);
}
@ -111,4 +111,4 @@ public class ProjectRoyaltyServiceImpl extends ServiceImpl<ProjectRoyaltyMapper,
// }
}
}

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionGoodsServiceImpl.java
View File

@ -300,7 +300,7 @@ public class ShopInspectionGoodsServiceImpl extends ServiceImpl<ShopInspectionGo
JSONObject res =new JSONObject();
List<JSONObject> listGoods = new ArrayList<>();
LambdaQueryWrapper<ShopInspectionGoods> queryWrapper =new LambdaQueryWrapper<>();
queryWrapper.eq(ShopInspectionGoods::getPartnerId,partnerId).eq(ShopInspectionGoods::getIsListing,"1").orderByAsc(ShopInspectionGoods::getOrderNum);
queryWrapper.eq(ObjectUtil.isNotEmpty(partnerId),ShopInspectionGoods::getPartnerId,partnerId).eq(ShopInspectionGoods::getIsListing,"1").orderByAsc(ShopInspectionGoods::getOrderNum);
List<ShopInspectionGoods> list = this.list(queryWrapper);
if (CollectionUtil.isNotEmpty(list)){
listGoods = list.stream().map(it -> {

50
dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml
View File

@ -127,21 +127,42 @@
FROM order_info oi
WHERE oi.deleted = 0
</select>
<select id="allAmount" resultType="java.lang.Integer">
<select id="manageGoodsList" resultType="cn.iocoder.yudao.module.inspection.vo.GoodsVo">
SELECT
sig.id as goodsId,sig.title as goodsTitle,sig.image as goodsImage,sig.price,count(oi.id) as
salesNum,sig.listing_status,sig.reject_reason
FROM
shop_inspection_goods sig
LEFT JOIN order_info oi ON sig.id = oi.goods_id and oi.pay_time is not null
<where>
<if test="partnerId !=null and partnerId!=''">
sig.partner_id =#{partnerId}
</if>
<if test="isListing !=null and isListing!=''">
and sig.is_listing = #{isListing}
</if>
<if test="goodsTitle !=null and goodsTitle!=''">
and sig.title like concat('%',#{goodsTitle},'%')
</if>
</where>
group by sig.id
order by sig.order_num,sig.create_time desc
</select>
<select id="allAmount" resultType="java.lang.Integer">
SELECT
IfNULL(sum(oi.pay_money+oi.balance),0) as allAmount
FROM
order_info oi
WHERE oi.partner_id = #{partnerId} and validation_time is not null
</select>
<select id="todayAmount" resultType="java.lang.Integer">
<select id="todayAmount" resultType="java.lang.Integer">
SELECT
IfNULL(sum(oi.pay_money+oi.balance),0) as allAmount
FROM
order_info oi
WHERE oi.partner_id = #{partnerId} and validation_time like CONCAT(#{timeStr},'%')
</select>
<select id="hotGoodsList" resultType="cn.iocoder.yudao.module.inspection.vo.HotGoodsVo">
<select id="hotGoodsList" resultType="cn.iocoder.yudao.module.inspection.vo.HotGoodsVo">
SELECT
goods.title AS goodsName,
ROUND(
@ -165,7 +186,7 @@ GROUP BY
goods.id
order by salesNum desc
</select>
<select id="newHotGoodsList" resultType="cn.iocoder.yudao.module.inspection.vo.HotGoodsVo">
<select id="newHotGoodsList" resultType="cn.iocoder.yudao.module.inspection.vo.HotGoodsVo">
SELECT
goods.title AS goodsName,
SUM( case when (ii.`status`='1' and ii.is_pass = '1') or (ii.`status`='0') then oi.goods_price else 0 end ) AS salesAmount,
@ -179,22 +200,6 @@ GROUP BY
goods.id
order by salesNum desc
</select>
<select id="manageGoodsList" resultType="cn.iocoder.yudao.module.inspection.vo.GoodsVo">
SELECT
sig.id as goodsId,sig.title as goodsTitle,sig.image as goodsImage,sig.price,count(oi.id) as salesNum,sig.listing_status,sig.reject_reason
FROM
shop_inspection_goods sig
LEFT JOIN order_info oi ON sig.id = oi.goods_id and oi.pay_time is not null
where sig.partner_id =#{partnerId}
<if test="isListing !=null and isListing!=''">
and sig.is_listing = #{isListing}
</if>
<if test="goodsTitle !=null and goodsTitle!=''">
and sig.title like concat('%',#{goodsTitle},'%')
</if>
group by sig.id
order by sig.order_num,sig.create_time desc
</select>
<select id="orderList" resultType="cn.iocoder.yudao.module.inspection.vo.OrderAppDetail">
SELECT
*
@ -488,7 +493,10 @@ FROM
inspection_info ii
LEFT JOIN order_info oi on oi.id = ii.inspection_order_id
<where>
ii.partner_id =#{partnerId} and ii.deleted = 0 and oi.deleted = 0
ii.deleted = 0 and oi.deleted = 0
<if test="partnerId != null">
and ii.partner_id = #{partnerId}
</if>
<if test="startTime != null and endTime != null">
and ii.create_time BETWEEN #{startTime} and #{endTime}
</if>

17
dl-module-inspection/src/main/resources/mapper/inspection/InspectionStaffMapper.xml
View File

@ -27,12 +27,10 @@
iss.emergency_contact_name,
iss.emergency_contact_phone,
iss.driver_license_type
FROM system_users su
left join system_user_role sur on su.id = sur.user_id
left join system_role sr on sur.role_id = sr.id
left join inspection_staff iss on iss.user_id = su.id
FROM inspection_staff iss
Inner join system_users su on iss.user_id = su.id
<where>
sr.service_package_id = 'jiance' and sr.code != 'jcyh' and su.deleted = 0
su.deleted = 0
<if test="query.nickname != null and query.nickname != ''">
and su.nickname like concat('%', #{query.nickname}, '%')
</if>
@ -70,13 +68,10 @@
iss.driver_license_type,
iss.folder_id,
iss.unique_code
FROM system_users su
left join system_user_role sur on su.id = sur.user_id
left join system_role sr on sur.role_id = sr.id
inner join inspection_staff iss on iss.user_id = su.id
FROM inspection_staff iss
inner join system_users su on iss.user_id = su.id
<where>
sr.service_package_id = 'jiance' and sr.code != 'jcyh'
and su.id = #{id}
su.id = #{id}
</where>
</select>
<select id="getAll" resultType="cn.iocoder.yudao.module.inspection.vo.InspectionStaffExportVo"

9
dl-module-inspection/src/main/resources/mapper/inspection/ProjectRoyaltyMapper.xml
View File

@ -42,8 +42,11 @@
ON g.id = r.goods_id
AND r.deleted = 0
AND r.project_id = #{projectId}
WHERE g.deleted = 0
AND g.partner_id = #{parentId}
<where> g.deleted = 0
<if test="parentId != null">
AND g.partner_id = #{parentId}
</if>
</where>
</select>
</mapper>
</mapper>

5
dl-module-inspection/src/main/resources/mapper/inspection/ShopCouponTemplateMapper.xml
View File

@ -50,10 +50,13 @@
<select id="listCoupon" resultType="cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate">
select template.*,goods.title as bindGoodsName from shop_coupon_template template
left join shop_inspection_goods goods on goods.id = template.bind_goods_ids
where template.partner_id = #{partnerId} and bind_moudle = '检测项目现金券'
where bind_moudle = '检测项目现金券'
<if test="searchValue!=null and searchValue!=''">
and title like concat('%',#{searchValue},'%')
</if>
<if test="partnerId!=null">
and template.partner_id = #{partnerId}
</if>
order by create_time desc
</select>

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
View File

@ -164,7 +164,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, TenantDO> imple
Set<Long> menuIds = permissionService.getRoleMenuListByRoleIdCus(roleDO.getId());
// 创建角色
RoleSaveReqVO reqVO = new RoleSaveReqVO();
reqVO.setName(roleDO.getName()).setCode(roleDO.getCode())
reqVO.setName(roleDO.getName()).setCode(roleDO.getCode()).setServicePackageId(roleDO.getServicePackageId())
.setSort(0).setRemark("系统自动生成");
Long roleId = roleService.createRole(reqVO, RoleTypeEnum.SYSTEM.getType());
// 分配权限