zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分包

Browse Source
This commit is contained in:
zt
2025-04-02 11:09:53 +08:00
parent ed14f2399d
commit 223cae5edc
83 changed files with 2994 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectTaskApplyController.java
View File

@ -42,9 +42,9 @@ public class AppBgtProjectTaskApplyController extends BaseController {
@ApiOperation("App取消申请项目任务")
@Log(title = "App取消申请项目任务" , businessType = BusinessType.DELETE)
@DeleteMapping()
public AjaxResult<Boolean> cancelApply(BgtTaskApplyDTO dto) {
@Log(title = "App取消申请项目任务" , businessType = BusinessType.UPDATE)
@PutMapping()
public AjaxResult<Boolean> cancelApply(@Validated @RequestBody BgtTaskApplyDTO dto) {
return AjaxResult.success(iFbsProjectTaskApplyService.cancelApply(dto));
}

20
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AppLoginController.java
View File

@ -4,11 +4,10 @@ import cn.hutool.core.lang.Validator;
import com.ruoyi.bgt.service.IBgtUserService;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.BgtUser;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.core.domain.model.BgtLoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.service.ICompanyService;
import com.ruoyi.common.util.DataUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
@ -19,6 +18,7 @@ import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.wgz.service.IWgzUserService;
import com.ruoyi.zbf.service.IZbfUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -64,8 +64,13 @@ public class AppLoginController
@Autowired
private IFbsUserService fbsUserService;
@Autowired
private IZbfUserService zbfUserService;
@Autowired
private ISysDictTypeService dictTypeService;
@Autowired
private ICompanyService companyService;
/**
* 登录方法
@ -108,7 +113,14 @@ public class AppLoginController
ajax.put("user", wgzUserService.userLongIn(user.getPhonenumber()));
break;
case Constants.FBS:
ajax.put("user", fbsUserService.selectUserByPhone(user.getPhonenumber()));
FbsUser fbsUser = fbsUserService.selectUserByPhone(user.getPhonenumber());
fbsUser.setCompanyName(companyService.getCompanyNameById(fbsUser.getCompanyId()));
ajax.put("user", fbsUser);
break;
case Constants.ZBF:
ZbfUser zbfUser = zbfUserService.selectUserByPhone(user.getPhonenumber());
zbfUser.setCompanyName(companyService.getCompanyNameById(zbfUser.getCompanyId()));
ajax.put("user", zbfUser);
break;
default:
break;

52
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CompanyController.java Normal file
View File

@ -0,0 +1,52 @@
package com.ruoyi.web.controller.common;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.domain.Company;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.service.ICompanyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
/**
* 企业认证Controller
*
* @author ruoyi
* @date 2025-03-26
*/
@Api(value = "企业认证控制器", tags = {"企业认证管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/common/company")
public class CompanyController extends BaseController {
private final ICompanyService iCommonCompanyService;
/**
* 获取企业认证详细信息
*/
@ApiOperation("获取企业认证详细信息")
@GetMapping("/{id}")
public AjaxResult<Company> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iCommonCompanyService.queryById(id));
}
@ApiOperation("修改企业认证")
@Log(title = "企业认证", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Boolean> edit(@Validated @RequestBody Company bo) {
return AjaxResult.success(iCommonCompanyService.update(bo));
}
}

17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectController.java
View File

@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.fbs.domain.dto.FbsProjectListDTO;
import com.ruoyi.fbs.domain.vo.FbsProjectDetailVO;
import com.ruoyi.fbs.domain.vo.FbsProjectListCountVO;
import com.ruoyi.fbs.domain.vo.FbsProjectListVO;
import com.ruoyi.zbf.service.IZbfProjectService;
import io.swagger.annotations.Api;
@ -40,7 +41,7 @@ public class AppFbsProjectController extends BaseController {
@ApiOperation("分包商查询自己的项目列表")
@GetMapping("/myList")
public TableDataInfo<FbsProjectListVO> applyList(FbsProjectListDTO dto) {
public TableDataInfo<FbsProjectListVO> myList(FbsProjectListDTO dto) {
if(dto.getType()==0){
return zbfProjectService.applyList(dto);
} else if (dto.getType()==1) {
@ -49,6 +50,11 @@ public class AppFbsProjectController extends BaseController {
return zbfProjectService.completeList(dto);
}
}
@ApiOperation("分包商查询自己的项目列表数量统计")
@GetMapping("/myListCount")
public AjaxResult<FbsProjectListCountVO> myListCount() {
return AjaxResult.success(zbfProjectService.myListCount());
}
@ApiOperation("分包商查看可报名项目详情")
@GetMapping("/signUp/{id}")
@ -71,10 +77,11 @@ public class AppFbsProjectController extends BaseController {
return AjaxResult.success(zbfProjectService.joinOrCompleteDetail(id));
}
@ApiOperation("分包商查询我的项目列表-项目切换")
@GetMapping("/switchList")
public TableDataInfo<FbsProjectListVO> switchList(FbsProjectListDTO dto) {
return zbfProjectService.switchList(dto);
}
//

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/FbsProjectSectionController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSectionController.java
View File

@ -24,11 +24,11 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/app/fbs/section")
public class FbsProjectSectionController extends BaseController {
public class AppFbsProjectSectionController extends BaseController {
private final IZbfProjectSectionService iZbfProjectSectionService;
@ApiOperation("分包商查询自己的项目分包列表")
@ApiOperation("分包商查询自己的项目分包列表-分包切换")
@GetMapping("/fbsSubList")
public TableDataInfo<FbsProjectSectionListVO> fbsSubList(@Validated FbsProjectSectionListDTO dto) {
return iZbfProjectSectionService.fbsSubList(dto);

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectSubcontractingController.java
View File

@ -1,8 +1,11 @@
package com.ruoyi.web.controller.fbs;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.fbs.domain.vo.FbsProjectSubcontractingDetailVO;
import com.ruoyi.zbf.domain.ZbfProjectSubcontracting;
import com.ruoyi.zbf.service.IZbfProjectSectionService;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -28,12 +31,16 @@ import javax.validation.constraints.NotNull;
public class AppFbsProjectSubcontractingController extends BaseController {
private final IZbfProjectSubcontractingService iZbfProjectSubcontractingService;
private final IZbfProjectSectionService zbfProjectSectionService;
@ApiOperation("分包商查询项目分包详细信息")
@GetMapping("/{id}")
public AjaxResult<ZbfProjectSubcontracting> getInfo(@NotNull(message = "主键不能为空")
public AjaxResult<FbsProjectSubcontractingDetailVO> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iZbfProjectSubcontractingService.queryById(id));
ZbfProjectSubcontracting zbfProjectSubcontracting = iZbfProjectSubcontractingService.queryById(id);
FbsProjectSubcontractingDetailVO vo = BeanUtil.copyProperties(zbfProjectSubcontracting, FbsProjectSubcontractingDetailVO.class);
vo.setSectionName(zbfProjectSectionService.getById(vo.getSectionId()).getSectionName());
return AjaxResult.success(vo);
}
}

42
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskApplyController.java Normal file
View File

@ -0,0 +1,42 @@
package com.ruoyi.web.controller.fbs;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.fbs.service.IFbsProjectTaskApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
/**
* 分包商项目任务申请Controller
*
* @author ruoyi
* @date 2025-02-17
*/
@Api(value = "App分包商项目任务申请控制器", tags = {"App分包商"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/app/fbs/apply")
public class AppFbsProjectTaskApplyController extends BaseController {
private final IFbsProjectTaskApplyService iFbsProjectTaskApplyService;
@ApiOperation("分包商选择包工头")
@Log(title = "分包商选择包工头", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping("/{id}")
public AjaxResult<Boolean> choose(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iFbsProjectTaskApplyService.choose(id));
}
}

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskController.java
View File

@ -71,6 +71,11 @@ public class AppFbsProjectTaskController extends BaseController {
public TableDataInfo<FbsProjectTaskListVO> list(@Validated FbsTaskListDTO dto) {
return iFbsProjectTaskService.fbsPageList(dto);
}
@ApiOperation("分包商查询任务列表数量统计")
@GetMapping("/listCount")
public AjaxResult<FbsProjectTaskListCountVO> listCount() {
return AjaxResult.success(iFbsProjectTaskService.fbsListCount());
}
@ApiOperation("分包商查询任务详情-基础信息")
@GetMapping("/base/{id}")

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsProjectTaskProgressController.java
View File

@ -58,8 +58,9 @@ public class AppFbsProjectTaskProgressController extends BaseController {
@RepeatSubmit
@PutMapping()
public AjaxResult<Boolean> edit(@Validated @RequestBody FbsProjectTaskProgressAuditDTO dto) {
BgtProjectTaskProgress bo = BeanUtil.copyProperties(dto, BgtProjectTaskProgress.class);
return AjaxResult.success(iBgtProjectTaskProgressService.update(bo));
BgtProjectTaskProgress bo = iBgtProjectTaskProgressService.getById(dto.getId());
BeanUtil.copyProperties(dto, bo);
return AjaxResult.success(iBgtProjectTaskProgressService.fbsAudit(bo));
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsUserController.java
View File

@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
* @author ruoyi
* @date 2025-03-26
*/
@Api(value = "APP分包商用户控制器", tags = {"APP分包商"})
@Api(value = "App分包商用户控制器", tags = {"App分包商"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/app/fbs/user")
@ -36,7 +36,7 @@ public class AppFbsUserController extends BaseController {
@Log(title = "分包商企业认证", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Boolean> edit(@Validated @RequestBody CompanyAuthenticateDTO dto) {
public AjaxResult<Long> edit(@Validated @RequestBody CompanyAuthenticateDTO dto) {
return AjaxResult.success(iFbsUserService.authenticate(dto));
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fbs/AppFbsWageApplicationController.java
View File

@ -16,7 +16,6 @@ import com.ruoyi.fbs.domain.dto.FbsWageApplicationListDTO;
import com.ruoyi.fbs.domain.dto.FbsWageAuditDTO;
import com.ruoyi.fbs.domain.dto.FbsWageAuditListDTO;
import com.ruoyi.fbs.service.IFbsWageApplicationService;
import com.ruoyi.zbf.service.IZbfProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -40,7 +39,6 @@ public class AppFbsWageApplicationController extends BaseController {
private final IFbsWageApplicationService iFbsWageApplicationService;
private final IBgtWageApplicationService iBgtWageApplicationService;
private final IZbfProjectService iZbfProjectService;
@ApiOperation("分包商查询自己的工资申请列表")
@GetMapping("/list")
@ -87,7 +85,7 @@ public class AppFbsWageApplicationController extends BaseController {
public AjaxResult<Boolean> audit(@Validated @RequestBody FbsWageAuditDTO dto) {
BgtWageApplication bo = iBgtWageApplicationService.getById(dto.getId());
BeanUtil.copyProperties(dto, bo);
return AjaxResult.success(iBgtWageApplicationService.update(bo));
return AjaxResult.success(iBgtWageApplicationService.fbsAudit(bo));
}

57
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectController.java Normal file
View File

@ -0,0 +1,57 @@
package com.ruoyi.web.controller.zbf;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.zbf.domain.dto.ZbfProjectAddDTO;
import com.ruoyi.zbf.domain.dto.ZbfProjectListDTO;
import com.ruoyi.zbf.domain.vo.ZbfProjectCountVO;
import com.ruoyi.zbf.domain.vo.ZbfProjectListVO;
import com.ruoyi.zbf.service.IZbfProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* 总包方项目Controller
*
* @author ruoyi
* @date 2025-02-17
*/
@Api(value = "App总包方项目控制器", tags = {"App总包方"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/app/zbf/project")
public class AppZbfProjectController extends BaseController {
private final IZbfProjectService iZbfProjectService;
@ApiOperation("总包方新增项目")
@Log(title = "总包方新增项目", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Boolean> add(@Validated @RequestBody ZbfProjectAddDTO dto) {
return AjaxResult.success(iZbfProjectService.add(dto));
}
@ApiOperation("总包方查询我的项目列表")
@GetMapping("/list")
public TableDataInfo<ZbfProjectListVO> list(@Validated ZbfProjectListDTO dto) {
return iZbfProjectService.queryZbfList(dto);
}
@ApiOperation("总包方查询自建项目统计")
@GetMapping("/count")
public AjaxResult<ZbfProjectCountVO> projectCount() {
return AjaxResult.success(iZbfProjectService.projectCount());
}
}

45
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/AppZbfProjectSubcontractingApplyController.java Normal file
View File

@ -0,0 +1,45 @@
package com.ruoyi.web.controller.zbf;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.zbf.service.IZbfProjectSubcontractingApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotNull;
/**
* 总包方项目分包申请Controller
*
* @author ruoyi
* @date 2025-03-26
*/
@Api(value = "App总包方项目分包申请控制器", tags = {"App总包方"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/app/zbf/apply")
public class AppZbfProjectSubcontractingApplyController extends BaseController {
private final IZbfProjectSubcontractingApplyService iZbfProjectSubcontractingApplyService;
@ApiOperation("总包方选择分包商")
@Log(title = "总包方选择分包商", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping("/{id}")
public AjaxResult<Void> choose(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return toAjax(iZbfProjectSubcontractingApplyService.choose(id));
}
}

109
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zbf/ZbfUserController.java Normal file
View File

@ -0,0 +1,109 @@
package com.ruoyi.web.controller.zbf;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.ZbfUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.zbf.bo.ZbfUserQueryBo;
import com.ruoyi.zbf.service.IZbfUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
/**
* APP总包方用户Controller
*
* @author ruoyi
* @date 2025-03-31
*/
@Api(value = "总包方用户控制器", tags = {"总包方用户管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/zbf/user")
public class ZbfUserController extends BaseController {
private final IZbfUserService iZbfUserService;
/**
* 查询APP总包方用户列表
*/
@ApiOperation("查询APP总包方用户列表")
@PreAuthorize("@ss.hasPermi('zbf:user:list')")
@GetMapping("/list")
public TableDataInfo<ZbfUser> list(@Validated ZbfUserQueryBo bo) {
return iZbfUserService.queryPageList(bo);
}
/**
* 导出APP总包方用户列表
*/
@ApiOperation("导出APP总包方用户列表")
@PreAuthorize("@ss.hasPermi('zbf:user:export')")
@Log(title = "APP总包方用户", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult<ZbfUser> export(@Validated ZbfUserQueryBo bo) {
List<ZbfUser> list = iZbfUserService.queryList(bo);
ExcelUtil<ZbfUser> util = new ExcelUtil<ZbfUser>(ZbfUser.class);
return util.exportExcel(list, "APP总包方用户");
}
/**
* 获取APP总包方用户详细信息
*/
@ApiOperation("获取APP总包方用户详细信息")
@PreAuthorize("@ss.hasPermi('zbf:user:query')")
@GetMapping("/{id}")
public AjaxResult<ZbfUser> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iZbfUserService.queryById(id));
}
/**
* 新增APP总包方用户
*/
@ApiOperation("新增APP总包方用户")
@PreAuthorize("@ss.hasPermi('zbf:user:add')")
@Log(title = "APP总包方用户", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping()
public AjaxResult<Void> add(@Validated @RequestBody ZbfUser bo) {
return toAjax(iZbfUserService.insert(bo) ? 1 : 0);
}
/**
* 修改APP总包方用户
*/
@ApiOperation("修改APP总包方用户")
@PreAuthorize("@ss.hasPermi('zbf:user:edit')")
@Log(title = "APP总包方用户", businessType = BusinessType.UPDATE)
@RepeatSubmit
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody ZbfUser bo) {
return toAjax(iZbfUserService.update(bo) ? 1 : 0);
}
/**
* 删除APP总包方用户
*/
@ApiOperation("删除APP总包方用户")
@PreAuthorize("@ss.hasPermi('zbf:user:remove')")
@Log(title = "APP总包方用户" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iZbfUserService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}