diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c4cae05..1fbd240 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,25 +2,175 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -114,10 +264,10 @@ + - @@ -814,13 +964,85 @@ - - - 1664517688369 - 1665485232564 @@ -1158,7 +1380,14 @@ - @@ -1189,7 +1418,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/src/main/java/com/subsidy/controller/AcademyCollegeDictController.java b/src/main/java/com/subsidy/controller/AcademyCollegeDictController.java new file mode 100644 index 0000000..98db4d3 --- /dev/null +++ b/src/main/java/com/subsidy/controller/AcademyCollegeDictController.java @@ -0,0 +1,57 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.model.AcademyCollegeDictDO; +import com.subsidy.service.AcademyCollegeDictService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 学院字典表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +@RestController +@Api(tags = "学院字典表") +@RequestMapping("/academyCollegeDict") +public class AcademyCollegeDictController { + + @Autowired + private AcademyCollegeDictService academyCollegeDictService; + + @PostMapping("allCollege") + @ApiOperation("查看某院校所有学院 academyId college") + public ResponseVO allCollege(@RequestBody AcademyCollegeDictDO academyCollegeDictDO){ + return ResponseData.generateCreatedResponse(0,academyCollegeDictService.allCollege(academyCollegeDictDO)); + } + + @PostMapping("addCollege") + @ApiOperation("添加院校 academyId college") + public ResponseVO addCollege(@RequestBody AcademyCollegeDictDO academyCollegeDictDO){ + return ResponseData.generateCreatedResponse(0,academyCollegeDictService.addCollege(academyCollegeDictDO)); + } + + @PostMapping("updateCollege") + @ApiOperation("添加学院 id college") + public ResponseVO updateCollege(@RequestBody AcademyCollegeDictDO academyCollegeDictDO){ + return ResponseData.generateCreatedResponse(0,academyCollegeDictService.updateCollege(academyCollegeDictDO)); + } + + @PostMapping("deleteCollege") + @ApiOperation("删除学院 id 学院id ") + public ResponseVO deleteCollege(@RequestBody AcademyCollegeDictDO academyCollegeDictDO){ + return ResponseData.generateCreatedResponse(0,academyCollegeDictService.deleteCollege(academyCollegeDictDO)); + } + +} diff --git a/src/main/java/com/subsidy/controller/AcademyDictController.java b/src/main/java/com/subsidy/controller/AcademyDictController.java new file mode 100644 index 0000000..731ec2c --- /dev/null +++ b/src/main/java/com/subsidy/controller/AcademyDictController.java @@ -0,0 +1,87 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.dto.academy.AcademiesDTO; +import com.subsidy.dto.academy.AcademyAccountDTO; +import com.subsidy.dto.academy.AddAcademyAccountDTO; +import com.subsidy.dto.academy.AddAcademyDTO; +import com.subsidy.model.AcademyDictDO; +import com.subsidy.model.AdministerDO; +import com.subsidy.service.AcademyDictService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 院校字典表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +@RestController +@Api(tags = "院校字典表") +@RequestMapping("/academyDict") +public class AcademyDictController { + + @Autowired + private AcademyDictService academyDictService; + + @PostMapping("/academies") + @ApiOperation("院校管理 academyName pageNum pageSize") + public ResponseVO academies(@RequestBody AcademiesDTO academiesDTO){ + return ResponseData.generateCreatedResponse(0,academyDictService.academies(academiesDTO)); + } + + @PostMapping("addAcademy") + @ApiOperation("添加院校 accountName academyName shortName location academyType telephone userName") + public ResponseVO addAcademy(@RequestBody AddAcademyDTO addAcademyDTO){ + return ResponseData.generateCreatedResponse(0,academyDictService.addAcademy(addAcademyDTO)); + } + + @PostMapping("deleteAcademy") + @ApiOperation("删除院校 id ") + public ResponseVO deleteAcademy(@RequestBody AcademyDictDO academyDictDO){ + return ResponseData.generateCreatedResponse(0,academyDictService.deleteAcademy(academyDictDO)); + } + + @PostMapping("updateAcademy") + @ApiOperation("修改院校 id academyName shortName location academyType accountName telephone userName password") + public ResponseVO updateAcademy(@RequestBody AddAcademyDTO addAcademyDTO){ + return ResponseData.generateCreatedResponse(0,academyDictService.updateAcademy(addAcademyDTO)); + } + + @PostMapping("academyAccount") + @ApiOperation("院校账户管理 pageSize pageNum academyName") + public ResponseVO academyAccount(@RequestBody AcademyAccountDTO academyAccountDTO){ + return ResponseData.generateCreatedResponse(0,academyDictService.academyAccount(academyAccountDTO)); + } + + @PostMapping("addAcademyAccount") + @ApiOperation("添加院校账户 academyIds[] telephone accountName userName password remark ") + public ResponseVO addAcademyAccount(@RequestBody AddAcademyAccountDTO addAcademyAccountDTO){ + return ResponseData.generateCreatedResponse(0,academyDictService.addAcademyAccount(addAcademyAccountDTO)); + } + + @PostMapping("deleteAcademyAccount") + @ApiOperation("删除院校账户 id ") + public ResponseVO deleteAcademyAccount(@RequestBody AdministerDO administerDO){ + return ResponseData.generateCreatedResponse(0,academyDictService.deleteAcademyAccount(administerDO)); + } + + @PostMapping("updateAcademyAccount") + @ApiOperation("编辑院校账户 id academyIds[] telephone accountName userName password ") + public ResponseVO updateAcademyAccount(@RequestBody AddAcademyAccountDTO addAcademyAccountDTO){ + return ResponseData.generateCreatedResponse(0,academyDictService.updateAcademyAccount(addAcademyAccountDTO)); + } + + +} diff --git a/src/main/java/com/subsidy/controller/AcademyMajorDictController.java b/src/main/java/com/subsidy/controller/AcademyMajorDictController.java new file mode 100644 index 0000000..8673587 --- /dev/null +++ b/src/main/java/com/subsidy/controller/AcademyMajorDictController.java @@ -0,0 +1,60 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.model.AcademyMajorDictDO; +import com.subsidy.service.AcademyMajorDictService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 专业字典表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +@RestController +@Api(tags = "专业字典表") +@RequestMapping("/academyMajorDict") +public class AcademyMajorDictController { + + + @Autowired + private AcademyMajorDictService academyMajorDictService; + + @PostMapping("majors") + @ApiOperation("查看某个学院下的所有专业 collegeId major") + public ResponseVO majors(@RequestBody AcademyMajorDictDO academyMajorDictDO){ + return ResponseData.generateCreatedResponse(0,academyMajorDictService.majors(academyMajorDictDO)); + } + + @PostMapping("addMajor") + @ApiOperation("查看某个学院下的所有专业 collegeId major") + public ResponseVO addMajor(@RequestBody AcademyMajorDictDO academyMajorDictDO){ + return ResponseData.generateCreatedResponse(0,academyMajorDictService.addMajor(academyMajorDictDO)); + } + + @PostMapping("updateMajor") + @ApiOperation("查看某个学院下的所有专业 id collegeId major") + public ResponseVO updateMajor(@RequestBody AcademyMajorDictDO academyMajorDictDO){ + return ResponseData.generateCreatedResponse(0,academyMajorDictService.updateMajor(academyMajorDictDO)); + } + + + @PostMapping("deleteMajor") + @ApiOperation("查看某个学院下的所有专业 id ") + public ResponseVO deleteMajor(@RequestBody AcademyMajorDictDO academyMajorDictDO){ + return ResponseData.generateCreatedResponse(0,academyMajorDictService.deleteMajor(academyMajorDictDO)); + } + + +} diff --git a/src/main/java/com/subsidy/controller/AdministerAcademyMappingController.java b/src/main/java/com/subsidy/controller/AdministerAcademyMappingController.java new file mode 100644 index 0000000..62f8696 --- /dev/null +++ b/src/main/java/com/subsidy/controller/AdministerAcademyMappingController.java @@ -0,0 +1,22 @@ +package com.subsidy.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 管理员-院校映射表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +@RestController +@Api(tags = "管理员-院校映射表") +@RequestMapping("/administer-academy-mapping-do") +public class AdministerAcademyMappingController { + +} diff --git a/src/main/java/com/subsidy/controller/AdministerLaborMappingController.java b/src/main/java/com/subsidy/controller/AdministerLaborMappingController.java new file mode 100644 index 0000000..8c26617 --- /dev/null +++ b/src/main/java/com/subsidy/controller/AdministerLaborMappingController.java @@ -0,0 +1,22 @@ +package com.subsidy.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 管理员-伙伴映射表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +@RestController +@Api(tags = "管理员-伙伴映射表") +@RequestMapping("/administer-labor-mapping-do") +public class AdministerLaborMappingController { + +} diff --git a/src/main/java/com/subsidy/controller/CompanyDictController.java b/src/main/java/com/subsidy/controller/CompanyDictController.java index 4229d43..770474e 100644 --- a/src/main/java/com/subsidy/controller/CompanyDictController.java +++ b/src/main/java/com/subsidy/controller/CompanyDictController.java @@ -36,7 +36,7 @@ public class CompanyDictController { @PostMapping("/administers") @ApiOperation("查询所有企业 {id companyName fieldId 行业id superviseName 监管第三方名称 pageNum pageSize }") - @LoginRequired +// @LoginRequired public ResponseVO operators(@RequestBody OperatorsDTO operatorsDTO){ return ResponseData.generateCreatedResponse(0,companyDictService.operators(operatorsDTO)); } @@ -66,7 +66,7 @@ public class CompanyDictController { @PostMapping("getCompanyMembers") @ApiOperation("获取公司里的成员 pageNum pageSize companyId 公司id userName 成员名称 memberStatus") -// @LoginRequired + @LoginRequired public ResponseVO getCompanyMembers(@RequestBody GetCompanyMembersDTO getCompanyMembersDTO){ return ResponseData.generateCreatedResponse(0,companyDictService.getCompanyMembers(getCompanyMembersDTO)); } diff --git a/src/main/java/com/subsidy/controller/LaborGroupDictController.java b/src/main/java/com/subsidy/controller/LaborGroupDictController.java new file mode 100644 index 0000000..9032854 --- /dev/null +++ b/src/main/java/com/subsidy/controller/LaborGroupDictController.java @@ -0,0 +1,22 @@ +package com.subsidy.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 伙伴群组字典表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +@RestController +@Api(tags = "伙伴群组字典表") +@RequestMapping("/labor-group-dict-do") +public class LaborGroupDictController { + +} diff --git a/src/main/java/com/subsidy/controller/LaborServiceDictController.java b/src/main/java/com/subsidy/controller/LaborServiceDictController.java new file mode 100644 index 0000000..9677a7a --- /dev/null +++ b/src/main/java/com/subsidy/controller/LaborServiceDictController.java @@ -0,0 +1,102 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.dto.academy.AddAcademyAccountDTO; +import com.subsidy.dto.labor.*; +import com.subsidy.model.AdministerDO; +import com.subsidy.model.LaborServiceDictDO; +import com.subsidy.model.ProjectMemberMappingDO; +import com.subsidy.service.LaborServiceDictService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 劳务公司字典表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +@RestController +@Api(tags = "劳务公司字典表") +@RequestMapping("/laborServiceDict") +public class LaborServiceDictController { + + @Autowired + private LaborServiceDictService laborServiceDictService; + + @PostMapping("labors") + @ApiOperation("伙伴管理 laborServiceName pageSize pageNum") + public ResponseVO labors(@RequestBody LaborsDTO laborsDTO){ + return ResponseData.generateCreatedResponse(0,laborServiceDictService.labors(laborsDTO)); + } + + @PostMapping("addLabor") + @ApiOperation("添加劳务 shortName location laborServiceName serviceCode accountName ") + public ResponseVO addLabor(@RequestBody AddLaborDTO addLaborDTO){ + laborServiceDictService.addLabor(addLaborDTO); + return ResponseData.generateCreatedResponse(0); + } + + @PostMapping("deleteLabor") + @ApiOperation("删除劳务 id 劳务id") + public ResponseVO deleteLabor(@RequestBody LaborServiceDictDO laborServiceDictDO){ + laborServiceDictService.deleteLabor(laborServiceDictDO); + return ResponseData.generateCreatedResponse(0); + } + + @PostMapping("updateLabor") + @ApiOperation("编辑劳务 id 劳务id shortName location laborServiceName serviceCode accountName password") + public ResponseVO updateLabor(@RequestBody AddLaborDTO addLaborDTO){ + laborServiceDictService.updateLabor(addLaborDTO); + return ResponseData.generateCreatedResponse(0); + } + + @PostMapping("laborAccount") + @ApiOperation("伙伴账户 pageSize pageNum laborServiceName") + public ResponseVO laborAccount(@RequestBody LaborAccountDTO laborAccountDTO){ + return ResponseData.generateCreatedResponse(0,laborServiceDictService.laborAccount(laborAccountDTO)); + } + + @PostMapping("addLaborAccount") + @ApiOperation("添加劳务账户 laborIds[] telephone accountName userName password remark ") + public ResponseVO addLaborAccount(@RequestBody AddLaborAccountDTO addLaborAccountDTO){ + return ResponseData.generateCreatedResponse(0,laborServiceDictService.addLaborAccount(addLaborAccountDTO)); + } + + @PostMapping("deleteLaborAccount") + @ApiOperation("删除劳务账户 id ") + public ResponseVO deleteLaborAccount(@RequestBody AdministerDO administerDO){ + return ResponseData.generateCreatedResponse(0,laborServiceDictService.deleteLaborAccount(administerDO)); + } + + @PostMapping("updateLaborAccount") + @ApiOperation("编辑劳务账户 id laborIds[] telephone accountName userName password ") + public ResponseVO updateLaborAccount(@RequestBody AddLaborAccountDTO addLaborAccountDTO){ + return ResponseData.generateCreatedResponse(0,laborServiceDictService.updateLaborAccount (addLaborAccountDTO)); + } + + @PostMapping("talentManagement") + @ApiOperation("用户管理--人才管理 laborId userName pageSize pageNum") + public ResponseVO talentManagement(@RequestBody TalentManagementDTO talentManagementDTO){ + return ResponseData.generateCreatedResponse(0,laborServiceDictService.talentManagement(talentManagementDTO)); + } + + @PostMapping("detail") + @ApiOperation("花名册--详情 memberId 人才id") + public ResponseVO detail(@RequestBody ProjectMemberMappingDO projectMemberMappingDO){ + return ResponseData.generateCreatedResponse(0, laborServiceDictService.detail(projectMemberMappingDO)); + } + + + +} diff --git a/src/main/java/com/subsidy/controller/MemberController.java b/src/main/java/com/subsidy/controller/MemberController.java index 385cda9..9079e33 100644 --- a/src/main/java/com/subsidy/controller/MemberController.java +++ b/src/main/java/com/subsidy/controller/MemberController.java @@ -1,6 +1,15 @@ package com.subsidy.controller; +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.dto.member.AcademyMembersDTO; +import com.subsidy.model.MemberDO; +import com.subsidy.service.MemberService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,7 +25,18 @@ import io.swagger.annotations.Api; */ @RestController @Api(tags = "学生表") -@RequestMapping("/member-do") +@RequestMapping("/member") public class MemberController { + @Autowired + private MemberService memberService; + + @PostMapping("academyMembers") + @ApiOperation("用户管理-学生管理 academyId practiceStatus userName") + public ResponseVO academyMembers(@RequestBody AcademyMembersDTO academyMembersDTO){ + return ResponseData.generateCreatedResponse(0,memberService.academyMembers(academyMembersDTO)); + } + + + } diff --git a/src/main/java/com/subsidy/controller/ProductDictController.java b/src/main/java/com/subsidy/controller/ProductDictController.java index 7184d39..cc68925 100644 --- a/src/main/java/com/subsidy/controller/ProductDictController.java +++ b/src/main/java/com/subsidy/controller/ProductDictController.java @@ -4,6 +4,7 @@ package com.subsidy.controller; import com.subsidy.common.ResponseData; import com.subsidy.common.ResponseVO; import com.subsidy.dto.product.AllProductsDTO; +import com.subsidy.dto.product.ChangeOrderDTO; import com.subsidy.model.ProductDictDO; import com.subsidy.service.ProductDictService; import io.swagger.annotations.ApiOperation; @@ -33,7 +34,7 @@ public class ProductDictController { private ProductDictService productDictService; @PostMapping("allProducts") - @ApiOperation("查看所有产品 productName pageSize pageNum") + @ApiOperation("查看所有产品 productName pageSize pageNum productType 0：企业产品 1：院校产品 2:伙伴产品") public ResponseVO allProducts(@RequestBody AllProductsDTO allProductsDTO){ return ResponseData.generateCreatedResponse(0,productDictService.allProducts(allProductsDTO)); } @@ -56,5 +57,16 @@ public class ProductDictController { return ResponseData.generateCreatedResponse(0,productDictService.updateProduct(productDictDO)); } + @PostMapping("changeOrder") + @ApiOperation("排序 productDictDOS [id]") + public ResponseVO changeOrder(@RequestBody ChangeOrderDTO changeOrderDTO){ + return ResponseData.generateCreatedResponse(0,productDictService.changeOrder(changeOrderDTO)); + } + + @PostMapping("frontPage") + @ApiOperation("首页展示产品 productType 0：企业产品 1：院校产品 ") + public ResponseVO frontPage(@RequestBody ProductDictDO productDictDO){ + return ResponseData.generateCreatedResponse(0,productDictService.frontPage(productDictDO)); + } } diff --git a/src/main/java/com/subsidy/controller/ProjectMemberMappingController.java b/src/main/java/com/subsidy/controller/ProjectMemberMappingController.java new file mode 100644 index 0000000..ca832ee --- /dev/null +++ b/src/main/java/com/subsidy/controller/ProjectMemberMappingController.java @@ -0,0 +1,22 @@ +package com.subsidy.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 项目人员映射表 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +@RestController +@Api(tags = "项目人员映射表") +@RequestMapping("/project-member-mapping-do") +public class ProjectMemberMappingController { + +} diff --git a/src/main/java/com/subsidy/controller/ServiceCompanyFilesController.java b/src/main/java/com/subsidy/controller/ServiceCompanyFilesController.java index b22fbab..97b9e94 100644 --- a/src/main/java/com/subsidy/controller/ServiceCompanyFilesController.java +++ b/src/main/java/com/subsidy/controller/ServiceCompanyFilesController.java @@ -35,7 +35,7 @@ public class ServiceCompanyFilesController { private ServiceCompanyFilesService serviceCompanyFilesService; @PostMapping("companyFiles") - @ApiOperation("查看业务合同/业务材料 pageSize pageNum fileName serviceCompanyId fileType 0：业务合同 1：业务材料 ") + @ApiOperation("查看业务合同/业务材料 pageSize pageNum fileName treeId ") public ResponseVO companyFiles(@RequestBody CompanyFilesDTO companyFilesDTO){ return ResponseData.generateCreatedResponse(0,serviceCompanyFilesService.companyFiles(companyFilesDTO)); } @@ -47,7 +47,7 @@ public class ServiceCompanyFilesController { } @PostMapping("uploadFile") - @ApiOperation("上传新文件 serviceCompanyId fileType 0：业务合同 1：业务材料 fileName fileAddress ") + @ApiOperation("上传新文件 treeId fileName fileAddress ") public ResponseVO uploadFile(@RequestBody ServiceCompanyFilesDO serviceCompanyFilesDO){ return ResponseData.generateCreatedResponse(0,serviceCompanyFilesService.uploadFile(serviceCompanyFilesDO)); } diff --git a/src/main/java/com/subsidy/controller/ServiceFileTreeController.java b/src/main/java/com/subsidy/controller/ServiceFileTreeController.java new file mode 100644 index 0000000..5e7df12 --- /dev/null +++ b/src/main/java/com/subsidy/controller/ServiceFileTreeController.java @@ -0,0 +1,57 @@ +package com.subsidy.controller; + + +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.model.ServiceFileTreeDO; +import com.subsidy.service.ServiceFileTreeService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; + +/** + *

+ * 前端控制器 + *

+ * + * @author Tuyp + * @since 2024-04-08 + */ +@RestController +@Api(tags = "文件目录树") +@RequestMapping("/serviceFileTree") +public class ServiceFileTreeController { + + @Autowired + private ServiceFileTreeService serviceFileTreeService; + + @PostMapping("trees") + @ApiOperation("##2024.4##查看某公司的目录树 companyId serviceId") + public ResponseVO trees(@RequestBody ServiceFileTreeDO serviceFileTreeDO){ + return ResponseData.generateCreatedResponse(0,serviceFileTreeService.trees(serviceFileTreeDO)); + } + + @PostMapping("addTree") + @ApiOperation("##2024.4##添加树节点 companyId serviceId parentId treeName") + public ResponseVO addTree(@RequestBody ServiceFileTreeDO serviceFileTreeDO){ + return ResponseData.generateCreatedResponse(0,serviceFileTreeService.addTree(serviceFileTreeDO)); + } + + @PostMapping("updateTree") + @ApiOperation("##2024.4##修改树节点 id treeName") + public ResponseVO updateTree(@RequestBody ServiceFileTreeDO serviceFileTreeDO){ + return ResponseData.generateCreatedResponse(0,serviceFileTreeService.updateTree(serviceFileTreeDO)); + } + + @PostMapping("deleteTree") + @ApiOperation("##2024.4##删除树节点 id ") + public ResponseVO deleteTree(@RequestBody ServiceFileTreeDO serviceFileTreeDO){ + return ResponseData.generateCreatedResponse(0,serviceFileTreeService.deleteTree(serviceFileTreeDO)); + } + +} diff --git a/src/main/java/com/subsidy/dto/academy/AcademiesDTO.java b/src/main/java/com/subsidy/dto/academy/AcademiesDTO.java new file mode 100644 index 0000000..46386e4 --- /dev/null +++ b/src/main/java/com/subsidy/dto/academy/AcademiesDTO.java @@ -0,0 +1,14 @@ +package com.subsidy.dto.academy; + +import lombok.Data; + +@Data +public class AcademiesDTO { + + private String academyName; + + private Integer pageSize; + + private Integer pageNum; + +} diff --git a/src/main/java/com/subsidy/dto/academy/AcademyAccountDTO.java b/src/main/java/com/subsidy/dto/academy/AcademyAccountDTO.java new file mode 100644 index 0000000..188dd5e --- /dev/null +++ b/src/main/java/com/subsidy/dto/academy/AcademyAccountDTO.java @@ -0,0 +1,13 @@ +package com.subsidy.dto.academy; + +import lombok.Data; + +@Data +public class AcademyAccountDTO { + + private Integer pageSize; + + private Integer pageNum; + + private String academyName; +} diff --git a/src/main/java/com/subsidy/dto/academy/AddAcademyAccountDTO.java b/src/main/java/com/subsidy/dto/academy/AddAcademyAccountDTO.java new file mode 100644 index 0000000..0b9046f --- /dev/null +++ b/src/main/java/com/subsidy/dto/academy/AddAcademyAccountDTO.java @@ -0,0 +1,13 @@ +package com.subsidy.dto.academy; + +import com.subsidy.model.AdministerDO; +import lombok.Data; + +import java.util.List; + +@Data +public class AddAcademyAccountDTO extends AdministerDO { + + private List academyIds; + +} diff --git a/src/main/java/com/subsidy/dto/academy/AddAcademyDTO.java b/src/main/java/com/subsidy/dto/academy/AddAcademyDTO.java new file mode 100644 index 0000000..8e68ab5 --- /dev/null +++ b/src/main/java/com/subsidy/dto/academy/AddAcademyDTO.java @@ -0,0 +1,16 @@ +package com.subsidy.dto.academy; + +import com.subsidy.model.AcademyDictDO; +import lombok.Data; + +@Data +public class AddAcademyDTO extends AcademyDictDO { + + private String accountName; + + private String telephone; + + private String userName; + + private String password; +} diff --git a/src/main/java/com/subsidy/dto/company/CompanyFilesDTO.java b/src/main/java/com/subsidy/dto/company/CompanyFilesDTO.java index bfbad67..b08c3ac 100644 --- a/src/main/java/com/subsidy/dto/company/CompanyFilesDTO.java +++ b/src/main/java/com/subsidy/dto/company/CompanyFilesDTO.java @@ -11,8 +11,8 @@ public class CompanyFilesDTO { private String fileName; - private Long serviceCompanyId; + private Long treeId; - private Integer fileType; + private Long serviceCompanyId; } diff --git a/src/main/java/com/subsidy/dto/labor/AddLaborAccountDTO.java b/src/main/java/com/subsidy/dto/labor/AddLaborAccountDTO.java new file mode 100644 index 0000000..8c31d91 --- /dev/null +++ b/src/main/java/com/subsidy/dto/labor/AddLaborAccountDTO.java @@ -0,0 +1,14 @@ +package com.subsidy.dto.labor; + +import com.subsidy.model.AdministerDO; +import lombok.Data; + +import java.util.List; + +@Data +public class AddLaborAccountDTO extends AdministerDO { + + private List laborIds; + + +} diff --git a/src/main/java/com/subsidy/dto/labor/AddLaborDTO.java b/src/main/java/com/subsidy/dto/labor/AddLaborDTO.java new file mode 100644 index 0000000..1eb4956 --- /dev/null +++ b/src/main/java/com/subsidy/dto/labor/AddLaborDTO.java @@ -0,0 +1,22 @@ +package com.subsidy.dto.labor; + +import lombok.Data; + +@Data +public class AddLaborDTO { + + private Long id; + + private String shortName; + + private String location; + + private String laborServiceName; + + private String serviceCode; + + private String accountName; + + private String password; + +} diff --git a/src/main/java/com/subsidy/dto/labor/LaborAccountDTO.java b/src/main/java/com/subsidy/dto/labor/LaborAccountDTO.java new file mode 100644 index 0000000..a7df01f --- /dev/null +++ b/src/main/java/com/subsidy/dto/labor/LaborAccountDTO.java @@ -0,0 +1,15 @@ +package com.subsidy.dto.labor; + + +import lombok.Data; + +@Data +public class LaborAccountDTO { + + private Integer pageSize; + + private Integer pageNum; + + private String laborServiceName; + +} diff --git a/src/main/java/com/subsidy/dto/labor/LaborsDTO.java b/src/main/java/com/subsidy/dto/labor/LaborsDTO.java new file mode 100644 index 0000000..de038b1 --- /dev/null +++ b/src/main/java/com/subsidy/dto/labor/LaborsDTO.java @@ -0,0 +1,14 @@ +package com.subsidy.dto.labor; + +import lombok.Data; + +@Data +public class LaborsDTO { + + private Integer pageSize; + + private Integer pageNum; + + private String laborServiceName; + +} diff --git a/src/main/java/com/subsidy/dto/labor/TalentManagementDTO.java b/src/main/java/com/subsidy/dto/labor/TalentManagementDTO.java new file mode 100644 index 0000000..50aaac5 --- /dev/null +++ b/src/main/java/com/subsidy/dto/labor/TalentManagementDTO.java @@ -0,0 +1,16 @@ +package com.subsidy.dto.labor; + +import lombok.Data; + +@Data +public class TalentManagementDTO { + + private Integer pageSize; + + private Integer pageNum; + + private String userName; + + private Long laborId; + +} diff --git a/src/main/java/com/subsidy/dto/member/AcademyMembersDTO.java b/src/main/java/com/subsidy/dto/member/AcademyMembersDTO.java new file mode 100644 index 0000000..228794a --- /dev/null +++ b/src/main/java/com/subsidy/dto/member/AcademyMembersDTO.java @@ -0,0 +1,18 @@ +package com.subsidy.dto.member; + +import lombok.Data; + +@Data +public class AcademyMembersDTO { + + private Integer pageNum; + + private Integer pageSize; + + private Long academyId; + + private String userName; + + private String practiceStatus; + +} diff --git a/src/main/java/com/subsidy/dto/product/AllProductsDTO.java b/src/main/java/com/subsidy/dto/product/AllProductsDTO.java index 5c97b51..06d3da9 100644 --- a/src/main/java/com/subsidy/dto/product/AllProductsDTO.java +++ b/src/main/java/com/subsidy/dto/product/AllProductsDTO.java @@ -11,4 +11,6 @@ public class AllProductsDTO { private String productName; + private Integer productType; + } diff --git a/src/main/java/com/subsidy/dto/product/ChangeOrderDTO.java b/src/main/java/com/subsidy/dto/product/ChangeOrderDTO.java new file mode 100644 index 0000000..7a04997 --- /dev/null +++ b/src/main/java/com/subsidy/dto/product/ChangeOrderDTO.java @@ -0,0 +1,13 @@ +package com.subsidy.dto.product; + +import com.subsidy.model.ProductDictDO; +import lombok.Data; + +import java.util.List; + +@Data +public class ChangeOrderDTO { + + private List productDictDOS; + +} diff --git a/src/main/java/com/subsidy/mapper/AcademyCollegeDictMapper.java b/src/main/java/com/subsidy/mapper/AcademyCollegeDictMapper.java new file mode 100644 index 0000000..e600e43 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/AcademyCollegeDictMapper.java @@ -0,0 +1,23 @@ +package com.subsidy.mapper; + +import com.subsidy.model.AcademyCollegeDictDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 学院字典表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +@Repository +public interface AcademyCollegeDictMapper extends BaseMapper { + + List allCollege(Long academyId, String college); + + +} diff --git a/src/main/java/com/subsidy/mapper/AcademyDictMapper.java b/src/main/java/com/subsidy/mapper/AcademyDictMapper.java new file mode 100644 index 0000000..18bd4d8 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/AcademyDictMapper.java @@ -0,0 +1,49 @@ +package com.subsidy.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.model.AcademyDictDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.model.AdministerDO; +import com.subsidy.vo.academy.AcademiesVO; +import com.subsidy.vo.academy.AcademyAccountVO; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 院校字典表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +@Repository +public interface AcademyDictMapper extends BaseMapper { + + /** + * 查看所有院校 + */ + IPage academies(IPage iPage, String academyName); + + /** + * 查看院校账号 + */ + IPage academyAccount(IPage iPage, String academyName); + + /** + * 查看账户关联的院校 + */ + List accountAcademies(Long administerId); + + /** + * 查看账户关联的院校 返回id + */ + List accountAcademyIds(Long administerId); + + /** + * 查看院校主账号 + */ + AdministerDO mainAccount(Long academyId); + +} diff --git a/src/main/java/com/subsidy/mapper/AcademyMajorDictMapper.java b/src/main/java/com/subsidy/mapper/AcademyMajorDictMapper.java new file mode 100644 index 0000000..f829e74 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/AcademyMajorDictMapper.java @@ -0,0 +1,22 @@ +package com.subsidy.mapper; + +import com.subsidy.model.AcademyMajorDictDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 专业字典表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +@Repository +public interface AcademyMajorDictMapper extends BaseMapper { + + List majors(Long collegeId, String major); + +} diff --git a/src/main/java/com/subsidy/mapper/AdministerAcademyMappingMapper.java b/src/main/java/com/subsidy/mapper/AdministerAcademyMappingMapper.java new file mode 100644 index 0000000..50012b5 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/AdministerAcademyMappingMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.AdministerAcademyMappingDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 管理员-院校映射表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ + @Repository +public interface AdministerAcademyMappingMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/mapper/AdministerLaborMappingMapper.java b/src/main/java/com/subsidy/mapper/AdministerLaborMappingMapper.java new file mode 100644 index 0000000..5d46716 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/AdministerLaborMappingMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.AdministerLaborMappingDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 管理员-伙伴映射表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ + @Repository +public interface AdministerLaborMappingMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/mapper/AdministerMapper.java b/src/main/java/com/subsidy/mapper/AdministerMapper.java index 894dbed..8de6ae8 100644 --- a/src/main/java/com/subsidy/mapper/AdministerMapper.java +++ b/src/main/java/com/subsidy/mapper/AdministerMapper.java @@ -36,8 +36,6 @@ public interface AdministerMapper extends BaseMapper { */ IPage clientOperators(IPage page, String userName, String companyName); - - /** * 查看某客户账号管理哪些公司 */ @@ -53,6 +51,12 @@ public interface AdministerMapper extends BaseMapper { */ List administerServiceIds(Long administerId); - List getPermissions(Long id); + + /** + * 查看企业的唯一账号id + */ + AdministerDO uniqueAdminister(Long companyId); + + } diff --git a/src/main/java/com/subsidy/mapper/LaborGroupDictMapper.java b/src/main/java/com/subsidy/mapper/LaborGroupDictMapper.java new file mode 100644 index 0000000..e378f58 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/LaborGroupDictMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.LaborGroupDictDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 伙伴群组字典表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ + @Repository +public interface LaborGroupDictMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java b/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java new file mode 100644 index 0000000..a87a5f6 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/LaborServiceDictMapper.java @@ -0,0 +1,46 @@ +package com.subsidy.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.model.LaborServiceDictDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.vo.labor.LaborAccountVO; +import com.subsidy.vo.labor.LaborsVO; +import com.subsidy.vo.labor.TalentManagementVO; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 劳务公司字典表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +@Repository +public interface LaborServiceDictMapper extends BaseMapper { + + IPage labors(IPage iPage, String laborServiceName); + + /** + * 查看伙伴账户 + */ + IPage laborAccount(IPage iPage, String accountName); + + /** + * 某个账户关联多少个伙伴 + */ + List relateLabors(Long administerId); + + /** + * 查看账号下关联的伙伴ids + */ + List accountLabors(Long administerId); + + /** + * 人才管理 + */ + IPage talentManagement(IPage iPage,Long laborId,String userName); + +} diff --git a/src/main/java/com/subsidy/mapper/MemberMapper.java b/src/main/java/com/subsidy/mapper/MemberMapper.java index 425e2b6..2c75711 100644 --- a/src/main/java/com/subsidy/mapper/MemberMapper.java +++ b/src/main/java/com/subsidy/mapper/MemberMapper.java @@ -1,9 +1,13 @@ package com.subsidy.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.subsidy.model.MemberDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.vo.member.AcademyMembersVO; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* 学生表 Mapper 接口 @@ -12,7 +16,9 @@ import org.springframework.stereotype.Repository; * @author Tuyp * @since 2024-01-11 */ - @Repository +@Repository public interface MemberMapper extends BaseMapper { + IPage academyMembers(IPage iPage, String userName, String practiceStatus, Long academyId); + } diff --git a/src/main/java/com/subsidy/mapper/ProductDictMapper.java b/src/main/java/com/subsidy/mapper/ProductDictMapper.java index b7cd66a..1ff9f9e 100644 --- a/src/main/java/com/subsidy/mapper/ProductDictMapper.java +++ b/src/main/java/com/subsidy/mapper/ProductDictMapper.java @@ -16,7 +16,8 @@ import org.springframework.stereotype.Repository; @Repository public interface ProductDictMapper extends BaseMapper { - IPage allProducts(IPage iPage, String productName); + IPage allProducts(IPage iPage, String productName,Integer productType); + void updateOrderNo(Long id,Integer orderNo); } diff --git a/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java b/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java new file mode 100644 index 0000000..b02112e --- /dev/null +++ b/src/main/java/com/subsidy/mapper/ProjectMemberMappingMapper.java @@ -0,0 +1,27 @@ +package com.subsidy.mapper; + +import com.subsidy.model.ProjectMemberMappingDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.subsidy.vo.member.DetailVO; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * 项目人员映射表 Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +@Repository +public interface ProjectMemberMappingMapper extends BaseMapper { + + /** + * 查看某个人的入职记录 + */ + List detail(Long memberId); + + +} diff --git a/src/main/java/com/subsidy/mapper/ServiceCompanyFilesMapper.java b/src/main/java/com/subsidy/mapper/ServiceCompanyFilesMapper.java index 1e2cda3..c2e526f 100644 --- a/src/main/java/com/subsidy/mapper/ServiceCompanyFilesMapper.java +++ b/src/main/java/com/subsidy/mapper/ServiceCompanyFilesMapper.java @@ -18,7 +18,7 @@ import java.util.List; @Repository public interface ServiceCompanyFilesMapper extends BaseMapper { - IPage companyFiles(IPage page,Integer fileType,Long serviceCompanyId, String fileName); + IPage companyFiles(IPage page,List treeIds, String fileName); } diff --git a/src/main/java/com/subsidy/mapper/ServiceFileTreeMapper.java b/src/main/java/com/subsidy/mapper/ServiceFileTreeMapper.java new file mode 100644 index 0000000..6ba7ca9 --- /dev/null +++ b/src/main/java/com/subsidy/mapper/ServiceFileTreeMapper.java @@ -0,0 +1,18 @@ +package com.subsidy.mapper; + +import com.subsidy.model.ServiceFileTreeDO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Tuyp + * @since 2024-04-08 + */ + @Repository +public interface ServiceFileTreeMapper extends BaseMapper { + +} diff --git a/src/main/java/com/subsidy/model/AcademyCollegeDictDO.java b/src/main/java/com/subsidy/model/AcademyCollegeDictDO.java new file mode 100644 index 0000000..8c6e435 --- /dev/null +++ b/src/main/java/com/subsidy/model/AcademyCollegeDictDO.java @@ -0,0 +1,36 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 学院字典表 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("academy_college_dict") +public class AcademyCollegeDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 学校id + */ + private Long academyId; + + private String college; + + +} diff --git a/src/main/java/com/subsidy/model/AcademyDictDO.java b/src/main/java/com/subsidy/model/AcademyDictDO.java new file mode 100644 index 0000000..bd3c087 --- /dev/null +++ b/src/main/java/com/subsidy/model/AcademyDictDO.java @@ -0,0 +1,49 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 院校字典表 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("academy_dict") +public class AcademyDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 院校名称 + */ + private String academyName; + + /** + * 简称 + */ + private String shortName; + + /** + * 所在地 + */ + private String location; + + /** + * 院校类型 + */ + private String academyType; + + +} diff --git a/src/main/java/com/subsidy/model/AcademyMajorDictDO.java b/src/main/java/com/subsidy/model/AcademyMajorDictDO.java new file mode 100644 index 0000000..4827bda --- /dev/null +++ b/src/main/java/com/subsidy/model/AcademyMajorDictDO.java @@ -0,0 +1,33 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 专业字典表 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("academy_major_dict") +public class AcademyMajorDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long collegeId; + + private String major; + + +} diff --git a/src/main/java/com/subsidy/model/AdministerAcademyMappingDO.java b/src/main/java/com/subsidy/model/AdministerAcademyMappingDO.java new file mode 100644 index 0000000..068d85e --- /dev/null +++ b/src/main/java/com/subsidy/model/AdministerAcademyMappingDO.java @@ -0,0 +1,33 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 管理员-院校映射表 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("administer_academy_mapping") +public class AdministerAcademyMappingDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long administerId; + + private Long academyId; + + +} diff --git a/src/main/java/com/subsidy/model/AdministerDO.java b/src/main/java/com/subsidy/model/AdministerDO.java index 9a411db..a962758 100644 --- a/src/main/java/com/subsidy/model/AdministerDO.java +++ b/src/main/java/com/subsidy/model/AdministerDO.java @@ -49,6 +49,11 @@ public class AdministerDO extends BaseModel { private Long companyId; /** + * 劳务id + */ + private Long laborId; + + /** * 成员名称 */ private String userName; diff --git a/src/main/java/com/subsidy/model/AdministerLaborMappingDO.java b/src/main/java/com/subsidy/model/AdministerLaborMappingDO.java new file mode 100644 index 0000000..5044e40 --- /dev/null +++ b/src/main/java/com/subsidy/model/AdministerLaborMappingDO.java @@ -0,0 +1,33 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 管理员-伙伴映射表 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("administer_labor_mapping") +public class AdministerLaborMappingDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long administerId; + + private Long laborId; + + +} diff --git a/src/main/java/com/subsidy/model/LaborGroupDictDO.java b/src/main/java/com/subsidy/model/LaborGroupDictDO.java new file mode 100644 index 0000000..08bdfb5 --- /dev/null +++ b/src/main/java/com/subsidy/model/LaborGroupDictDO.java @@ -0,0 +1,35 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 伙伴群组字典表 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("labor_group_dict") +public class LaborGroupDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private Long laborId; + + private Long parentId; + + private String groupName; + + +} diff --git a/src/main/java/com/subsidy/model/LaborServiceDictDO.java b/src/main/java/com/subsidy/model/LaborServiceDictDO.java new file mode 100644 index 0000000..d564773 --- /dev/null +++ b/src/main/java/com/subsidy/model/LaborServiceDictDO.java @@ -0,0 +1,35 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 劳务公司字典表 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("labor_service_dict") +public class LaborServiceDictDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + private String laborServiceName; + + private String shortName; + + private String location; + + private String serviceCode; +} diff --git a/src/main/java/com/subsidy/model/MemberDO.java b/src/main/java/com/subsidy/model/MemberDO.java index 2a1d6e3..05e47fd 100644 --- a/src/main/java/com/subsidy/model/MemberDO.java +++ b/src/main/java/com/subsidy/model/MemberDO.java @@ -26,6 +26,8 @@ public class MemberDO extends BaseModel { @TableId(value = "id", type = IdType.AUTO) private Long id; + private Long academyId; + /** * 姓名 */ @@ -106,5 +108,29 @@ public class MemberDO extends BaseModel { */ private String wechat; + /** + * 实习状态 + */ + private String practiceStatus; + + /** + * 学院id + */ + private Long collegeId; + + /** + * 专业id + */ + private String major; + + /** + * 入学年份 + */ + private String enrollmentYear; + + /** + * 人员类型 0：学院 2 ：职工 + */ + private Integer memberType; } diff --git a/src/main/java/com/subsidy/model/ProductDictDO.java b/src/main/java/com/subsidy/model/ProductDictDO.java index b39c54b..09aefef 100644 --- a/src/main/java/com/subsidy/model/ProductDictDO.java +++ b/src/main/java/com/subsidy/model/ProductDictDO.java @@ -49,5 +49,10 @@ public class ProductDictDO extends BaseModel { private String highlightTag; + private Integer orderNo; + + private Integer frontPage; + + private Integer productType; } diff --git a/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java b/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java new file mode 100644 index 0000000..103ff24 --- /dev/null +++ b/src/main/java/com/subsidy/model/ProjectMemberMappingDO.java @@ -0,0 +1,59 @@ +package com.subsidy.model; + +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 项目人员映射表 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("project_member_mapping") +public class ProjectMemberMappingDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 人员id + */ + private Long memberId; + + /** + * 项目id + */ + private Long projectId; + + /** + * 职位名称 + */ + private String jobName; + + /** + * 工资 + */ + private String salary; + + /** + * 排序 + */ + private Integer orderNo; + + /** + * 1:在职 0 已离职 + */ + private Integer status; + + +} diff --git a/src/main/java/com/subsidy/model/ServiceCompanyFilesDO.java b/src/main/java/com/subsidy/model/ServiceCompanyFilesDO.java index c151f52..2c419c3 100644 --- a/src/main/java/com/subsidy/model/ServiceCompanyFilesDO.java +++ b/src/main/java/com/subsidy/model/ServiceCompanyFilesDO.java @@ -25,12 +25,7 @@ public class ServiceCompanyFilesDO extends BaseModel { @TableId(value = "id", type = IdType.AUTO) private Long id; - private Long serviceCompanyId; - - /** - * 0：业务合同 1：业务材料 - */ - private String fileType; + private Long treeId; private String fileName; diff --git a/src/main/java/com/subsidy/model/ServiceFileTreeDO.java b/src/main/java/com/subsidy/model/ServiceFileTreeDO.java new file mode 100644 index 0000000..1f7df7f --- /dev/null +++ b/src/main/java/com/subsidy/model/ServiceFileTreeDO.java @@ -0,0 +1,46 @@ +package com.subsidy.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.subsidy.util.BaseModel; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * + *

+ * + * @author Tuyp + * @since 2024-04-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("service_file_tree") +public class ServiceFileTreeDO extends BaseModel { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 公司id + */ + private Long companyId; + + /** + * 业务id + */ + private Long serviceId; + + /** + * 父节点 + */ + private Long parentId; + + private String treeName; + + +} diff --git a/src/main/java/com/subsidy/service/AcademyCollegeDictService.java b/src/main/java/com/subsidy/service/AcademyCollegeDictService.java new file mode 100644 index 0000000..5fd3618 --- /dev/null +++ b/src/main/java/com/subsidy/service/AcademyCollegeDictService.java @@ -0,0 +1,28 @@ +package com.subsidy.service; + +import com.subsidy.model.AcademyCollegeDictDO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.vo.academy.AllAcademyMembersVO; + +import java.util.List; + +/** + *

+ * 学院字典表 服务类 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +public interface AcademyCollegeDictService extends IService { + + + List allCollege(AcademyCollegeDictDO academyCollegeDictDO); + + String addCollege(AcademyCollegeDictDO academyCollegeDictDO); + + String updateCollege(AcademyCollegeDictDO academyCollegeDictDO); + + String deleteCollege(AcademyCollegeDictDO academyCollegeDictDO); + +} diff --git a/src/main/java/com/subsidy/service/AcademyDictService.java b/src/main/java/com/subsidy/service/AcademyDictService.java new file mode 100644 index 0000000..464d81f --- /dev/null +++ b/src/main/java/com/subsidy/service/AcademyDictService.java @@ -0,0 +1,39 @@ +package com.subsidy.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.dto.academy.AcademiesDTO; +import com.subsidy.dto.academy.AcademyAccountDTO; +import com.subsidy.dto.academy.AddAcademyAccountDTO; +import com.subsidy.dto.academy.AddAcademyDTO; +import com.subsidy.model.AcademyDictDO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.model.AdministerDO; +import com.subsidy.vo.academy.AcademiesVO; + +/** + *

+ * 院校字典表 服务类 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +public interface AcademyDictService extends IService { + + IPage academies(AcademiesDTO academiesDTO); + + String addAcademy(AddAcademyDTO addAcademyDTO); + + String deleteAcademy(AcademyDictDO academyDictDO); + + String updateAcademy(AddAcademyDTO addAcademyDTO); + + IPage academyAccount(AcademyAccountDTO academyAccountDTO); + + String addAcademyAccount(AddAcademyAccountDTO addAcademyAccountDTO); + + String deleteAcademyAccount(AdministerDO administerDO); + + String updateAcademyAccount(AddAcademyAccountDTO addAcademyAccountDTO); + +} diff --git a/src/main/java/com/subsidy/service/AcademyMajorDictService.java b/src/main/java/com/subsidy/service/AcademyMajorDictService.java new file mode 100644 index 0000000..8daaa62 --- /dev/null +++ b/src/main/java/com/subsidy/service/AcademyMajorDictService.java @@ -0,0 +1,26 @@ +package com.subsidy.service; + +import com.subsidy.model.AcademyMajorDictDO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 专业字典表 服务类 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +public interface AcademyMajorDictService extends IService { + + List majors(AcademyMajorDictDO academyMajorDictDO); + + String addMajor(AcademyMajorDictDO academyMajorDictDO); + + String updateMajor(AcademyMajorDictDO academyMajorDictDO); + + String deleteMajor(AcademyMajorDictDO academyMajorDictDO); + +} diff --git a/src/main/java/com/subsidy/service/AdministerAcademyMappingService.java b/src/main/java/com/subsidy/service/AdministerAcademyMappingService.java new file mode 100644 index 0000000..f95988b --- /dev/null +++ b/src/main/java/com/subsidy/service/AdministerAcademyMappingService.java @@ -0,0 +1,16 @@ +package com.subsidy.service; + +import com.subsidy.model.AdministerAcademyMappingDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 管理员-院校映射表 服务类 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +public interface AdministerAcademyMappingService extends IService { + +} diff --git a/src/main/java/com/subsidy/service/AdministerLaborMappingService.java b/src/main/java/com/subsidy/service/AdministerLaborMappingService.java new file mode 100644 index 0000000..813045c --- /dev/null +++ b/src/main/java/com/subsidy/service/AdministerLaborMappingService.java @@ -0,0 +1,16 @@ +package com.subsidy.service; + +import com.subsidy.model.AdministerLaborMappingDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 管理员-伙伴映射表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +public interface AdministerLaborMappingService extends IService { + +} diff --git a/src/main/java/com/subsidy/service/LaborGroupDictService.java b/src/main/java/com/subsidy/service/LaborGroupDictService.java new file mode 100644 index 0000000..b9f918e --- /dev/null +++ b/src/main/java/com/subsidy/service/LaborGroupDictService.java @@ -0,0 +1,16 @@ +package com.subsidy.service; + +import com.subsidy.model.LaborGroupDictDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 伙伴群组字典表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +public interface LaborGroupDictService extends IService { + +} diff --git a/src/main/java/com/subsidy/service/LaborServiceDictService.java b/src/main/java/com/subsidy/service/LaborServiceDictService.java new file mode 100644 index 0000000..ac4795a --- /dev/null +++ b/src/main/java/com/subsidy/service/LaborServiceDictService.java @@ -0,0 +1,46 @@ +package com.subsidy.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.dto.academy.AddAcademyAccountDTO; +import com.subsidy.dto.labor.*; +import com.subsidy.model.AdministerDO; +import com.subsidy.model.LaborServiceDictDO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.model.ProjectMemberMappingDO; +import com.subsidy.vo.labor.LaborAccountVO; +import com.subsidy.vo.labor.TalentManagementVO; +import com.subsidy.vo.member.DetailVO; + +import java.util.List; + +/** + *

+ * 劳务公司字典表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +public interface LaborServiceDictService extends IService { + + IPage labors(LaborsDTO laborsDTO); + + void addLabor(AddLaborDTO addLaborDTO); + + void deleteLabor(LaborServiceDictDO laborServiceDictDO); + + void updateLabor(AddLaborDTO addLaborDTO); + + IPage laborAccount(LaborAccountDTO laborAccountDTO); + + String addLaborAccount(AddLaborAccountDTO addLaborAccountDTO); + + String deleteLaborAccount(AdministerDO administerDO); + + String updateLaborAccount(AddLaborAccountDTO addLaborAccountDTO); + + IPage talentManagement(TalentManagementDTO talentManagementDTO); + + List detail(ProjectMemberMappingDO projectMemberMappingDO); + +} diff --git a/src/main/java/com/subsidy/service/MemberService.java b/src/main/java/com/subsidy/service/MemberService.java index f61d1f5..f7da765 100644 --- a/src/main/java/com/subsidy/service/MemberService.java +++ b/src/main/java/com/subsidy/service/MemberService.java @@ -1,7 +1,10 @@ package com.subsidy.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.subsidy.dto.member.AcademyMembersDTO; import com.subsidy.model.MemberDO; import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.vo.member.AcademyMembersVO; /** *

@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface MemberService extends IService { + IPage academyMembers(AcademyMembersDTO academyMembersDTO); + } diff --git a/src/main/java/com/subsidy/service/ProductDictService.java b/src/main/java/com/subsidy/service/ProductDictService.java index 382200d..8b8cf95 100644 --- a/src/main/java/com/subsidy/service/ProductDictService.java +++ b/src/main/java/com/subsidy/service/ProductDictService.java @@ -2,9 +2,12 @@ package com.subsidy.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.subsidy.dto.product.AllProductsDTO; +import com.subsidy.dto.product.ChangeOrderDTO; import com.subsidy.model.ProductDictDO; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 产品管理字典表 服务类 @@ -23,4 +26,7 @@ public interface ProductDictService extends IService { String updateProduct(ProductDictDO productDictDO); + String changeOrder(ChangeOrderDTO changeOrderDTO); + + List frontPage(ProductDictDO productDictDO); } diff --git a/src/main/java/com/subsidy/service/ProjectMemberMappingService.java b/src/main/java/com/subsidy/service/ProjectMemberMappingService.java new file mode 100644 index 0000000..69e76b9 --- /dev/null +++ b/src/main/java/com/subsidy/service/ProjectMemberMappingService.java @@ -0,0 +1,16 @@ +package com.subsidy.service; + +import com.subsidy.model.ProjectMemberMappingDO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 项目人员映射表 服务类 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +public interface ProjectMemberMappingService extends IService { + +} diff --git a/src/main/java/com/subsidy/service/ServiceFileTreeService.java b/src/main/java/com/subsidy/service/ServiceFileTreeService.java new file mode 100644 index 0000000..b4c5417 --- /dev/null +++ b/src/main/java/com/subsidy/service/ServiceFileTreeService.java @@ -0,0 +1,26 @@ +package com.subsidy.service; + +import com.subsidy.model.ServiceFileTreeDO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.subsidy.vo.tree.TreesVO; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author Tuyp + * @since 2024-04-08 + */ +public interface ServiceFileTreeService extends IService { + + List trees(ServiceFileTreeDO serviceFileTreeDO); + + String addTree(ServiceFileTreeDO serviceFileTreeDO); + + String updateTree(ServiceFileTreeDO serviceFileTreeDO); + + String deleteTree(ServiceFileTreeDO serviceFileTreeDO); +} diff --git a/src/main/java/com/subsidy/service/impl/AcademyCollegeDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/AcademyCollegeDictServiceImpl.java new file mode 100644 index 0000000..b0fe845 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/AcademyCollegeDictServiceImpl.java @@ -0,0 +1,90 @@ +package com.subsidy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.subsidy.common.exception.HttpException; +import com.subsidy.mapper.AcademyDictMapper; +import com.subsidy.mapper.AcademyMajorDictMapper; +import com.subsidy.mapper.MemberMapper; +import com.subsidy.model.AcademyCollegeDictDO; +import com.subsidy.mapper.AcademyCollegeDictMapper; +import com.subsidy.model.AcademyDictDO; +import com.subsidy.model.AcademyMajorDictDO; +import com.subsidy.model.MemberDO; +import com.subsidy.service.AcademyCollegeDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.util.ConstantUtils; +import com.subsidy.vo.academy.AllAcademyMembersVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 学院字典表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +@Service +public class AcademyCollegeDictServiceImpl extends ServiceImpl implements AcademyCollegeDictService { + + + @Autowired + private AcademyMajorDictMapper academyMajorDictMapper; + + @Autowired + private MemberMapper memberMapper; + + @Autowired + private AcademyDictMapper academyDictMapper; + + public List allCollege(AcademyCollegeDictDO academyCollegeDictDO) { + return this.baseMapper.allCollege(academyCollegeDictDO.getAcademyId(),academyCollegeDictDO.getCollege()); + } + + public String addCollege(AcademyCollegeDictDO academyCollegeDictDO) { + + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AcademyCollegeDictDO::getAcademyId, academyCollegeDictDO.getCollege())); + + if (count > 0) { + throw new HttpException(24001); + } + + this.baseMapper.insert(academyCollegeDictDO); + return ConstantUtils.ADD_SUCCESS; + } + + public String updateCollege(AcademyCollegeDictDO academyCollegeDictDO) { + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AcademyCollegeDictDO::getAcademyId, academyCollegeDictDO.getCollege()) + .ne(AcademyCollegeDictDO::getId, academyCollegeDictDO.getId())); + + if (count > 0) { + throw new HttpException(24001); + } + + this.baseMapper.updateById(academyCollegeDictDO); + return ConstantUtils.SUCCESS_UPDATE; + } + + public String deleteCollege(AcademyCollegeDictDO academyCollegeDictDO) { + + this.baseMapper.deleteById(academyCollegeDictDO.getId()); + + academyMajorDictMapper.delete(new QueryWrapper() + .lambda() + .eq(AcademyMajorDictDO::getCollegeId, academyCollegeDictDO.getId())); + + memberMapper.delete(new QueryWrapper() + .lambda() + .eq(MemberDO::getCollegeId, academyCollegeDictDO.getId())); + + return ConstantUtils.DELETE_SUCCESS; + } + +} diff --git a/src/main/java/com/subsidy/service/impl/AcademyDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/AcademyDictServiceImpl.java new file mode 100644 index 0000000..a833092 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/AcademyDictServiceImpl.java @@ -0,0 +1,257 @@ +package com.subsidy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.subsidy.common.exception.HttpException; +import com.subsidy.dto.academy.AcademiesDTO; +import com.subsidy.dto.academy.AcademyAccountDTO; +import com.subsidy.dto.academy.AddAcademyAccountDTO; +import com.subsidy.dto.academy.AddAcademyDTO; +import com.subsidy.mapper.AdministerAcademyMappingMapper; +import com.subsidy.mapper.AdministerMapper; +import com.subsidy.model.AcademyDictDO; +import com.subsidy.mapper.AcademyDictMapper; +import com.subsidy.model.AdministerAcademyMappingDO; +import com.subsidy.model.AdministerCompanyMappingDO; +import com.subsidy.model.AdministerDO; +import com.subsidy.service.AcademyDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.util.ConstantUtils; +import com.subsidy.vo.academy.AcademiesVO; +import com.subsidy.vo.academy.AcademyAccountVO; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.xml.ws.Action; +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 院校字典表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +@Service +public class AcademyDictServiceImpl extends ServiceImpl implements AcademyDictService { + + @Autowired + private AdministerMapper administerMapper; + + @Autowired + private AdministerAcademyMappingMapper administerAcademyMappingMapper; + + public IPage academies(AcademiesDTO academiesDTO) { + Page pager = new Page(academiesDTO.getPageNum(), academiesDTO.getPageSize()); + return this.baseMapper.academies(pager, academiesDTO.getAcademyName()); + } + + @Transactional(rollbackFor = Exception.class) + public String addAcademy(AddAcademyDTO addAcademyDTO) { + + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AcademyDictDO::getAcademyName, addAcademyDTO.getAcademyName())); + + if (count > 0) { + throw new HttpException(10030); + } + + //院校 + AcademyDictDO academyDictDO = new AcademyDictDO(); + BeanUtils.copyProperties(addAcademyDTO, academyDictDO); + this.baseMapper.insert(academyDictDO); + + //账号 + int count1 = administerMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AdministerDO::getAccountName, addAcademyDTO.getAccountName())); + if (count1 > 0) { + throw new HttpException(10014); + } + + AdministerDO administerDO = new AdministerDO(); + BeanUtils.copyProperties(addAcademyDTO, administerDO); + administerDO.setRole(4); + administerDO.setStatus("1"); + administerDO.setPassword("admin321"); + administerDO.setUserName(academyDictDO.getAcademyName()); + administerMapper.insert(administerDO); + + //关联 + AdministerAcademyMappingDO administerAcademyMappingDO = new AdministerAcademyMappingDO(); + administerAcademyMappingDO.setAdministerId(administerDO.getId()); + administerAcademyMappingDO.setAcademyId(academyDictDO.getId()); + administerAcademyMappingMapper.insert(administerAcademyMappingDO); + + return ConstantUtils.ADD_SUCCESS; + } + + public String deleteAcademy(AcademyDictDO academyDictDO) { + + this.baseMapper.deleteById(academyDictDO.getId()); + + List administerAcademyMappingDOS = administerAcademyMappingMapper.selectList(new QueryWrapper() + .lambda() + .eq(AdministerAcademyMappingDO::getAcademyId, academyDictDO.getId())); + + administerAcademyMappingDOS.forEach(x -> { + administerAcademyMappingMapper.deleteById(x.getId()); + administerMapper.deleteById(x.getAdministerId()); + }); + return ConstantUtils.DELETE_SUCCESS; + } + + public String updateAcademy(AddAcademyDTO addAcademyDTO) { + + AcademyDictDO academyDictDO = new AcademyDictDO(); + BeanUtils.copyProperties(addAcademyDTO, academyDictDO); + this.updateById(academyDictDO); + + //查看院校主账号 + + //账号 + int count1 = administerMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AdministerDO::getAccountName, addAcademyDTO.getAccountName()) + .ne(AdministerDO::getId, addAcademyDTO.getId())); + if (count1 > 0) { + throw new HttpException(10014); + } + + AdministerDO administerDO = this.baseMapper.mainAccount(addAcademyDTO.getId()); + + if (null != addAcademyDTO.getAccountName()) { + administerDO.setAccountName(addAcademyDTO.getAccountName()); + } + + if (null != addAcademyDTO.getTelephone()) { + administerDO.setTelephone(addAcademyDTO.getTelephone()); + } + + if (null != addAcademyDTO.getPassword()) { + administerDO.setPassword(addAcademyDTO.getPassword()); + } + + if (null != addAcademyDTO.getUserName()) { + administerDO.setUserName(addAcademyDTO.getUserName()); + } + + administerMapper.updateById(administerDO); + + return ConstantUtils.SUCCESS_UPDATE; + } + + public IPage academyAccount(AcademyAccountDTO academyAccountDTO) { + + Page pager = new Page(academyAccountDTO.getPageNum(), academyAccountDTO.getPageSize()); + + IPage academyAccountVOIPage = this.baseMapper.academyAccount(pager, academyAccountDTO.getAcademyName()); + + List academyAccountVOS = academyAccountVOIPage.getRecords(); + + for (AcademyAccountVO aav : academyAccountVOS) { + //账户关联的院校 + List academyDictDOS = this.baseMapper.accountAcademies(aav.getId()); + aav.setAcademyDictDOS(academyDictDOS); + } + return academyAccountVOIPage; + } + + public String addAcademyAccount(AddAcademyAccountDTO addAcademyAccountDTO) { + + //账户 + int count1 = administerMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AdministerDO::getAccountName, addAcademyAccountDTO.getAccountName())); + if (count1 > 0) { + throw new HttpException(10014); + } + AdministerDO administerDO = new AdministerDO(); + + BeanUtils.copyProperties(addAcademyAccountDTO, administerDO); + administerDO.setRole(5); + administerMapper.insert(administerDO); + + //映射关系 + List academyIds = addAcademyAccountDTO.getAcademyIds(); + for (Long academyId : academyIds) { + AdministerAcademyMappingDO administerAcademyMappingDO = new AdministerAcademyMappingDO(); + administerAcademyMappingDO.setAcademyId(academyId); + administerAcademyMappingDO.setAdministerId(administerDO.getId()); + administerAcademyMappingMapper.insert(administerAcademyMappingDO); + } + + return ConstantUtils.ADD_SUCCESS; + } + + public String deleteAcademyAccount(AdministerDO administerDO) { + + administerMapper.deleteById(administerDO.getId()); + + List administerAcademyMappingDOS = administerAcademyMappingMapper.selectList(new QueryWrapper() + .lambda() + .eq(AdministerAcademyMappingDO::getAdministerId, administerDO.getId())); + + for (AdministerAcademyMappingDO administerAcademyMappingDO : administerAcademyMappingDOS) { + administerAcademyMappingMapper.deleteById(administerAcademyMappingDO.getId()); + } + + return ConstantUtils.DELETE_SUCCESS; + } + + public String updateAcademyAccount(AddAcademyAccountDTO addAcademyAccountDTO) { + + //编辑人员信息 + //账号 + int count1 = administerMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AdministerDO::getAccountName, addAcademyAccountDTO.getAccountName()) + .ne(AdministerDO::getId, addAcademyAccountDTO.getId())); + if (count1 > 0) { + throw new HttpException(10014); + } + AdministerDO administerDO = new AdministerDO(); + BeanUtils.copyProperties(addAcademyAccountDTO, administerDO); + administerMapper.updateById(administerDO); + + //已关联院校信息 + List oldIds = this.baseMapper.accountAcademyIds(addAcademyAccountDTO.getId()); + + //去旧加新 + List newIds = addAcademyAccountDTO.getAcademyIds(); + + List newAcademyIds2 = new ArrayList<>(); + for (Long lg : newIds) { + newAcademyIds2.add(lg); + } + + newIds.removeAll(oldIds); // + if (newIds.size() > 0) { + for (Long lg : newIds) { + AdministerAcademyMappingDO administerAcademyMappingDO = new AdministerAcademyMappingDO(); + administerAcademyMappingDO.setAdministerId(addAcademyAccountDTO.getId()); + administerAcademyMappingDO.setAcademyId(lg); + administerAcademyMappingMapper.insert(administerAcademyMappingDO); + } + } + + oldIds.removeAll(newAcademyIds2); + if (oldIds.size() > 0) { + for (Long lg : oldIds) { + administerAcademyMappingMapper.delete(new QueryWrapper() + .lambda() + .eq(AdministerAcademyMappingDO::getAdministerId, addAcademyAccountDTO.getId()) + .eq(AdministerAcademyMappingDO::getAcademyId, lg)); + } + } + + return ConstantUtils.SUCCESS_UPDATE; + } + +} diff --git a/src/main/java/com/subsidy/service/impl/AcademyMajorDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/AcademyMajorDictServiceImpl.java new file mode 100644 index 0000000..0be5ff5 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/AcademyMajorDictServiceImpl.java @@ -0,0 +1,66 @@ +package com.subsidy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.subsidy.common.exception.HttpException; +import com.subsidy.model.AcademyMajorDictDO; +import com.subsidy.mapper.AcademyMajorDictMapper; +import com.subsidy.service.AcademyMajorDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.util.ConstantUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 专业字典表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-04-16 + */ +@Service +public class AcademyMajorDictServiceImpl extends ServiceImpl implements AcademyMajorDictService { + + + public List majors(AcademyMajorDictDO academyMajorDictDO) { + return this.baseMapper.majors(academyMajorDictDO.getCollegeId(),academyMajorDictDO.getMajor()); + } + + public String addMajor(AcademyMajorDictDO academyMajorDictDO) { + + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AcademyMajorDictDO::getCollegeId, academyMajorDictDO.getCollegeId()) + .eq(AcademyMajorDictDO::getMajor, academyMajorDictDO.getMajor())); + + if (count > 0) { + throw new HttpException(24002); + } + + this.baseMapper.insert(academyMajorDictDO); + return ConstantUtils.ADD_SUCCESS; + } + + public String updateMajor(AcademyMajorDictDO academyMajorDictDO) { + + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AcademyMajorDictDO::getCollegeId, academyMajorDictDO.getCollegeId()) + .eq(AcademyMajorDictDO::getMajor, academyMajorDictDO.getMajor()) + .ne(AcademyMajorDictDO::getId, academyMajorDictDO.getId())); + + if (count > 0) { + throw new HttpException(24002); + } + + this.baseMapper.updateById(academyMajorDictDO); + return ConstantUtils.SUCCESS_UPDATE; + } + + public String deleteMajor(AcademyMajorDictDO academyMajorDictDO) { + this.baseMapper.deleteById(academyMajorDictDO.getId()); + return ConstantUtils.DELETE_SUCCESS; + } + +} diff --git a/src/main/java/com/subsidy/service/impl/AdministerAcademyMappingServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerAcademyMappingServiceImpl.java new file mode 100644 index 0000000..19fbb97 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/AdministerAcademyMappingServiceImpl.java @@ -0,0 +1,20 @@ +package com.subsidy.service.impl; + +import com.subsidy.model.AdministerAcademyMappingDO; +import com.subsidy.mapper.AdministerAcademyMappingMapper; +import com.subsidy.service.AdministerAcademyMappingService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 管理员-院校映射表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-02-23 + */ +@Service +public class AdministerAcademyMappingServiceImpl extends ServiceImpl implements AdministerAcademyMappingService { + +} diff --git a/src/main/java/com/subsidy/service/impl/AdministerLaborMappingServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerLaborMappingServiceImpl.java new file mode 100644 index 0000000..89e4308 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/AdministerLaborMappingServiceImpl.java @@ -0,0 +1,20 @@ +package com.subsidy.service.impl; + +import com.subsidy.model.AdministerLaborMappingDO; +import com.subsidy.mapper.AdministerLaborMappingMapper; +import com.subsidy.service.AdministerLaborMappingService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 管理员-伙伴映射表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +@Service +public class AdministerLaborMappingServiceImpl extends ServiceImpl implements AdministerLaborMappingService { + +} diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java index ecad9f6..20a1736 100644 --- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java @@ -176,11 +176,7 @@ public class AdministerServiceImpl extends ServiceImpl() - .lambda() - .eq(AdministerDO::getTelephone, addAdministerDTO.getTelephone())); - - if (count + count1 > 0) { + if (count > 0) { throw new HttpException(20002); } @@ -233,12 +229,7 @@ public class AdministerServiceImpl extends ServiceImpl() - .lambda() - .eq(AdministerDO::getTelephone, addAdministerDTO.getTelephone()) - .ne(AdministerDO::getId, addAdministerDTO.getId())); - - if (count + count1 > 0) { + if (count > 0) { throw new HttpException(20002); } AdministerDO administerDO = this.baseMapper.selectById(addAdministerDTO.getId()); diff --git a/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java index 5eae53d..b1e71df 100644 --- a/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java @@ -66,10 +66,15 @@ public class CompanyDictServiceImpl extends ServiceImpl operators(OperatorsDTO operatorsDTO) { Page pager = new Page(operatorsDTO.getPageNum(), operatorsDTO.getPageSize()); -// AdministerDO administerDO = administerMapper.selectById(operatorsDTO.getId()); - IPage page = this.baseMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(), operatorsDTO.getSuperviseName()); + IPage page = this.baseMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(), operatorsDTO.getSuperviseName()); List operatorsVOS = page.getRecords(); for (OperatorsVO operatorsVO : operatorsVOS) { //查看公司所在行业 @@ -101,11 +106,24 @@ public class CompanyDictServiceImpl extends ServiceImpl() + .lambda() + .eq(AdministerDO::getAccountName, addCompanyDTO.getAccountName()) + .ne(AdministerDO::getId, administerDO1.getId())); + if (count1 > 0) { + throw new HttpException(10014); + } + + //查找企业管理员 AdministerDO administerDO = administerMapper.selectOne(new QueryWrapper() - .lambda() - .eq(AdministerDO::getCompanyId,addCompanyDTO.getId()) - .eq(AdministerDO::getRole,3)); + .lambda() + .eq(AdministerDO::getCompanyId, addCompanyDTO.getId()) + .eq(AdministerDO::getRole, 3)); if (null != administerDO) { if (StringUtils.isNotBlank(addCompanyDTO.getAccountName())) { administerDO.setAccountName(addCompanyDTO.getAccountName()); @@ -144,11 +162,19 @@ public class CompanyDictServiceImpl extends ServiceImpl() + .lambda() + .eq(AdministerDO::getAccountName, addCompanyDTO.getAccountName())); + if (count1 > 0) { + throw new HttpException(10014); + } + AdministerDO administerDO = new AdministerDO(); - BeanUtils.copyProperties(addCompanyDTO,administerDO); + BeanUtils.copyProperties(addCompanyDTO, administerDO); administerDO.setCompanyId(companyDictDO.getId()); administerDO.setRole(3); administerDO.setStatus("1"); + administerDO.setUserName(companyDictDO.getCompanyName()); administerDO.setPassword("admin321"); administerMapper.insert(administerDO); @@ -170,6 +196,13 @@ public class CompanyDictServiceImpl extends ServiceImpl fields = addCompanyDTO.getField(); for (Long lg : fields) { @@ -217,6 +250,22 @@ public class CompanyDictServiceImpl extends ServiceImpl companyMembersVOIPage = this.baseMapper.getCompanyMembers(pager, getCompanyMembersDTO.getCompanyId(), getCompanyMembersDTO.getUserName(), getCompanyMembersDTO.getMemberStatus()); List records = companyMembersVOIPage.getRecords(); - for (GetCompanyMembersVO gcmv : records){ + for (GetCompanyMembersVO gcmv : records) { //历史带过的企业 List memberCompanyVOS = companyMemberMappingMapper.memberCompanys(gcmv.getId()); @@ -239,7 +288,7 @@ public class CompanyDictServiceImpl extends ServiceImpl getCompanyMembersVOS = this.baseMapper.getCompanyMembers(pager, getCompanyMembersDTO.getCompanyId(), getCompanyMembersDTO.getUserName(),getCompanyMembersDTO.getMemberStatus()).getRecords(); + List getCompanyMembersVOS = this.baseMapper.getCompanyMembers(pager, getCompanyMembersDTO.getCompanyId(), getCompanyMembersDTO.getUserName(), getCompanyMembersDTO.getMemberStatus()).getRecords(); ExcelUtil.writeExcel(getCompanyMembersVOS, GetCompanyMembersVO.class); } diff --git a/src/main/java/com/subsidy/service/impl/LaborGroupDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/LaborGroupDictServiceImpl.java new file mode 100644 index 0000000..0c3fa2d --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/LaborGroupDictServiceImpl.java @@ -0,0 +1,20 @@ +package com.subsidy.service.impl; + +import com.subsidy.model.LaborGroupDictDO; +import com.subsidy.mapper.LaborGroupDictMapper; +import com.subsidy.service.LaborGroupDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 伙伴群组字典表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +@Service +public class LaborGroupDictServiceImpl extends ServiceImpl implements LaborGroupDictService { + +} diff --git a/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java new file mode 100644 index 0000000..d20c855 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/LaborServiceDictServiceImpl.java @@ -0,0 +1,230 @@ +package com.subsidy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.subsidy.common.exception.HttpException; +import com.subsidy.dto.academy.AddAcademyAccountDTO; +import com.subsidy.dto.labor.*; +import com.subsidy.mapper.*; +import com.subsidy.model.*; +import com.subsidy.service.LaborServiceDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.util.ConstantUtils; +import com.subsidy.vo.labor.LaborAccountVO; +import com.subsidy.vo.labor.LaborsVO; +import com.subsidy.vo.labor.TalentManagementVO; +import com.subsidy.vo.member.DetailVO; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 劳务公司字典表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-25 + */ +@Service +public class LaborServiceDictServiceImpl extends ServiceImpl implements LaborServiceDictService { + + @Autowired + private AdministerMapper administerMapper; + + @Autowired + private AdministerLaborMappingMapper administerLaborMappingMapper; + + @Autowired + private LaborGroupDictMapper laborGroupDictMapper; + + @Autowired + private ProjectMemberMappingMapper projectMemberMappingMapper; + + public IPage labors(LaborsDTO laborsDTO) { + Page pager = new Page(laborsDTO.getPageNum(), laborsDTO.getPageSize()); + return this.baseMapper.labors(pager, laborsDTO.getLaborServiceName()); + } + + public void addLabor(AddLaborDTO addLaborDTO) { + + //伙伴 + LaborServiceDictDO laborServiceDictDO = new LaborServiceDictDO(); + BeanUtils.copyProperties(addLaborDTO, laborServiceDictDO); + this.baseMapper.insert(laborServiceDictDO); + + //账号 + AdministerDO administerDO = new AdministerDO(); + BeanUtils.copyProperties(addLaborDTO, administerDO); + administerDO.setLaborId(laborServiceDictDO.getId()); + administerDO.setPassword("admin321"); + administerDO.setRole(6); + administerDO.setUserName(addLaborDTO.getLaborServiceName()); + administerMapper.insert(administerDO); + + LaborGroupDictDO laborGroupDictDO = new LaborGroupDictDO(); + laborGroupDictDO.setGroupName(laborServiceDictDO.getLaborServiceName()); + laborGroupDictDO.setLaborId(laborServiceDictDO.getId()); + laborGroupDictMapper.insert(laborGroupDictDO); + } + + @Transactional(rollbackFor = Exception.class) + public void deleteLabor(LaborServiceDictDO laborServiceDictDO) { + + this.baseMapper.deleteById(laborServiceDictDO.getId()); + + AdministerDO administerDO = administerMapper.selectOne(new QueryWrapper() + .lambda() + .eq(AdministerDO::getLaborId, laborServiceDictDO.getId())); + + administerMapper.deleteById(administerDO.getId()); + } + + public void updateLabor(AddLaborDTO addLaborDTO) { + + //伙伴 + LaborServiceDictDO laborServiceDictDO = new LaborServiceDictDO(); + BeanUtils.copyProperties(addLaborDTO, laborServiceDictDO); + this.baseMapper.updateById(laborServiceDictDO); + + //账号 + AdministerDO administerDO = administerMapper.selectOne(new QueryWrapper() + .lambda() + .eq(AdministerDO::getLaborId, laborServiceDictDO.getId())); + + if (StringUtils.isNotBlank(addLaborDTO.getAccountName())) { + administerDO.setAccountName(addLaborDTO.getAccountName()); + } + if (StringUtils.isNotBlank(addLaborDTO.getPassword())) { + administerDO.setPassword(addLaborDTO.getPassword()); + } + if (StringUtils.isNotBlank(addLaborDTO.getLaborServiceName())) { + administerDO.setUserName(addLaborDTO.getLaborServiceName()); + } + + administerMapper.updateById(administerDO); + } + + public IPage laborAccount(LaborAccountDTO laborAccountDTO) { + Page pager = new Page(laborAccountDTO.getPageNum(), laborAccountDTO.getPageSize()); + + IPage laborAccountVOIPage = this.baseMapper.laborAccount(pager, laborAccountDTO.getLaborServiceName()); + + List laborAccountVOS = laborAccountVOIPage.getRecords(); + for (LaborAccountVO laborAccountVO : laborAccountVOS) { + //关联伙伴 + List laborServiceDictDOS = this.baseMapper.relateLabors(laborAccountVO.getId()); + laborAccountVO.setLaborServiceDictDOS(laborServiceDictDOS); + } + + return laborAccountVOIPage; + } + + + public String addLaborAccount(AddLaborAccountDTO addLaborAccountDTO) { + + //账户 + int count1 = administerMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AdministerDO::getAccountName, addLaborAccountDTO.getAccountName())); + if (count1 > 0) { + throw new HttpException(10014); + } + AdministerDO administerDO = new AdministerDO(); + + BeanUtils.copyProperties(addLaborAccountDTO, administerDO); + administerDO.setRole(7); + administerMapper.insert(administerDO); + + //映射关系 + List laborIds = addLaborAccountDTO.getLaborIds(); + for (Long laborId : laborIds) { + AdministerLaborMappingDO administerLaborMappingDO = new AdministerLaborMappingDO(); + administerLaborMappingDO.setLaborId(laborId); + administerLaborMappingDO.setAdministerId(administerDO.getId()); + administerLaborMappingMapper.insert(administerLaborMappingDO); + } + + return ConstantUtils.ADD_SUCCESS; + } + + public String deleteLaborAccount(AdministerDO administerDO) { + + administerMapper.deleteById(administerDO.getId()); + + List administerLaborMappingDOS = administerLaborMappingMapper.selectList(new QueryWrapper() + .lambda() + .eq(AdministerLaborMappingDO::getAdministerId, administerDO.getId())); + + for (AdministerLaborMappingDO administerLaborMappingDO : administerLaborMappingDOS) { + administerLaborMappingMapper.deleteById(administerLaborMappingDO.getId()); + } + + return ConstantUtils.DELETE_SUCCESS; + } + + public String updateLaborAccount(AddLaborAccountDTO addLaborAccountDTO) { + + //编辑人员信息 + //账号 + int count1 = administerMapper.selectCount(new QueryWrapper() + .lambda() + .eq(AdministerDO::getAccountName, addLaborAccountDTO.getAccountName()) + .ne(AdministerDO::getId, addLaborAccountDTO.getId())); + if (count1 > 0) { + throw new HttpException(10014); + } + AdministerDO administerDO = new AdministerDO(); + BeanUtils.copyProperties(addLaborAccountDTO, administerDO); + administerMapper.updateById(administerDO); + + //已关联院校信息 + List oldIds = this.baseMapper.accountLabors(addLaborAccountDTO.getId()); + + //去旧加新 + List newIds = addLaborAccountDTO.getLaborIds(); + + List newAcademyIds2 = new ArrayList<>(); + for (Long lg : newIds) { + newAcademyIds2.add(lg); + } + + newIds.removeAll(oldIds); // + if (newIds.size() > 0) { + for (Long lg : newIds) { + AdministerLaborMappingDO administerLaborMappingDO = new AdministerLaborMappingDO(); + administerLaborMappingDO.setAdministerId(addLaborAccountDTO.getId()); + administerLaborMappingDO.setLaborId(lg); + administerLaborMappingMapper.insert(administerLaborMappingDO); + } + } + + oldIds.removeAll(newAcademyIds2); + if (oldIds.size() > 0) { + for (Long lg : oldIds) { + administerLaborMappingMapper.delete(new QueryWrapper() + .lambda() + .eq(AdministerLaborMappingDO::getAdministerId, addLaborAccountDTO.getId()) + .eq(AdministerLaborMappingDO::getLaborId, lg)); + } + } + + return ConstantUtils.SUCCESS_UPDATE; + } + + public IPage talentManagement(TalentManagementDTO talentManagementDTO) { + Page pager = new Page(talentManagementDTO.getPageNum(), talentManagementDTO.getPageSize()); + return this.baseMapper.talentManagement(pager, talentManagementDTO.getLaborId(), talentManagementDTO.getUserName()); + } + + public List detail(ProjectMemberMappingDO projectMemberMappingDO) { + return projectMemberMappingMapper.detail(projectMemberMappingDO.getMemberId()); + } + +} diff --git a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java index b643846..8489933 100644 --- a/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/MemberServiceImpl.java @@ -1,9 +1,13 @@ package com.subsidy.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.subsidy.dto.member.AcademyMembersDTO; import com.subsidy.model.MemberDO; import com.subsidy.mapper.MemberMapper; import com.subsidy.service.MemberService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.vo.member.AcademyMembersVO; import org.springframework.stereotype.Service; /** @@ -17,4 +21,9 @@ import org.springframework.stereotype.Service; @Service public class MemberServiceImpl extends ServiceImpl implements MemberService { + public IPage academyMembers(AcademyMembersDTO academyMembersDTO) { + Page pager = new Page(academyMembersDTO.getPageNum(), academyMembersDTO.getPageSize()); + return this.baseMapper.academyMembers(pager,academyMembersDTO.getUserName(),academyMembersDTO.getPracticeStatus(),academyMembersDTO.getAcademyId()); + } + } diff --git a/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java b/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java index e133988..ab4d5ad 100644 --- a/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/ProductDictServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.subsidy.common.exception.HttpException; import com.subsidy.dto.product.AllProductsDTO; +import com.subsidy.dto.product.ChangeOrderDTO; import com.subsidy.model.ProductDictDO; import com.subsidy.mapper.ProductDictMapper; import com.subsidy.service.ProductDictService; @@ -12,6 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.subsidy.util.ConstantUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 产品管理字典表 服务实现类 @@ -26,7 +29,7 @@ public class ProductDictServiceImpl extends ServiceImpl allProducts(AllProductsDTO allProductsDTO) { Page pager = new Page(allProductsDTO.getPageNum(), allProductsDTO.getPageSize()); - return this.baseMapper.allProducts(pager, allProductsDTO.getProductName()); + return this.baseMapper.allProducts(pager, allProductsDTO.getProductName(), allProductsDTO.getProductType()); } public String addProduct(ProductDictDO productDictDO) { @@ -51,4 +54,22 @@ public class ProductDictServiceImpl extends ServiceImpl productDictDOS = changeOrderDTO.getProductDictDOS(); + + int i = 0; + for (Long productDictDO : productDictDOS) { + this.baseMapper.updateOrderNo(productDictDO, i++); + } + return ConstantUtils.SUCCESS_UPDATE; + } + + public List frontPage(ProductDictDO productDictDO) { + return this.baseMapper.selectList(new QueryWrapper() + .lambda() + .eq(ProductDictDO::getFrontPage, 1) + .eq(ProductDictDO::getProductType, productDictDO.getProductType()) + .orderByDesc(ProductDictDO::getCreateDate)); + } } diff --git a/src/main/java/com/subsidy/service/impl/ProjectMemberMappingServiceImpl.java b/src/main/java/com/subsidy/service/impl/ProjectMemberMappingServiceImpl.java new file mode 100644 index 0000000..7dda199 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/ProjectMemberMappingServiceImpl.java @@ -0,0 +1,20 @@ +package com.subsidy.service.impl; + +import com.subsidy.model.ProjectMemberMappingDO; +import com.subsidy.mapper.ProjectMemberMappingMapper; +import com.subsidy.service.ProjectMemberMappingService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 项目人员映射表 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-07-29 + */ +@Service +public class ProjectMemberMappingServiceImpl extends ServiceImpl implements ProjectMemberMappingService { + +} diff --git a/src/main/java/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.java b/src/main/java/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.java index b630675..b1527a7 100644 --- a/src/main/java/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.java @@ -1,15 +1,20 @@ package com.subsidy.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.subsidy.dto.company.CompanyFilesDTO; +import com.subsidy.mapper.ServiceFileTreeMapper; import com.subsidy.model.ServiceCompanyFilesDO; import com.subsidy.mapper.ServiceCompanyFilesMapper; +import com.subsidy.model.ServiceFileTreeDO; import com.subsidy.service.ServiceCompanyFilesService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.subsidy.util.ConstantUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -23,10 +28,27 @@ import java.util.List; @Service public class ServiceCompanyFilesServiceImpl extends ServiceImpl implements ServiceCompanyFilesService { + @Autowired + private ServiceFileTreeMapper serviceFileTreeMapper; public IPage companyFiles(CompanyFilesDTO companyFilesDTO) { Page pager = new Page(companyFilesDTO.getPageNum(), companyFilesDTO.getPageSize()); - return this.baseMapper.companyFiles(pager,companyFilesDTO.getFileType(),companyFilesDTO.getServiceCompanyId(), companyFilesDTO.getFileName()); + + List treeIds = new ArrayList<>(); + treeIds.add(companyFilesDTO.getTreeId()); + + ServiceFileTreeDO serviceFileTreeDO = serviceFileTreeMapper.selectById(companyFilesDTO.getTreeId()); + + if (null == serviceFileTreeDO.getParentId()){ + //找出二级节点 + List serviceFileTreeDOS = serviceFileTreeMapper.selectList(new QueryWrapper() + .lambda() + .eq(ServiceFileTreeDO::getParentId,serviceFileTreeDO.getId())); + for (ServiceFileTreeDO serviceFileTreeDO1 : serviceFileTreeDOS){ + treeIds.add(serviceFileTreeDO1.getId()); + } + } + return this.baseMapper.companyFiles(pager,treeIds, companyFilesDTO.getFileName()); } public String deleteFile(ServiceCompanyFilesDO serviceCompanyFilesDO) { diff --git a/src/main/java/com/subsidy/service/impl/ServiceFileTreeServiceImpl.java b/src/main/java/com/subsidy/service/impl/ServiceFileTreeServiceImpl.java new file mode 100644 index 0000000..c5628d2 --- /dev/null +++ b/src/main/java/com/subsidy/service/impl/ServiceFileTreeServiceImpl.java @@ -0,0 +1,127 @@ +package com.subsidy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.subsidy.common.exception.HttpException; +import com.subsidy.mapper.ServiceCompanyFilesMapper; +import com.subsidy.model.ServiceCompanyFilesDO; +import com.subsidy.model.ServiceFileTreeDO; +import com.subsidy.mapper.ServiceFileTreeMapper; +import com.subsidy.service.ServiceFileTreeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.subsidy.util.ConstantUtils; +import com.subsidy.vo.tree.TreesVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author Tuyp + * @since 2024-04-08 + */ +@Service +public class ServiceFileTreeServiceImpl extends ServiceImpl implements ServiceFileTreeService { + + public List trees(ServiceFileTreeDO serviceFileTreeDO) { + + List result = new ArrayList<>(); + + List serviceFileTreeDOS = this.baseMapper.selectList(new QueryWrapper() + .lambda() + .eq(ServiceFileTreeDO::getCompanyId, serviceFileTreeDO.getCompanyId()) + .eq(ServiceFileTreeDO::getServiceId, serviceFileTreeDO.getServiceId()) + .isNull(ServiceFileTreeDO::getParentId)); + + for (ServiceFileTreeDO sftd : serviceFileTreeDOS) { + TreesVO treesVO = new TreesVO(); + treesVO.setId(sftd.getId()); + treesVO.setTreeName(sftd.getTreeName()); + List serviceFileTreeDOList = this.baseMapper.selectList(new QueryWrapper() + .lambda() + .eq(ServiceFileTreeDO::getParentId, sftd.getId())); + + List resultTmp = new ArrayList<>(); + for (ServiceFileTreeDO sftd2 : serviceFileTreeDOList) { + TreesVO treesVO1 = new TreesVO(); + treesVO1.setId(sftd2.getId()); + treesVO1.setTreeName(sftd2.getTreeName()); + treesVO1.setParentId(sftd.getId()); + resultTmp.add(treesVO1); + } + treesVO.setTreesVOS(resultTmp); + result.add(treesVO); + } + return result; + } + + public String addTree(ServiceFileTreeDO serviceFileTreeDO) { + + //查看当前节点下有没有重名的 + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(ServiceFileTreeDO::getCompanyId, serviceFileTreeDO.getCompanyId()) + .eq(ServiceFileTreeDO::getParentId, serviceFileTreeDO.getParentId()) + .eq(ServiceFileTreeDO::getTreeName, serviceFileTreeDO.getTreeName()) + .eq(ServiceFileTreeDO::getServiceId, serviceFileTreeDO.getServiceId())); + + if (count > 0) { + throw new HttpException(40001); + } + + this.baseMapper.insert(serviceFileTreeDO); + return ConstantUtils.ADD_SUCCESS; + } + + public String updateTree(ServiceFileTreeDO serviceFileTreeDO) { + + ServiceFileTreeDO serviceFileTreeDO1 = this.baseMapper.selectById(serviceFileTreeDO.getId()); + //查看当前节点下有没有重名的 + int count = this.baseMapper.selectCount(new QueryWrapper() + .lambda() + .eq(ServiceFileTreeDO::getCompanyId, serviceFileTreeDO1.getCompanyId()) + .eq(ServiceFileTreeDO::getParentId, serviceFileTreeDO1.getParentId()) + .eq(ServiceFileTreeDO::getTreeName, serviceFileTreeDO.getTreeName()) + .eq(ServiceFileTreeDO::getServiceId, serviceFileTreeDO1.getServiceId()) + .ne(ServiceFileTreeDO::getId, serviceFileTreeDO.getId())); + + if (count > 0) { + throw new HttpException(40001); + } + + this.baseMapper.updateById(serviceFileTreeDO); + return ConstantUtils.SUCCESS_UPDATE; + } + + public String deleteTree(ServiceFileTreeDO serviceFileTreeDO) { + + ServiceFileTreeDO serviceFileTreeDO1 = this.baseMapper.selectById(serviceFileTreeDO.getId()); + this.baseMapper.deleteById(serviceFileTreeDO.getId()); + + List deleteIds = new ArrayList<>(); + deleteIds.add(serviceFileTreeDO.getId()); + + //如果是一级目录的话，要删除对应的二级目录 + if (null == serviceFileTreeDO1.getParentId()) { + + //找出二级节点 + List serviceFileTreeDOS = this.baseMapper.selectList(new QueryWrapper() + .lambda() + .eq(ServiceFileTreeDO::getParentId, serviceFileTreeDO.getId())); + for (ServiceFileTreeDO sftd : serviceFileTreeDOS) { + deleteIds.add(sftd.getId()); + } + + // 删除该目录下及子目录下的文件 + this.baseMapper.delete(new QueryWrapper() + .lambda() + .in(ServiceFileTreeDO::getId, deleteIds)); + } + return ConstantUtils.DELETE_SUCCESS; + } + +} diff --git a/src/main/java/com/subsidy/vo/academy/AcademiesVO.java b/src/main/java/com/subsidy/vo/academy/AcademiesVO.java new file mode 100644 index 0000000..4c03e8e --- /dev/null +++ b/src/main/java/com/subsidy/vo/academy/AcademiesVO.java @@ -0,0 +1,27 @@ +package com.subsidy.vo.academy; + +import lombok.Data; + +@Data +public class AcademiesVO { + + private Long academyId; + + private String academyName; + + private String shortName; + + private String location; + + private String academyType; + + private String accountName; + + private String password; + + private String userName; + + private String telephone; + + +} diff --git a/src/main/java/com/subsidy/vo/academy/AcademyAccountVO.java b/src/main/java/com/subsidy/vo/academy/AcademyAccountVO.java new file mode 100644 index 0000000..c0995bc --- /dev/null +++ b/src/main/java/com/subsidy/vo/academy/AcademyAccountVO.java @@ -0,0 +1,27 @@ +package com.subsidy.vo.academy; + +import com.subsidy.model.AcademyDictDO; +import lombok.Data; + +import java.util.List; + +@Data +public class AcademyAccountVO { + + private Long id; + + private String userName; + + private String password; + + private String telephone; + + private String remark; + + private String role; + + private String accountName; + + private List academyDictDOS; + +} diff --git a/src/main/java/com/subsidy/vo/academy/AllAcademyMembersVO.java b/src/main/java/com/subsidy/vo/academy/AllAcademyMembersVO.java new file mode 100644 index 0000000..5b58f21 --- /dev/null +++ b/src/main/java/com/subsidy/vo/academy/AllAcademyMembersVO.java @@ -0,0 +1,7 @@ +package com.subsidy.vo.academy; + +import lombok.Data; + +@Data +public class AllAcademyMembersVO { +} diff --git a/src/main/java/com/subsidy/vo/labor/LaborAccountVO.java b/src/main/java/com/subsidy/vo/labor/LaborAccountVO.java new file mode 100644 index 0000000..7275789 --- /dev/null +++ b/src/main/java/com/subsidy/vo/labor/LaborAccountVO.java @@ -0,0 +1,29 @@ +package com.subsidy.vo.labor; + +import com.subsidy.model.LaborServiceDictDO; +import lombok.Data; + +import java.util.List; + +@Data +public class LaborAccountVO { + + private Long id; + + private Long laborId; + + private String userName; + + private String password; + + private String telephone; + + private String remark; + + private String role; + + private String accountName; + + private List laborServiceDictDOS; + +} diff --git a/src/main/java/com/subsidy/vo/labor/LaborsVO.java b/src/main/java/com/subsidy/vo/labor/LaborsVO.java new file mode 100644 index 0000000..e2ca04a --- /dev/null +++ b/src/main/java/com/subsidy/vo/labor/LaborsVO.java @@ -0,0 +1,22 @@ +package com.subsidy.vo.labor; + +import lombok.Data; + +@Data +public class LaborsVO { + + private Long id; + + private String laborServiceName; + + private String shortName; + + private String location; + + private String serviceCode; + + private String accountName; + + private String password; + +} diff --git a/src/main/java/com/subsidy/vo/labor/TalentManagementVO.java b/src/main/java/com/subsidy/vo/labor/TalentManagementVO.java new file mode 100644 index 0000000..baa5790 --- /dev/null +++ b/src/main/java/com/subsidy/vo/labor/TalentManagementVO.java @@ -0,0 +1,26 @@ +package com.subsidy.vo.labor; + +import lombok.Data; + +@Data +public class TalentManagementVO { + + private Long id; + + private String userName; + + private String gender; + + private String telephone; + + private String idCard; + + private String email; + + private String payrollAccount; + + private String bank; + + private String wechatStatus; + +} diff --git a/src/main/java/com/subsidy/vo/member/AcademyMembersVO.java b/src/main/java/com/subsidy/vo/member/AcademyMembersVO.java new file mode 100644 index 0000000..f11a677 --- /dev/null +++ b/src/main/java/com/subsidy/vo/member/AcademyMembersVO.java @@ -0,0 +1,31 @@ +package com.subsidy.vo.member; + +import lombok.Data; + +@Data +public class AcademyMembersVO { + + private Long id; + + private String userName; + + private String status; + + private String accountName; + + private String gender; + + private String telephone; + + private String idCard; + + private String email; + + private String college; + + private String major; + + private String practiceStatus; + + private String enrollmentYear; +} diff --git a/src/main/java/com/subsidy/vo/member/DetailVO.java b/src/main/java/com/subsidy/vo/member/DetailVO.java new file mode 100644 index 0000000..c313bf2 --- /dev/null +++ b/src/main/java/com/subsidy/vo/member/DetailVO.java @@ -0,0 +1,16 @@ +package com.subsidy.vo.member; + +import lombok.Data; + +@Data +public class DetailVO { + + private Long id; + + private String projectName; + + private String jobName; + + private String hireTime; + +} diff --git a/src/main/java/com/subsidy/vo/tree/TreesVO.java b/src/main/java/com/subsidy/vo/tree/TreesVO.java new file mode 100644 index 0000000..157199c --- /dev/null +++ b/src/main/java/com/subsidy/vo/tree/TreesVO.java @@ -0,0 +1,18 @@ +package com.subsidy.vo.tree; + +import lombok.Data; + +import java.util.List; + +@Data +public class TreesVO { + + private Long id; + + private Long parentId; + + private String treeName; + + private List treesVOS; + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cc0c047..75a5fad 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ -# 环境配置 -spring.profiles.active=prod +# 环境配置 平台端 +spring.profiles.active=dev #和CPU数 spring.server.acceptorThreadCount=600 spring.server.minSpareThreads=100 @@ -11,6 +11,10 @@ spring.server.connectionTimeout=20000 spring.server.protocol=org.apache.coyote.http11.Http11AprProtocol spring.server.redirectPort=8443 spring.server.compression=on +#jmx配置 +spring.jmx.enabled=true +spring.jmx.default-domain=116.62.57.92 +spring.jmx.port=1099 #文件请求大小 spring.server.MaxFileSize=300MB spring.server.MaxRequestSize=500MB @@ -78,3 +82,4 @@ polyv.userId=b8f2d3bfdc polyv.appId=g3lrxnzd75 polyv.appSecret=ef9cdcbbb9184b61aca301ba8114d570 polyv.secretKey=03sqxr97fo + diff --git a/src/main/resources/code.properties b/src/main/resources/code.properties index 4a1e0fb..49ba659 100644 --- a/src/main/resources/code.properties +++ b/src/main/resources/code.properties @@ -23,6 +23,7 @@ meishu.code-message[10026]=姓名或身份证号格式不正确 meishu.code-message[10027]=该手机号已注册 meishu.code-message[10028]=该成员已在其他公司入职 meishu.code-message[10029]=密码输入错误 +meishu.code-message[10030]=该院校已存在 meishu.code-message[20001]=该课程已存在 meishu.code-message[20002]=该成员已存在 diff --git a/src/main/resources/mapper/AcademyCollegeDictMapper.xml b/src/main/resources/mapper/AcademyCollegeDictMapper.xml new file mode 100644 index 0000000..d00b575 --- /dev/null +++ b/src/main/resources/mapper/AcademyCollegeDictMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/src/main/resources/mapper/AcademyDictMapper.xml b/src/main/resources/mapper/AcademyDictMapper.xml new file mode 100644 index 0000000..23bd494 --- /dev/null +++ b/src/main/resources/mapper/AcademyDictMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/AcademyMajorDictMapper.xml b/src/main/resources/mapper/AcademyMajorDictMapper.xml new file mode 100644 index 0000000..54b125e --- /dev/null +++ b/src/main/resources/mapper/AcademyMajorDictMapper.xml @@ -0,0 +1,17 @@ + + + + + + + diff --git a/src/main/resources/mapper/AdministerAcademyMappingMapper.xml b/src/main/resources/mapper/AdministerAcademyMappingMapper.xml new file mode 100644 index 0000000..1e41628 --- /dev/null +++ b/src/main/resources/mapper/AdministerAcademyMappingMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, administer_id, academy_id + + + diff --git a/src/main/resources/mapper/AdministerLaborMappingMapper.xml b/src/main/resources/mapper/AdministerLaborMappingMapper.xml new file mode 100644 index 0000000..6851515 --- /dev/null +++ b/src/main/resources/mapper/AdministerLaborMappingMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, administer_id, labor_id + + + diff --git a/src/main/resources/mapper/AdministerMapper.xml b/src/main/resources/mapper/AdministerMapper.xml index af6421e..89598cd 100644 --- a/src/main/resources/mapper/AdministerMapper.xml +++ b/src/main/resources/mapper/AdministerMapper.xml @@ -118,6 +118,18 @@ and t.administer_id = #{id} + + diff --git a/src/main/resources/mapper/CompanyDictMapper.xml b/src/main/resources/mapper/CompanyDictMapper.xml index c38881d..09c92b6 100644 --- a/src/main/resources/mapper/CompanyDictMapper.xml +++ b/src/main/resources/mapper/CompanyDictMapper.xml @@ -4,8 +4,13 @@ @@ -71,6 +88,7 @@ and ( t5.member_status = #{memberStatus} or t5.member_status is null) + and t.member_type = 2 diff --git a/src/main/resources/mapper/LaborGroupDictMapper.xml b/src/main/resources/mapper/LaborGroupDictMapper.xml new file mode 100644 index 0000000..1f8e158 --- /dev/null +++ b/src/main/resources/mapper/LaborGroupDictMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, labor_id, parent_id, group_name + + + diff --git a/src/main/resources/mapper/LaborServiceDictMapper.xml b/src/main/resources/mapper/LaborServiceDictMapper.xml new file mode 100644 index 0000000..67cfc8c --- /dev/null +++ b/src/main/resources/mapper/LaborServiceDictMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + diff --git a/src/main/resources/mapper/MemberMapper.xml b/src/main/resources/mapper/MemberMapper.xml index f900ea0..9b73151 100644 --- a/src/main/resources/mapper/MemberMapper.xml +++ b/src/main/resources/mapper/MemberMapper.xml @@ -2,38 +2,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - create_date, - update_date, - delete_date, - id, user_name, account_name, account_name_en, email, work_no, induction_date, telephone, password, gender, image, check_image, check_time, id_card, id_card_photo, status, first_login, qq_no, wechat - + diff --git a/src/main/resources/mapper/ProductDictMapper.xml b/src/main/resources/mapper/ProductDictMapper.xml index 2d8fabb..13dee35 100644 --- a/src/main/resources/mapper/ProductDictMapper.xml +++ b/src/main/resources/mapper/ProductDictMapper.xml @@ -2,7 +2,7 @@ - SELECT * FROM @@ -10,5 +10,12 @@ WHERE t.delete_date IS NULL AND t.product_name like concat('%',#{productName} ,'%') + and t.product_type = #{productType} + order by t.order_no + + + update product_dict set order_no = #{orderNo} where id = #{id} + + diff --git a/src/main/resources/mapper/ProjectMemberMappingMapper.xml b/src/main/resources/mapper/ProjectMemberMappingMapper.xml new file mode 100644 index 0000000..4ac34bd --- /dev/null +++ b/src/main/resources/mapper/ProjectMemberMappingMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/src/main/resources/mapper/ServiceCompanyFilesMapper.xml b/src/main/resources/mapper/ServiceCompanyFilesMapper.xml index 43cb87d..5309394 100644 --- a/src/main/resources/mapper/ServiceCompanyFilesMapper.xml +++ b/src/main/resources/mapper/ServiceCompanyFilesMapper.xml @@ -9,13 +9,13 @@ service_company_files t WHERE t.delete_date IS NULL - - AND t.service_company_id = #{serviceCompanyId} - AND t.file_name like concat('%',#{fileName} ,'%') - and t.file_type = #{fileType} + and t.tree_id in + + #{id} + diff --git a/src/main/resources/mapper/ServiceFileTreeMapper.xml b/src/main/resources/mapper/ServiceFileTreeMapper.xml new file mode 100644 index 0000000..09cb5d7 --- /dev/null +++ b/src/main/resources/mapper/ServiceFileTreeMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + create_date, + update_date, + delete_date, + id, company_id, parent_id, tree_name + + + diff --git a/target/classes/META-INF/subsidy.kotlin_module b/target/classes/META-INF/subsidy.kotlin_module deleted file mode 100644 index a49347a..0000000 Binary files a/target/classes/META-INF/subsidy.kotlin_module and /dev/null differ diff --git a/target/classes/application.properties b/target/classes/application.properties index cc0c047..75a5fad 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,5 +1,5 @@ -# 环境配置 -spring.profiles.active=prod +# 环境配置 平台端 +spring.profiles.active=dev #和CPU数 spring.server.acceptorThreadCount=600 spring.server.minSpareThreads=100 @@ -11,6 +11,10 @@ spring.server.connectionTimeout=20000 spring.server.protocol=org.apache.coyote.http11.Http11AprProtocol spring.server.redirectPort=8443 spring.server.compression=on +#jmx配置 +spring.jmx.enabled=true +spring.jmx.default-domain=116.62.57.92 +spring.jmx.port=1099 #文件请求大小 spring.server.MaxFileSize=300MB spring.server.MaxRequestSize=500MB @@ -78,3 +82,4 @@ polyv.userId=b8f2d3bfdc polyv.appId=g3lrxnzd75 polyv.appSecret=ef9cdcbbb9184b61aca301ba8114d570 polyv.secretKey=03sqxr97fo + diff --git a/target/classes/code.properties b/target/classes/code.properties index 4a1e0fb..49ba659 100644 --- a/target/classes/code.properties +++ b/target/classes/code.properties @@ -23,6 +23,7 @@ meishu.code-message[10026]=姓名或身份证号格式不正确 meishu.code-message[10027]=该手机号已注册 meishu.code-message[10028]=该成员已在其他公司入职 meishu.code-message[10029]=密码输入错误 +meishu.code-message[10030]=该院校已存在 meishu.code-message[20001]=该课程已存在 meishu.code-message[20002]=该成员已存在 diff --git a/target/classes/com/subsidy/controller/CompanyDictController.class b/target/classes/com/subsidy/controller/CompanyDictController.class index 90203f2..0335fe8 100644 Binary files a/target/classes/com/subsidy/controller/CompanyDictController.class and b/target/classes/com/subsidy/controller/CompanyDictController.class differ diff --git a/target/classes/com/subsidy/controller/MemberController.class b/target/classes/com/subsidy/controller/MemberController.class index 2becb9c..47568d9 100644 Binary files a/target/classes/com/subsidy/controller/MemberController.class and b/target/classes/com/subsidy/controller/MemberController.class differ diff --git a/target/classes/com/subsidy/controller/ProductDictController.class b/target/classes/com/subsidy/controller/ProductDictController.class index 968e159..121cbce 100644 Binary files a/target/classes/com/subsidy/controller/ProductDictController.class and b/target/classes/com/subsidy/controller/ProductDictController.class differ diff --git a/target/classes/com/subsidy/controller/ServiceCompanyFilesController.class b/target/classes/com/subsidy/controller/ServiceCompanyFilesController.class index 229473a..ad93fde 100644 Binary files a/target/classes/com/subsidy/controller/ServiceCompanyFilesController.class and b/target/classes/com/subsidy/controller/ServiceCompanyFilesController.class differ diff --git a/target/classes/com/subsidy/dto/company/CompanyFilesDTO.class b/target/classes/com/subsidy/dto/company/CompanyFilesDTO.class index 4373040..0c25a98 100644 Binary files a/target/classes/com/subsidy/dto/company/CompanyFilesDTO.class and b/target/classes/com/subsidy/dto/company/CompanyFilesDTO.class differ diff --git a/target/classes/com/subsidy/dto/product/AllProductsDTO.class b/target/classes/com/subsidy/dto/product/AllProductsDTO.class index 2a51fa3..b3ffad5 100644 Binary files a/target/classes/com/subsidy/dto/product/AllProductsDTO.class and b/target/classes/com/subsidy/dto/product/AllProductsDTO.class differ diff --git a/target/classes/com/subsidy/mapper/AdministerMapper.class b/target/classes/com/subsidy/mapper/AdministerMapper.class index c27125b..db139e8 100644 Binary files a/target/classes/com/subsidy/mapper/AdministerMapper.class and b/target/classes/com/subsidy/mapper/AdministerMapper.class differ diff --git a/target/classes/com/subsidy/mapper/MemberMapper.class b/target/classes/com/subsidy/mapper/MemberMapper.class index 2b1851e..695179b 100644 Binary files a/target/classes/com/subsidy/mapper/MemberMapper.class and b/target/classes/com/subsidy/mapper/MemberMapper.class differ diff --git a/target/classes/com/subsidy/mapper/ProductDictMapper.class b/target/classes/com/subsidy/mapper/ProductDictMapper.class index fce52ba..dc72706 100644 Binary files a/target/classes/com/subsidy/mapper/ProductDictMapper.class and b/target/classes/com/subsidy/mapper/ProductDictMapper.class differ diff --git a/target/classes/com/subsidy/mapper/ServiceCompanyFilesMapper.class b/target/classes/com/subsidy/mapper/ServiceCompanyFilesMapper.class index 2a56b43..5810345 100644 Binary files a/target/classes/com/subsidy/mapper/ServiceCompanyFilesMapper.class and b/target/classes/com/subsidy/mapper/ServiceCompanyFilesMapper.class differ diff --git a/target/classes/com/subsidy/model/AdministerDO.class b/target/classes/com/subsidy/model/AdministerDO.class index 0245381..ef94fa9 100644 Binary files a/target/classes/com/subsidy/model/AdministerDO.class and b/target/classes/com/subsidy/model/AdministerDO.class differ diff --git a/target/classes/com/subsidy/model/MemberDO.class b/target/classes/com/subsidy/model/MemberDO.class index 7bfb1a8..ad7fed7 100644 Binary files a/target/classes/com/subsidy/model/MemberDO.class and b/target/classes/com/subsidy/model/MemberDO.class differ diff --git a/target/classes/com/subsidy/model/ProductDictDO.class b/target/classes/com/subsidy/model/ProductDictDO.class index 9006131..5e245a6 100644 Binary files a/target/classes/com/subsidy/model/ProductDictDO.class and b/target/classes/com/subsidy/model/ProductDictDO.class differ diff --git a/target/classes/com/subsidy/model/ServiceCompanyFilesDO.class b/target/classes/com/subsidy/model/ServiceCompanyFilesDO.class index 1964436..99bc2b3 100644 Binary files a/target/classes/com/subsidy/model/ServiceCompanyFilesDO.class and b/target/classes/com/subsidy/model/ServiceCompanyFilesDO.class differ diff --git a/target/classes/com/subsidy/service/MemberService.class b/target/classes/com/subsidy/service/MemberService.class index 77a1266..926eb64 100644 Binary files a/target/classes/com/subsidy/service/MemberService.class and b/target/classes/com/subsidy/service/MemberService.class differ diff --git a/target/classes/com/subsidy/service/ProductDictService.class b/target/classes/com/subsidy/service/ProductDictService.class index a50a149..d900450 100644 Binary files a/target/classes/com/subsidy/service/ProductDictService.class and b/target/classes/com/subsidy/service/ProductDictService.class differ diff --git a/target/classes/com/subsidy/service/impl/AdministerServiceImpl.class b/target/classes/com/subsidy/service/impl/AdministerServiceImpl.class index f72ba7d..dde39b9 100644 Binary files a/target/classes/com/subsidy/service/impl/AdministerServiceImpl.class and b/target/classes/com/subsidy/service/impl/AdministerServiceImpl.class differ diff --git a/target/classes/com/subsidy/service/impl/CompanyDictServiceImpl.class b/target/classes/com/subsidy/service/impl/CompanyDictServiceImpl.class index 11bf79a..8abc0f6 100644 Binary files a/target/classes/com/subsidy/service/impl/CompanyDictServiceImpl.class and b/target/classes/com/subsidy/service/impl/CompanyDictServiceImpl.class differ diff --git a/target/classes/com/subsidy/service/impl/MemberServiceImpl.class b/target/classes/com/subsidy/service/impl/MemberServiceImpl.class index f140f44..698efd8 100644 Binary files a/target/classes/com/subsidy/service/impl/MemberServiceImpl.class and b/target/classes/com/subsidy/service/impl/MemberServiceImpl.class differ diff --git a/target/classes/com/subsidy/service/impl/ProductDictServiceImpl.class b/target/classes/com/subsidy/service/impl/ProductDictServiceImpl.class index 702864a..40d52c0 100644 Binary files a/target/classes/com/subsidy/service/impl/ProductDictServiceImpl.class and b/target/classes/com/subsidy/service/impl/ProductDictServiceImpl.class differ diff --git a/target/classes/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.class b/target/classes/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.class index 5a05ac0..9fe1e37 100644 Binary files a/target/classes/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.class and b/target/classes/com/subsidy/service/impl/ServiceCompanyFilesServiceImpl.class differ diff --git a/target/classes/mapper/AdministerMapper.xml b/target/classes/mapper/AdministerMapper.xml index af6421e..89598cd 100644 --- a/target/classes/mapper/AdministerMapper.xml +++ b/target/classes/mapper/AdministerMapper.xml @@ -118,6 +118,18 @@ and t.administer_id = #{id} + + diff --git a/target/classes/mapper/CompanyDictMapper.xml b/target/classes/mapper/CompanyDictMapper.xml index c38881d..09c92b6 100644 --- a/target/classes/mapper/CompanyDictMapper.xml +++ b/target/classes/mapper/CompanyDictMapper.xml @@ -4,8 +4,13 @@ @@ -71,6 +88,7 @@ and ( t5.member_status = #{memberStatus} or t5.member_status is null) + and t.member_type = 2 diff --git a/target/classes/mapper/MemberMapper.xml b/target/classes/mapper/MemberMapper.xml index f900ea0..9b73151 100644 --- a/target/classes/mapper/MemberMapper.xml +++ b/target/classes/mapper/MemberMapper.xml @@ -2,38 +2,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - create_date, - update_date, - delete_date, - id, user_name, account_name, account_name_en, email, work_no, induction_date, telephone, password, gender, image, check_image, check_time, id_card, id_card_photo, status, first_login, qq_no, wechat - + diff --git a/target/classes/mapper/ProductDictMapper.xml b/target/classes/mapper/ProductDictMapper.xml index 2d8fabb..13dee35 100644 --- a/target/classes/mapper/ProductDictMapper.xml +++ b/target/classes/mapper/ProductDictMapper.xml @@ -2,7 +2,7 @@ - SELECT * FROM @@ -10,5 +10,12 @@ WHERE t.delete_date IS NULL AND t.product_name like concat('%',#{productName} ,'%') + and t.product_type = #{productType} + order by t.order_no + + + update product_dict set order_no = #{orderNo} where id = #{id} + + diff --git a/target/classes/mapper/ServiceCompanyFilesMapper.xml b/target/classes/mapper/ServiceCompanyFilesMapper.xml index 43cb87d..5309394 100644 --- a/target/classes/mapper/ServiceCompanyFilesMapper.xml +++ b/target/classes/mapper/ServiceCompanyFilesMapper.xml @@ -9,13 +9,13 @@ service_company_files t WHERE t.delete_date IS NULL - - AND t.service_company_id = #{serviceCompanyId} - AND t.file_name like concat('%',#{fileName} ,'%') - and t.file_type = #{fileType} + and t.tree_id in + + #{id} + diff --git a/target/subsidy-center.jar b/target/subsidy-center.jar index e9dd909..6913ced 100644 Binary files a/target/subsidy-center.jar and b/target/subsidy-center.jar differ diff --git a/target/subsidy-center.jar.original b/target/subsidy-center.jar.original index fc1c9da..7a11541 100644 Binary files a/target/subsidy-center.jar.original and b/target/subsidy-center.jar.original differ