From ae14c7086140fd4198f87c540e1c8411803705a3 Mon Sep 17 00:00:00 2001 From: zhuyy Date: Fri, 3 Feb 2023 11:44:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=91=A3=E7=9B=91=E4=BB=BB=E5=85=8D?= =?UTF-8?q?=E7=94=B3=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydool/common/constant/UrlConstant.java | 1 + .../DirectorsSupervisorsController.java | 51 ++++++++++ .../controller/OrganizationController.java | 7 ++ .../staff/dto/DirectorsSupervisorsDto.java | 26 +++++ .../staff/entity/DirectorsSupervisors.java | 99 +++++++++++++++++++ .../mapper/DirectorsSupervisorsMapper.java | 18 ++++ .../service/IDirectorsSupervisorsService.java | 27 +++++ .../staff/service/IOrganizationService.java | 2 + .../impl/DirectorsSupervisorsServiceImpl.java | 71 +++++++++++++ .../service/impl/OrganizationServiceImpl.java | 5 + 10 files changed, 307 insertions(+) create mode 100644 src/main/java/com/ydool/staff/controller/DirectorsSupervisorsController.java create mode 100644 src/main/java/com/ydool/staff/dto/DirectorsSupervisorsDto.java create mode 100644 src/main/java/com/ydool/staff/entity/DirectorsSupervisors.java create mode 100644 src/main/java/com/ydool/staff/mapper/DirectorsSupervisorsMapper.java create mode 100644 src/main/java/com/ydool/staff/service/IDirectorsSupervisorsService.java create mode 100644 src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java diff --git a/src/main/java/com/ydool/common/constant/UrlConstant.java b/src/main/java/com/ydool/common/constant/UrlConstant.java index c1df340..acdf8a2 100644 --- a/src/main/java/com/ydool/common/constant/UrlConstant.java +++ b/src/main/java/com/ydool/common/constant/UrlConstant.java @@ -29,6 +29,7 @@ public interface UrlConstant { String MECHANISM = API + "/mechanism"; String ORGANIZATION = API + "/organization"; String PARTY_ORGANIZATION = API + "/party_organization"; + String DIRECTORS_SUPERVISORS = API + "/directors_supervisors"; diff --git a/src/main/java/com/ydool/staff/controller/DirectorsSupervisorsController.java b/src/main/java/com/ydool/staff/controller/DirectorsSupervisorsController.java new file mode 100644 index 0000000..de5568a --- /dev/null +++ b/src/main/java/com/ydool/staff/controller/DirectorsSupervisorsController.java @@ -0,0 +1,51 @@ +package com.ydool.staff.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ydool.common.base.BaseController; +import com.ydool.common.constant.UrlConstant; +import com.ydool.common.data.dto.AjaxResult; +import com.ydool.staff.dto.DirectorsSupervisorsDto; +import com.ydool.staff.entity.DirectorsSupervisors; +import com.ydool.staff.service.IDirectorsSupervisorsService; +import com.ydool.system.request.IdsRequest; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping(UrlConstant.DIRECTORS_SUPERVISORS) +@Api(tags = "董监任免申报", value = "董监任免申报") +public class DirectorsSupervisorsController extends BaseController { + + @Autowired + IDirectorsSupervisorsService directorsSupervisorsService; + + @GetMapping("/selectDirectorsSupervisorsList") + @ApiOperation(value = "董监任免申报列表") + @ApiImplicitParams({@ApiImplicitParam(name = "current", value = "当前页", dataType = "Integer"), @ApiImplicitParam(name = "size", value = "每页条数", dataType = "Integer"),}) + public AjaxResult selectDirectorsSupervisorsList(DirectorsSupervisorsDto directorsSupervisorsDto) { + return directorsSupervisorsService.selectDirectorsSupervisorsList(new Page<>(getPageNum(), getPageSize()), directorsSupervisorsDto); + } + + @PostMapping("/saveDirectorsSupervisors") + @ApiOperation(value = "新增董监任免申报") + public AjaxResult saveDirectorsSupervisors(@RequestBody @Validated DirectorsSupervisors directorsSupervisors) { + return directorsSupervisorsService.saveDirectorsSupervisors(directorsSupervisors); + } + + @PutMapping("/editDirectorsSupervisors") + @ApiOperation(value = "修改董监任免申报") + public AjaxResult editDirectorsSupervisors(@RequestBody @Validated DirectorsSupervisors directorsSupervisors) { + return directorsSupervisorsService.editDirectorsSupervisors(directorsSupervisors); + } + + @PostMapping("/deleteDirectorsSupervisors") + @ApiOperation(value = "删除董监任免申报") + public AjaxResult deleteDirectorsSupervisors(@RequestBody IdsRequest ids) { + return directorsSupervisorsService.deleteDirectorsSupervisors(ids); + } +} diff --git a/src/main/java/com/ydool/staff/controller/OrganizationController.java b/src/main/java/com/ydool/staff/controller/OrganizationController.java index dacae82..721956f 100644 --- a/src/main/java/com/ydool/staff/controller/OrganizationController.java +++ b/src/main/java/com/ydool/staff/controller/OrganizationController.java @@ -21,6 +21,13 @@ public class OrganizationController extends BaseController { @Autowired IOrganizationService organizationService; + @GetMapping("/selectOrganizationByName") + @ApiOperation(value = "企业名称查企业信息") + @ApiImplicitParams({@ApiImplicitParam(name = "companyName", value = "企业名称", required = true)}) + public AjaxResult selectOrganizationByName(String companyName) { + return organizationService.selectOrganizationByName(companyName); + } + @GetMapping("/selectOrganizationList") @ApiOperation(value = "内设机构登记列表") @ApiImplicitParams({@ApiImplicitParam(name = "companyName", value = "企业名称"), @ApiImplicitParam(name = "current", value = "当前页", dataType = "Integer"), @ApiImplicitParam(name = "size", value = "每页条数", dataType = "Integer"),}) diff --git a/src/main/java/com/ydool/staff/dto/DirectorsSupervisorsDto.java b/src/main/java/com/ydool/staff/dto/DirectorsSupervisorsDto.java new file mode 100644 index 0000000..7f96e86 --- /dev/null +++ b/src/main/java/com/ydool/staff/dto/DirectorsSupervisorsDto.java @@ -0,0 +1,26 @@ +package com.ydool.staff.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DirectorsSupervisorsDto { + + @ApiModelProperty(value = "姓名") + private String username; + + @ApiModelProperty(value = "董监类型") + private String directorsType; + + @ApiModelProperty(value = "人员类型") + private String personnelType; + + @ApiModelProperty(value = "政治面貌") + private String politicsStatus; + + @ApiModelProperty(value = "人员状态") + private String personnelStatus; + + @ApiModelProperty(value = "单据状态") + private String documentStatus; +} diff --git a/src/main/java/com/ydool/staff/entity/DirectorsSupervisors.java b/src/main/java/com/ydool/staff/entity/DirectorsSupervisors.java new file mode 100644 index 0000000..500c455 --- /dev/null +++ b/src/main/java/com/ydool/staff/entity/DirectorsSupervisors.java @@ -0,0 +1,99 @@ +package com.ydool.staff.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.ydool.common.base.BaseEntity; + +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + *

+ * + *

+ * + * @author msf + * @since 2023-02-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@TableName("t_lc_directors_supervisors") +@ApiModel(value = "DirectorsSupervisors对象", description = "") +public class DirectorsSupervisors extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "姓名") + @NotBlank(message = "姓名不能为空") + private String username; + + @ApiModelProperty(value = "性别") + @NotNull(message = "性别不能为空") + private Integer sex; + + @ApiModelProperty(value = "出生年月") + @NotNull(message = "出生年月不能为空") + private Date dataBirth; + + @ApiModelProperty(value = "身份证") + @NotBlank(message = "身份证不能为空") + private String identityCard; + + @ApiModelProperty(value = "董监类型") + @NotBlank(message = "董监类型不能为空") + private String directorsType; + + @ApiModelProperty(value = "人员类型") + @NotBlank(message = "人员类型不能为空") + private String personnelType; + + @ApiModelProperty(value = "政治面貌") + @NotBlank(message = "政治面貌不能为空") + private String politicsStatus; + + @ApiModelProperty(value = "工作单位") + @NotBlank(message = "工作单位不能为空") + private String workUnit; + + @ApiModelProperty(value = "职务") + @NotBlank(message = "职务不能为空") + private String job; + + @ApiModelProperty(value = "任命文件") + @NotBlank(message = "任命文件不能为空") + private String appointment; + + @ApiModelProperty(value = "任职开始时间") + @NotNull(message = "任职开始时间不能为空") + private Date serviceStartTime; + + @ApiModelProperty(value = "任职结束时间") + private Date serviceEndTime; + + @ApiModelProperty(value = "人员状态") + private String personnelStatus; + + @ApiModelProperty(value = "离职时间") + private Date dimissionTime; + + @ApiModelProperty(value = "离职原因") + private String dimissionCause; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "相关附件") + @NotBlank(message = "相关附件不能为空") + private String correlationFile; + + @ApiModelProperty(value = "单据状态") + private String documentStatus; +} diff --git a/src/main/java/com/ydool/staff/mapper/DirectorsSupervisorsMapper.java b/src/main/java/com/ydool/staff/mapper/DirectorsSupervisorsMapper.java new file mode 100644 index 0000000..6f3d3ad --- /dev/null +++ b/src/main/java/com/ydool/staff/mapper/DirectorsSupervisorsMapper.java @@ -0,0 +1,18 @@ +package com.ydool.staff.mapper; + +import com.ydool.staff.entity.DirectorsSupervisors; +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author msf + * @since 2023-02-03 + */ +@Mapper +public interface DirectorsSupervisorsMapper extends MPJBaseMapper { + +} diff --git a/src/main/java/com/ydool/staff/service/IDirectorsSupervisorsService.java b/src/main/java/com/ydool/staff/service/IDirectorsSupervisorsService.java new file mode 100644 index 0000000..c91301a --- /dev/null +++ b/src/main/java/com/ydool/staff/service/IDirectorsSupervisorsService.java @@ -0,0 +1,27 @@ +package com.ydool.staff.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ydool.common.data.dto.AjaxResult; +import com.ydool.staff.dto.DirectorsSupervisorsDto; +import com.ydool.staff.entity.DirectorsSupervisors; +import com.ydool.system.request.IdsRequest; + +/** + *

+ * 服务类 + *

+ * + * @author msf + * @since 2023-02-03 + */ +public interface IDirectorsSupervisorsService { + + AjaxResult selectDirectorsSupervisorsList(Page page, DirectorsSupervisorsDto directorsSupervisorsDto); + + AjaxResult saveDirectorsSupervisors(DirectorsSupervisors directorsSupervisors); + + AjaxResult editDirectorsSupervisors(DirectorsSupervisors directorsSupervisors); + + AjaxResult deleteDirectorsSupervisors(IdsRequest ids); +} + diff --git a/src/main/java/com/ydool/staff/service/IOrganizationService.java b/src/main/java/com/ydool/staff/service/IOrganizationService.java index 3b5b6b6..4a5fc3c 100644 --- a/src/main/java/com/ydool/staff/service/IOrganizationService.java +++ b/src/main/java/com/ydool/staff/service/IOrganizationService.java @@ -20,5 +20,7 @@ public interface IOrganizationService { AjaxResult selectOrganizationByMechanism(String id); AjaxResult deleteOrganization(IdsRequest id); + + AjaxResult selectOrganizationByName(String companyName); } diff --git a/src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java new file mode 100644 index 0000000..0e58bfe --- /dev/null +++ b/src/main/java/com/ydool/staff/service/impl/DirectorsSupervisorsServiceImpl.java @@ -0,0 +1,71 @@ +package com.ydool.staff.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ydool.common.data.dto.AjaxResult; +import com.ydool.staff.dto.DirectorsSupervisorsDto; +import com.ydool.staff.entity.DirectorsSupervisors; +import com.ydool.common.base.BaseService; +import com.ydool.staff.mapper.DirectorsSupervisorsMapper; +import com.ydool.staff.service.IDirectorsSupervisorsService; +import com.ydool.system.request.IdsRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; + +/** + *

+ * 服务类 + *

+ * + * @author msf + * @since 2023-02-03 + */ +@Service +public class DirectorsSupervisorsServiceImpl extends BaseService implements IDirectorsSupervisorsService { + + @Autowired + DirectorsSupervisorsMapper directorsSupervisorsMapper; + + @Override + public AjaxResult selectDirectorsSupervisorsList(Page page, DirectorsSupervisorsDto directorsSupervisorsDto) { + LambdaQueryWrapper directorsSupervisorsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + directorsSupervisorsLambdaQueryWrapper.eq(StrUtil.isNotBlank(directorsSupervisorsDto.getUsername()), DirectorsSupervisors::getUsername, directorsSupervisorsDto.getUsername()); + directorsSupervisorsLambdaQueryWrapper.eq(StrUtil.isNotBlank(directorsSupervisorsDto.getDirectorsType()), DirectorsSupervisors::getDirectorsType, directorsSupervisorsDto.getDirectorsType()); + directorsSupervisorsLambdaQueryWrapper.eq(StrUtil.isNotBlank(directorsSupervisorsDto.getPersonnelType()), DirectorsSupervisors::getPersonnelType, directorsSupervisorsDto.getPersonnelType()); + directorsSupervisorsLambdaQueryWrapper.eq(StrUtil.isNotBlank(directorsSupervisorsDto.getPoliticsStatus()), DirectorsSupervisors::getPoliticsStatus, directorsSupervisorsDto.getPoliticsStatus()); + directorsSupervisorsLambdaQueryWrapper.eq(StrUtil.isNotBlank(directorsSupervisorsDto.getPersonnelStatus()), DirectorsSupervisors::getPersonnelStatus, directorsSupervisorsDto.getPersonnelStatus()); + Page directorsSupervisors = directorsSupervisorsMapper.selectPage(page, directorsSupervisorsLambdaQueryWrapper); + return AjaxResult.ok().data(directorsSupervisors); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult saveDirectorsSupervisors(DirectorsSupervisors directorsSupervisors) { + int i = directorsSupervisorsMapper.insert(directorsSupervisors); + return i > 0 ? AjaxResult.ok().msg("新增成功！") : AjaxResult.fail().msg("新增失败！"); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult editDirectorsSupervisors(DirectorsSupervisors directorsSupervisors) { + int i = directorsSupervisorsMapper.updateById(directorsSupervisors); + return i > 0 ? AjaxResult.ok().msg("修改成功！") : AjaxResult.fail().msg("修改失败！"); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult deleteDirectorsSupervisors(IdsRequest ids) { + if (CollectionUtil.isEmpty(Arrays.asList(ids.getIds()))) { + return AjaxResult.fail().msg("Id不能为空！"); + } else { + int i = directorsSupervisorsMapper.deleteBatchIds(Arrays.asList(ids.getIds())); + return i > 0 ? AjaxResult.ok().msg("删除成功！") : AjaxResult.fail().msg("删除失败！"); + } + } +} + diff --git a/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java index 38e01f8..e68b5b1 100644 --- a/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/OrganizationServiceImpl.java @@ -75,5 +75,10 @@ public class OrganizationServiceImpl extends BaseService 0 ? AjaxResult.ok().msg("删除成功！") : AjaxResult.fail().msg("删除失败！"); } } + + @Override + public AjaxResult selectOrganizationByName(String companyName) { + return AjaxResult.ok().data(organizationMapper.selectOne(new LambdaQueryWrapper().eq(Organization::getCompanyName, companyName))); + } } From 40c03a342de94001dfc534f01adf4173aeca51df Mon Sep 17 00:00:00 2001 From: zhuyy Date: Fri, 3 Feb 2023 11:56:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=91=A3=E7=9B=91=E4=BB=BB=E5=85=8D?= =?UTF-8?q?=E7=94=B3=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ydool/staff/entity/DirectorsSupervisors.java | 4 ++++ .../com/ydool/staff/service/impl/MechanismServiceImpl.java | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ydool/staff/entity/DirectorsSupervisors.java b/src/main/java/com/ydool/staff/entity/DirectorsSupervisors.java index 500c455..1bf2c95 100644 --- a/src/main/java/com/ydool/staff/entity/DirectorsSupervisors.java +++ b/src/main/java/com/ydool/staff/entity/DirectorsSupervisors.java @@ -31,6 +31,10 @@ public class DirectorsSupervisors extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "企业Id") + @NotBlank(message = "企业Id不能为空") + private String organizationId; + @ApiModelProperty(value = "姓名") @NotBlank(message = "姓名不能为空") private String username; diff --git a/src/main/java/com/ydool/staff/service/impl/MechanismServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/MechanismServiceImpl.java index c318078..91ca391 100644 --- a/src/main/java/com/ydool/staff/service/impl/MechanismServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/MechanismServiceImpl.java @@ -44,13 +44,6 @@ public class MechanismServiceImpl extends BaseService 0 ? AjaxResult.ok().msg("删除成功！") : AjaxResult.fail().msg("删除失败！"); } - // Mechanism mechanism = mechanismMapper.selectById(id); - // if (ObjectUtil.isNull(mechanism)) { - // return AjaxResult.fail().msg("未找到相关信息！"); - // } else { - // int i = mechanismMapper.deleteById(mechanism.getId()); - // return i > 0 ? AjaxResult.ok().msg("删除成功！") : AjaxResult.fail().msg("删除失败！"); - // } } }