diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index 1fa591c..e790b1f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -480,6 +480,35 @@ return trainInfoService.deleteBatchTrain(idsDTO.getIds()); } + @ApiOperation("训练情况（分页）") + @PostMapping("/trainning/listPage") + public ReturnDTO> trainningListPage(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + Page responsePage = staffInfoService.trainningListPage(page, idDto); + return ReturnUtil.success(super.packForBT(responsePage)); + } + + @ApiOperation("新增训练情况") + @PostMapping("/trainning/add") + public ReturnDTO trainningAdd(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningAdd(staffTrainning); + } + + @ApiOperation("编辑训练情况") + @PostMapping("/trainning/update") + public ReturnDTO trainningUpdate(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningUpdate(staffTrainning); + } + + @ApiOperation("删除训练情况（批量）") + @PostMapping("/trainning/batchDelete") + public ReturnDTO trainningBatchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return staffInfoService.trainningBatchDelete(idsDTO.getIds()); + } + @ApiOperation("导出word/pdf/打印") @PostMapping("/train/exportFile") public void trainExportFile(@RequestBody @Valid TrainListRequest request, HttpServletResponse response) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index 1fa591c..e790b1f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -480,6 +480,35 @@ return trainInfoService.deleteBatchTrain(idsDTO.getIds()); } + @ApiOperation("训练情况（分页）") + @PostMapping("/trainning/listPage") + public ReturnDTO> trainningListPage(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + Page responsePage = staffInfoService.trainningListPage(page, idDto); + return ReturnUtil.success(super.packForBT(responsePage)); + } + + @ApiOperation("新增训练情况") + @PostMapping("/trainning/add") + public ReturnDTO trainningAdd(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningAdd(staffTrainning); + } + + @ApiOperation("编辑训练情况") + @PostMapping("/trainning/update") + public ReturnDTO trainningUpdate(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningUpdate(staffTrainning); + } + + @ApiOperation("删除训练情况（批量）") + @PostMapping("/trainning/batchDelete") + public ReturnDTO trainningBatchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return staffInfoService.trainningBatchDelete(idsDTO.getIds()); + } + @ApiOperation("导出word/pdf/打印") @PostMapping("/train/exportFile") public void trainExportFile(@RequestBody @Valid TrainListRequest request, HttpServletResponse response) throws Exception { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java new file mode 100644 index 0000000..5d311c2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.resource; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.resource.BizResourceStaffTrainning; + +/** + *

+ * 资源管理-人员管理-训练情况 Mapper 接口 + *

+ * + * @author tanyue + * @since 2024-04-11 + */ +public interface BizResourceStaffTrainningMapper extends BaseMapper { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index 1fa591c..e790b1f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -480,6 +480,35 @@ return trainInfoService.deleteBatchTrain(idsDTO.getIds()); } + @ApiOperation("训练情况（分页）") + @PostMapping("/trainning/listPage") + public ReturnDTO> trainningListPage(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + Page responsePage = staffInfoService.trainningListPage(page, idDto); + return ReturnUtil.success(super.packForBT(responsePage)); + } + + @ApiOperation("新增训练情况") + @PostMapping("/trainning/add") + public ReturnDTO trainningAdd(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningAdd(staffTrainning); + } + + @ApiOperation("编辑训练情况") + @PostMapping("/trainning/update") + public ReturnDTO trainningUpdate(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningUpdate(staffTrainning); + } + + @ApiOperation("删除训练情况（批量）") + @PostMapping("/trainning/batchDelete") + public ReturnDTO trainningBatchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return staffInfoService.trainningBatchDelete(idsDTO.getIds()); + } + @ApiOperation("导出word/pdf/打印") @PostMapping("/train/exportFile") public void trainExportFile(@RequestBody @Valid TrainListRequest request, HttpServletResponse response) throws Exception { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java new file mode 100644 index 0000000..5d311c2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.resource; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.resource.BizResourceStaffTrainning; + +/** + *

+ * 资源管理-人员管理-训练情况 Mapper 接口 + *

+ * + * @author tanyue + * @since 2024-04-11 + */ +public interface BizResourceStaffTrainningMapper extends BaseMapper { + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java new file mode 100644 index 0000000..a5791cb --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.resource; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 资源管理-人员管理-训练情况 + *

+ * + * @author tanyue + * @since 2024-04-11 + */ +@ApiModel +@Data +@TableName("biz_resource_staff_trainning") +public class BizResourceStaffTrainning implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 人员表id + */ + @ApiModelProperty(value = "人员表id", dataType = "String") + @TableField("staff_id") + private Long staffId; + + /** + * 编号 + */ + @ApiModelProperty(value = "训练情况编号", dataType = "String") + @TableField("train_no") + private String trainNo; + + /** + * 名称 + */ + @ApiModelProperty(value = "训练情况名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 训练日期 + */ + @ApiModelProperty(value = "训练日期", dataType = "String") + @TableField("train_date") + private String trainDate; + + /** + * 训练地点 + */ + @ApiModelProperty(value = "训练地点", dataType = "String") + @TableField("train_location") + private String trainLocation; + + /** + * 训练内容 + */ + @ApiModelProperty(value = "训练内容", dataType = "String") + @TableField("train_text") + private String trainText; + + /** + * 完成情况 + */ + @ApiModelProperty(value = "完成情况", dataType = "String") + @TableField("train_score") + private String trainScore; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 登记人 + */ + @ApiModelProperty(value = "登记人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登记人Id + */ + @ApiModelProperty(value = "登记人Id", dataType = "String") + @TableField("create_user_id") + private String createUserId; + + /** + * 来源 + */ + @ApiModelProperty(value = "来源，1:新增，id:来源于签到表", dataType = "String") + @TableField("resource") + private String resource; + + + public BizResourceStaffTrainning() { + } + + public BizResourceStaffTrainning(Long staffId, + String trainNo, + String trainName, + String trainScore, + String createUser, + String resource) { + this.staffId = staffId; + this.trainNo = trainNo; + this.trainName = trainName; + this.trainScore = trainScore; + this.createUser = createUser; + this.resource = resource; + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index 1fa591c..e790b1f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -480,6 +480,35 @@ return trainInfoService.deleteBatchTrain(idsDTO.getIds()); } + @ApiOperation("训练情况（分页）") + @PostMapping("/trainning/listPage") + public ReturnDTO> trainningListPage(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + Page responsePage = staffInfoService.trainningListPage(page, idDto); + return ReturnUtil.success(super.packForBT(responsePage)); + } + + @ApiOperation("新增训练情况") + @PostMapping("/trainning/add") + public ReturnDTO trainningAdd(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningAdd(staffTrainning); + } + + @ApiOperation("编辑训练情况") + @PostMapping("/trainning/update") + public ReturnDTO trainningUpdate(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningUpdate(staffTrainning); + } + + @ApiOperation("删除训练情况（批量）") + @PostMapping("/trainning/batchDelete") + public ReturnDTO trainningBatchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return staffInfoService.trainningBatchDelete(idsDTO.getIds()); + } + @ApiOperation("导出word/pdf/打印") @PostMapping("/train/exportFile") public void trainExportFile(@RequestBody @Valid TrainListRequest request, HttpServletResponse response) throws Exception { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java new file mode 100644 index 0000000..5d311c2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.resource; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.resource.BizResourceStaffTrainning; + +/** + *

+ * 资源管理-人员管理-训练情况 Mapper 接口 + *

+ * + * @author tanyue + * @since 2024-04-11 + */ +public interface BizResourceStaffTrainningMapper extends BaseMapper { + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java new file mode 100644 index 0000000..a5791cb --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.resource; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 资源管理-人员管理-训练情况 + *

+ * + * @author tanyue + * @since 2024-04-11 + */ +@ApiModel +@Data +@TableName("biz_resource_staff_trainning") +public class BizResourceStaffTrainning implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 人员表id + */ + @ApiModelProperty(value = "人员表id", dataType = "String") + @TableField("staff_id") + private Long staffId; + + /** + * 编号 + */ + @ApiModelProperty(value = "训练情况编号", dataType = "String") + @TableField("train_no") + private String trainNo; + + /** + * 名称 + */ + @ApiModelProperty(value = "训练情况名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 训练日期 + */ + @ApiModelProperty(value = "训练日期", dataType = "String") + @TableField("train_date") + private String trainDate; + + /** + * 训练地点 + */ + @ApiModelProperty(value = "训练地点", dataType = "String") + @TableField("train_location") + private String trainLocation; + + /** + * 训练内容 + */ + @ApiModelProperty(value = "训练内容", dataType = "String") + @TableField("train_text") + private String trainText; + + /** + * 完成情况 + */ + @ApiModelProperty(value = "完成情况", dataType = "String") + @TableField("train_score") + private String trainScore; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 登记人 + */ + @ApiModelProperty(value = "登记人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登记人Id + */ + @ApiModelProperty(value = "登记人Id", dataType = "String") + @TableField("create_user_id") + private String createUserId; + + /** + * 来源 + */ + @ApiModelProperty(value = "来源，1:新增，id:来源于签到表", dataType = "String") + @TableField("resource") + private String resource; + + + public BizResourceStaffTrainning() { + } + + public BizResourceStaffTrainning(Long staffId, + String trainNo, + String trainName, + String trainScore, + String createUser, + String resource) { + this.staffId = staffId; + this.trainNo = trainNo; + this.trainName = trainName; + this.trainScore = trainScore; + this.createUser = createUser; + this.resource = resource; + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java index 98bb335..0befe1c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java @@ -91,6 +91,8 @@ @Autowired private BizResourceTrainInfoMapper trainInfoMapper; @Autowired + private BizResourceStaffTrainningMapper staffTrainningMapper; + @Autowired private DeptMapper deptMapper; @Autowired private UserMapper userMapper; @@ -671,6 +673,41 @@ return resultPage.getRecords(); } + @Override + public Page trainningListPage(Page page, IdDTO idDto) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("staff_id", idDto.getId()); + wrapper.orderByDesc("train_date"); + Page trainningPage = staffTrainningMapper.selectPage(page, wrapper); + return trainningPage; + } + + @Override + public ReturnDTO trainningAdd(BizResourceStaffTrainning staffTrainning) { + staffTrainning.setResource("1"); + if (staffTrainningMapper.insert(staffTrainning) > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO trainningUpdate(BizResourceStaffTrainning staffTrainning) { + int updateFlag = staffTrainningMapper.updateById(staffTrainning); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO trainningBatchDelete(List ids) { + if (staffTrainningMapper.deleteBatchIds(ids) >= 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + @Async public void deleteRelationInfo(Long staffId) { QueryWrapper educationWrapper = new QueryWrapper<>(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index 1fa591c..e790b1f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -480,6 +480,35 @@ return trainInfoService.deleteBatchTrain(idsDTO.getIds()); } + @ApiOperation("训练情况（分页）") + @PostMapping("/trainning/listPage") + public ReturnDTO> trainningListPage(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + Page responsePage = staffInfoService.trainningListPage(page, idDto); + return ReturnUtil.success(super.packForBT(responsePage)); + } + + @ApiOperation("新增训练情况") + @PostMapping("/trainning/add") + public ReturnDTO trainningAdd(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningAdd(staffTrainning); + } + + @ApiOperation("编辑训练情况") + @PostMapping("/trainning/update") + public ReturnDTO trainningUpdate(@RequestBody BizResourceStaffTrainning staffTrainning) { + return staffInfoService.trainningUpdate(staffTrainning); + } + + @ApiOperation("删除训练情况（批量）") + @PostMapping("/trainning/batchDelete") + public ReturnDTO trainningBatchDelete(@RequestBody IdsDTO idsDTO) { + Assert.isFalse(CollectionUtils.isEmpty(idsDTO.getIds()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return staffInfoService.trainningBatchDelete(idsDTO.getIds()); + } + @ApiOperation("导出word/pdf/打印") @PostMapping("/train/exportFile") public void trainExportFile(@RequestBody @Valid TrainListRequest request, HttpServletResponse response) throws Exception { diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java new file mode 100644 index 0000000..5d311c2 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/resource/BizResourceStaffTrainningMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.resource; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.resource.BizResourceStaffTrainning; + +/** + *

+ * 资源管理-人员管理-训练情况 Mapper 接口 + *

+ * + * @author tanyue + * @since 2024-04-11 + */ +public interface BizResourceStaffTrainningMapper extends BaseMapper { + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java new file mode 100644 index 0000000..a5791cb --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffTrainning.java @@ -0,0 +1,125 @@ +package com.casic.missiles.model.resource; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 资源管理-人员管理-训练情况 + *

+ * + * @author tanyue + * @since 2024-04-11 + */ +@ApiModel +@Data +@TableName("biz_resource_staff_trainning") +public class BizResourceStaffTrainning implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id，更新/删除使用参数", dataType = "Long") + @TableId("id") + private Long id; + + /** + * 人员表id + */ + @ApiModelProperty(value = "人员表id", dataType = "String") + @TableField("staff_id") + private Long staffId; + + /** + * 编号 + */ + @ApiModelProperty(value = "训练情况编号", dataType = "String") + @TableField("train_no") + private String trainNo; + + /** + * 名称 + */ + @ApiModelProperty(value = "训练情况名称", dataType = "String") + @TableField("train_name") + private String trainName; + + /** + * 训练日期 + */ + @ApiModelProperty(value = "训练日期", dataType = "String") + @TableField("train_date") + private String trainDate; + + /** + * 训练地点 + */ + @ApiModelProperty(value = "训练地点", dataType = "String") + @TableField("train_location") + private String trainLocation; + + /** + * 训练内容 + */ + @ApiModelProperty(value = "训练内容", dataType = "String") + @TableField("train_text") + private String trainText; + + /** + * 完成情况 + */ + @ApiModelProperty(value = "完成情况", dataType = "String") + @TableField("train_score") + private String trainScore; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "String") + @TableField("create_time") + private String createTime; + + /** + * 登记人 + */ + @ApiModelProperty(value = "登记人", dataType = "String") + @TableField("create_user") + private String createUser; + + /** + * 登记人Id + */ + @ApiModelProperty(value = "登记人Id", dataType = "String") + @TableField("create_user_id") + private String createUserId; + + /** + * 来源 + */ + @ApiModelProperty(value = "来源，1:新增，id:来源于签到表", dataType = "String") + @TableField("resource") + private String resource; + + + public BizResourceStaffTrainning() { + } + + public BizResourceStaffTrainning(Long staffId, + String trainNo, + String trainName, + String trainScore, + String createUser, + String resource) { + this.staffId = staffId; + this.trainNo = trainNo; + this.trainName = trainName; + this.trainScore = trainScore; + this.createUser = createUser; + this.resource = resource; + } +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java index 98bb335..0befe1c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java @@ -91,6 +91,8 @@ @Autowired private BizResourceTrainInfoMapper trainInfoMapper; @Autowired + private BizResourceStaffTrainningMapper staffTrainningMapper; + @Autowired private DeptMapper deptMapper; @Autowired private UserMapper userMapper; @@ -671,6 +673,41 @@ return resultPage.getRecords(); } + @Override + public Page trainningListPage(Page page, IdDTO idDto) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("staff_id", idDto.getId()); + wrapper.orderByDesc("train_date"); + Page trainningPage = staffTrainningMapper.selectPage(page, wrapper); + return trainningPage; + } + + @Override + public ReturnDTO trainningAdd(BizResourceStaffTrainning staffTrainning) { + staffTrainning.setResource("1"); + if (staffTrainningMapper.insert(staffTrainning) > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO trainningUpdate(BizResourceStaffTrainning staffTrainning) { + int updateFlag = staffTrainningMapper.updateById(staffTrainning); + if (updateFlag > 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO trainningBatchDelete(List ids) { + if (staffTrainningMapper.deleteBatchIds(ids) >= 0) { + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + @Async public void deleteRelationInfo(Long staffId) { QueryWrapper educationWrapper = new QueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java index 77bc48b..8a7580f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceStaffInfoService.java @@ -132,4 +132,12 @@ List certListByIds(List ids) throws Exception; List certList(StaffCertRequest request) throws Exception; + + Page trainningListPage(Page page, IdDTO idDto); + + ReturnDTO trainningAdd(BizResourceStaffTrainning staffTrainning); + + ReturnDTO trainningUpdate(BizResourceStaffTrainning staffTrainning); + + ReturnDTO trainningBatchDelete(List ids); }