diff --git a/src/main/java/com/msdw/tms/controller/UserController.java b/src/main/java/com/msdw/tms/controller/UserController.java index 097438e..294263a 100644 --- a/src/main/java/com/msdw/tms/controller/UserController.java +++ b/src/main/java/com/msdw/tms/controller/UserController.java @@ -57,7 +57,6 @@ public class UserController implements UserControllerApi { /** * 保存 */ - @Override @PostMapping("/save") public R save(@RequestBody UserEntity userEntity){ userService.save(userEntity); diff --git a/src/main/java/com/msdw/tms/dao/QuestionsDao.java b/src/main/java/com/msdw/tms/dao/QuestionsDao.java index 7f8c369..7affe47 100644 --- a/src/main/java/com/msdw/tms/dao/QuestionsDao.java +++ b/src/main/java/com/msdw/tms/dao/QuestionsDao.java @@ -17,4 +17,7 @@ import java.util.List; @Mapper public interface QuestionsDao extends BaseMapper { List selectIds(@Param("questionType") Integer questionType); + + Integer countTotalMultipleNum(); + Integer countTotalJudgmentNum(); } diff --git a/src/main/java/com/msdw/tms/entity/vo/personalFile.java b/src/main/java/com/msdw/tms/entity/vo/personalFile.java new file mode 100644 index 0000000..196eac4 --- /dev/null +++ b/src/main/java/com/msdw/tms/entity/vo/personalFile.java @@ -0,0 +1,38 @@ +package com.msdw.tms.entity.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +@Accessors(chain = true) +@Data +@TableName("hr_personal_file") +public class personalFile { + //个人档案 + @TableId(type = IdType.AUTO) + private Integer personalFileId; + //个人职业 + private Integer personalCareerId; + //学校id + private Integer schoolId; + //学校名称 + private String schoolName; + //绑定学科id + private Integer disciplineId; + //绑定学科名称 + private String disciplineName; + //绑定专业类id + private Integer professionalClassId; + //绑定专业类名称 + private String professionalClassName; + //绑定专业id + private Integer professionalId; + //绑定专业名称 + private String professionalName; + //绑定用户id + private Integer userId; + //修改时间 + private String updatetime; +} diff --git a/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java index e2e8f80..ec25e96 100644 --- a/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.msdw.tms.common.exception.ExceptionCast; import com.msdw.tms.common.utils.Constant; import com.msdw.tms.dao.EvaluationRulesDao; +import com.msdw.tms.dao.QuestionsDao; import com.msdw.tms.entity.EvaluationRulesEntity; import com.msdw.tms.entity.QuestionsEntity; import com.msdw.tms.entity.response.CommonCode; @@ -12,6 +13,7 @@ import com.msdw.tms.entity.vo.EvaluationRulesVO; import com.msdw.tms.service.EvaluationRulesService; import com.msdw.tms.service.QuestionsService; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -22,6 +24,8 @@ public class EvaluationRulesServiceImpl extends ServiceImpl + + + + + \ No newline at end of file