diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index 936768e..c3ef88e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -56,8 +56,8 @@ @ApiOperation("培训签到新增") @PostMapping("/add") public ReturnDTO add(@RequestBody BizResourceTrainingRegistrationForm registrationForm) { - trainingRegistrationFormService.add(registrationForm); - return ReturnUtil.success(); + String fileCode = trainingRegistrationFormService.add(registrationForm); + return ReturnUtil.success(fileCode); } @ApiOperation("培训签到编辑") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index 936768e..c3ef88e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -56,8 +56,8 @@ @ApiOperation("培训签到新增") @PostMapping("/add") public ReturnDTO add(@RequestBody BizResourceTrainingRegistrationForm registrationForm) { - trainingRegistrationFormService.add(registrationForm); - return ReturnUtil.success(); + String fileCode = trainingRegistrationFormService.add(registrationForm); + return ReturnUtil.success(fileCode); } @ApiOperation("培训签到编辑") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java index 90828e9..ac24b8e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.time.LocalDateTime; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -61,4 +60,23 @@ private String description; + @ApiModelProperty(value = "姓名") + @TableField(exist = false) + private String staffName; + + @ApiModelProperty(value = "军官/文职证号") + @TableField(exist = false) + private String officerNo; + + @ApiModelProperty(value = "工作部门") + @TableField(exist = false) + private String deptName; + + @ApiModelProperty(value = "岗位") + @TableField(exist = false) + private String station; + + @ApiModelProperty(value = "人员类别(字典value)") + @TableField(exist = false) + private String staffTypeName; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index 936768e..c3ef88e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -56,8 +56,8 @@ @ApiOperation("培训签到新增") @PostMapping("/add") public ReturnDTO add(@RequestBody BizResourceTrainingRegistrationForm registrationForm) { - trainingRegistrationFormService.add(registrationForm); - return ReturnUtil.success(); + String fileCode = trainingRegistrationFormService.add(registrationForm); + return ReturnUtil.success(fileCode); } @ApiOperation("培训签到编辑") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java index 90828e9..ac24b8e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.time.LocalDateTime; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -61,4 +60,23 @@ private String description; + @ApiModelProperty(value = "姓名") + @TableField(exist = false) + private String staffName; + + @ApiModelProperty(value = "军官/文职证号") + @TableField(exist = false) + private String officerNo; + + @ApiModelProperty(value = "工作部门") + @TableField(exist = false) + private String deptName; + + @ApiModelProperty(value = "岗位") + @TableField(exist = false) + private String station; + + @ApiModelProperty(value = "人员类别(字典value)") + @TableField(exist = false) + private String staffTypeName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java index 4c37d6e..9cca8b6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java @@ -2,9 +2,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper; import com.casic.missiles.mapper.resource.BizResourceTrainingRegistrationFormParticipantsMapper; +import com.casic.missiles.model.resource.BizResourceStaffInfo; import com.casic.missiles.model.resource.BizResourceTrainingRegistrationFormParticipants; import com.casic.missiles.service.resource.IBizResourceTrainingRegistrationFormParticipantsService; +import com.casic.missiles.utils.DictCodeUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -20,12 +24,30 @@ @Service public class BizResourceTrainingRegistrationFormParticipantsServiceImpl extends ServiceImpl implements IBizResourceTrainingRegistrationFormParticipantsService { + @Autowired + private BizResourceStaffInfoMapper staffInfoMapper; @Override public List getListByFormId(Long formId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("form_id", formId); - return this.baseMapper.selectList(queryWrapper); + List resultList = baseMapper.selectList(queryWrapper); + + resultList.forEach(participant -> { + BizResourceStaffInfo staff = staffInfoMapper.selectById(participant.getParticipantId()); + try { + DictCodeUtils.convertDictCodeToName(staff); + } catch (Exception ignored) { + + } + participant.setStaffName(staff.getStaffName()); + participant.setOfficerNo(staff.getOfficerNo()); + participant.setDeptName(staff.getDeptName()); + participant.setStation(staff.getStation()); + participant.setStaffTypeName(staff.getStaffTypeName()); + }); + + return resultList; } @Override diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index 936768e..c3ef88e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -56,8 +56,8 @@ @ApiOperation("培训签到新增") @PostMapping("/add") public ReturnDTO add(@RequestBody BizResourceTrainingRegistrationForm registrationForm) { - trainingRegistrationFormService.add(registrationForm); - return ReturnUtil.success(); + String fileCode = trainingRegistrationFormService.add(registrationForm); + return ReturnUtil.success(fileCode); } @ApiOperation("培训签到编辑") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java index 90828e9..ac24b8e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.time.LocalDateTime; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -61,4 +60,23 @@ private String description; + @ApiModelProperty(value = "姓名") + @TableField(exist = false) + private String staffName; + + @ApiModelProperty(value = "军官/文职证号") + @TableField(exist = false) + private String officerNo; + + @ApiModelProperty(value = "工作部门") + @TableField(exist = false) + private String deptName; + + @ApiModelProperty(value = "岗位") + @TableField(exist = false) + private String station; + + @ApiModelProperty(value = "人员类别(字典value)") + @TableField(exist = false) + private String staffTypeName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java index 4c37d6e..9cca8b6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java @@ -2,9 +2,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper; import com.casic.missiles.mapper.resource.BizResourceTrainingRegistrationFormParticipantsMapper; +import com.casic.missiles.model.resource.BizResourceStaffInfo; import com.casic.missiles.model.resource.BizResourceTrainingRegistrationFormParticipants; import com.casic.missiles.service.resource.IBizResourceTrainingRegistrationFormParticipantsService; +import com.casic.missiles.utils.DictCodeUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -20,12 +24,30 @@ @Service public class BizResourceTrainingRegistrationFormParticipantsServiceImpl extends ServiceImpl implements IBizResourceTrainingRegistrationFormParticipantsService { + @Autowired + private BizResourceStaffInfoMapper staffInfoMapper; @Override public List getListByFormId(Long formId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("form_id", formId); - return this.baseMapper.selectList(queryWrapper); + List resultList = baseMapper.selectList(queryWrapper); + + resultList.forEach(participant -> { + BizResourceStaffInfo staff = staffInfoMapper.selectById(participant.getParticipantId()); + try { + DictCodeUtils.convertDictCodeToName(staff); + } catch (Exception ignored) { + + } + participant.setStaffName(staff.getStaffName()); + participant.setOfficerNo(staff.getOfficerNo()); + participant.setDeptName(staff.getDeptName()); + participant.setStation(staff.getStation()); + participant.setStaffTypeName(staff.getStaffTypeName()); + }); + + return resultList; } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormServiceImpl.java index c4a61b0..bcf24a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormServiceImpl.java @@ -61,7 +61,7 @@ private WorkbenchRemindMessageMapper messageMapper; @Override - public void add(BizResourceTrainingRegistrationForm registrationForm) { + public String add(BizResourceTrainingRegistrationForm registrationForm) { //生成编号 String labCode = registrationForm.getLabCode(); String groupCode = registrationForm.getGroupCode(); @@ -75,6 +75,8 @@ }); participantsService.saveBatch(registrationForm.getParticipantsList()); } + + return registrationForm.getFileCode(); } @Override diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java index 936768e..c3ef88e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceTrainingRegistrationFormController.java @@ -56,8 +56,8 @@ @ApiOperation("培训签到新增") @PostMapping("/add") public ReturnDTO add(@RequestBody BizResourceTrainingRegistrationForm registrationForm) { - trainingRegistrationFormService.add(registrationForm); - return ReturnUtil.success(); + String fileCode = trainingRegistrationFormService.add(registrationForm); + return ReturnUtil.success(fileCode); } @ApiOperation("培训签到编辑") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java index 90828e9..ac24b8e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceTrainingRegistrationFormParticipants.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.time.LocalDateTime; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -61,4 +60,23 @@ private String description; + @ApiModelProperty(value = "姓名") + @TableField(exist = false) + private String staffName; + + @ApiModelProperty(value = "军官/文职证号") + @TableField(exist = false) + private String officerNo; + + @ApiModelProperty(value = "工作部门") + @TableField(exist = false) + private String deptName; + + @ApiModelProperty(value = "岗位") + @TableField(exist = false) + private String station; + + @ApiModelProperty(value = "人员类别(字典value)") + @TableField(exist = false) + private String staffTypeName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java index 4c37d6e..9cca8b6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormParticipantsServiceImpl.java @@ -2,9 +2,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.resource.BizResourceStaffInfoMapper; import com.casic.missiles.mapper.resource.BizResourceTrainingRegistrationFormParticipantsMapper; +import com.casic.missiles.model.resource.BizResourceStaffInfo; import com.casic.missiles.model.resource.BizResourceTrainingRegistrationFormParticipants; import com.casic.missiles.service.resource.IBizResourceTrainingRegistrationFormParticipantsService; +import com.casic.missiles.utils.DictCodeUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -20,12 +24,30 @@ @Service public class BizResourceTrainingRegistrationFormParticipantsServiceImpl extends ServiceImpl implements IBizResourceTrainingRegistrationFormParticipantsService { + @Autowired + private BizResourceStaffInfoMapper staffInfoMapper; @Override public List getListByFormId(Long formId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("form_id", formId); - return this.baseMapper.selectList(queryWrapper); + List resultList = baseMapper.selectList(queryWrapper); + + resultList.forEach(participant -> { + BizResourceStaffInfo staff = staffInfoMapper.selectById(participant.getParticipantId()); + try { + DictCodeUtils.convertDictCodeToName(staff); + } catch (Exception ignored) { + + } + participant.setStaffName(staff.getStaffName()); + participant.setOfficerNo(staff.getOfficerNo()); + participant.setDeptName(staff.getDeptName()); + participant.setStation(staff.getStation()); + participant.setStaffTypeName(staff.getStaffTypeName()); + }); + + return resultList; } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormServiceImpl.java index c4a61b0..bcf24a7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainingRegistrationFormServiceImpl.java @@ -61,7 +61,7 @@ private WorkbenchRemindMessageMapper messageMapper; @Override - public void add(BizResourceTrainingRegistrationForm registrationForm) { + public String add(BizResourceTrainingRegistrationForm registrationForm) { //生成编号 String labCode = registrationForm.getLabCode(); String groupCode = registrationForm.getGroupCode(); @@ -75,6 +75,8 @@ }); participantsService.saveBatch(registrationForm.getParticipantsList()); } + + return registrationForm.getFileCode(); } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceTrainingRegistrationFormService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceTrainingRegistrationFormService.java index 58756dc..d74edd3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceTrainingRegistrationFormService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/resource/IBizResourceTrainingRegistrationFormService.java @@ -21,7 +21,7 @@ */ public interface IBizResourceTrainingRegistrationFormService extends IService { - void add (BizResourceTrainingRegistrationForm registrationForm); + String add (BizResourceTrainingRegistrationForm registrationForm); Page listPage(Page page, RegistrationFormRequest request);