diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java index dbdeda0..8030c5a 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java @@ -266,6 +266,14 @@ public class CphAuditDetailsController extends BaseController { public AjaxResult getInfo(@PathVariable("id") Long id) { return success(cphAuditDetailsService.selectCphAuditDetailsById(id)); } + /** + * 查询个人思想品得加分项申请 + */ + @PostMapping("/getcphiamByOne/{stuNo}") + public TableDataInfo getcphiamByOne(@PathVariable("stuNo") String stuNo) { + List list=cphAuditDetailsService.getcphiamByOne(stuNo); + return getDataTable(list); + } /** * 新增审核明细 diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java index 5ebb94d..7ba6ba9 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphAuditDetails.java @@ -6,12 +6,13 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.srs.common.annotation.Excel; import com.srs.common.core.domain.BaseEntity; +import org.apache.poi.hpsf.Decimal; import java.math.BigDecimal; /** * 审核明细对象 cph_audit_details - * + * * @author 邓 * @date 2023-07-04s.0 */ @@ -67,6 +68,9 @@ public class CphAuditDetails extends BaseEntity public BigDecimal iamScore; public String auditStatus; public Long stuYearId; + public String ruleName; + public String stuYearName; + public int operateScore; public String getDeptName() { @@ -118,79 +122,79 @@ public class CphAuditDetails extends BaseEntity this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setProjectName(String projectName) + public void setProjectName(String projectName) { this.projectName = projectName; } - public String getProjectName() + public String getProjectName() { return projectName; } - public void setSubmitterId(Long submitterId) + public void setSubmitterId(Long submitterId) { this.submitterId = submitterId; } - public Long getSubmitterId() + public Long getSubmitterId() { return submitterId; } - public void setSubmitterName(String submitterName) + public void setSubmitterName(String submitterName) { this.submitterName = submitterName; } - public String getSubmitterName() + public String getSubmitterName() { return submitterName; } - public void setReviewedById(Long reviewedById) + public void setReviewedById(Long reviewedById) { this.reviewedById = reviewedById; } - public Long getReviewedById() + public Long getReviewedById() { return reviewedById; } - public void setProjectId(Long projectId) + public void setProjectId(Long projectId) { this.projectId = projectId; } - public Long getProjectId() + public Long getProjectId() { return projectId; } - public void setProjectTypeId(Long projectTypeId) + public void setProjectTypeId(Long projectTypeId) { this.projectTypeId = projectTypeId; } - public Long getProjectTypeId() + public Long getProjectTypeId() { return projectTypeId; } - public void setStatusCode(Long statusCode) + public void setStatusCode(Long statusCode) { this.statusCode = statusCode; } - public Long getStatusCode() + public Long getStatusCode() { return statusCode; } - public void setRemarks(String remarks) + public void setRemarks(String remarks) { this.remarks = remarks; } - public String getRemarks() + public String getRemarks() { return remarks; } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java index a9c5d44..99f58c4 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/CphAuditDetailsMapper.java @@ -22,6 +22,7 @@ public interface CphAuditDetailsMapper * @return 审核明细 */ public CphAuditDetails selectCphAuditDetailsById(Long id); + public List getcphiamByOne(String stuNo); public CphAuditDetails selectCphAuditDetailsByProjectId(Long id); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java index fe45d0a..860528c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ICphAuditDetailsService.java @@ -49,6 +49,14 @@ public interface ICphAuditDetailsService */ public CphAuditDetails selectCphAuditDetailsById(Long id); + /** + * 查询个人思想品得加分项申请 + * + * @param stuNo + * @return + **/ + public List getcphiamByOne(String stuNo); + /** * 我的已审核 * @author zhy diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java index c4ea80f..0b6843f 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/CphAuditDetailsServiceImpl.java @@ -331,6 +331,11 @@ public class CphAuditDetailsServiceImpl implements ICphAuditDetailsService { return cphAuditDetailsMapper.selectCphAuditDetailsById(id); } + //查询个人思想品得加分申请 + public List getcphiamByOne(String stuNo){ + return cphAuditDetailsMapper.getcphiamByOne(stuNo); + } + /** * 查询已审核 * diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml index 1aeef9b..58ebb0f 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphAuditDetailsMapper.xml @@ -238,11 +238,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and c.stu_no = #{stuNo} and b.stu_year_id = #{stuYearId} - + +