毕业管理登记

考核项目添加

src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentProjectController.java

@@ -149,6 +149,13 @@ public class BaseStudentAssessmentProjectController {
         baseStudentAssessmentProject.setSortCode(b.getSortCode() + 1);
         baseStudentAssessmentProject.setCreateUserId(StpUtil.getLoginIdAsLong());
         baseStudentAssessmentProject.setCreateDate(new Date());
+        baseStudentAssessmentProject.setDepartmentId(0L);
+        baseStudentAssessmentProject.setPointsDeductedMax(dto.getBasicPoints());
+        baseStudentAssessmentProject.setPointsDeductedMin(dto.getBasicPoints());
+        baseStudentAssessmentProject.setAddPointsMax(dto.getBasicPoints());
+        baseStudentAssessmentProject.setAddPointsMin(dto.getBasicPoints());
+        baseStudentAssessmentProject.setBehaviorScore(0D);
+        baseStudentAssessmentProject.setBaseStudentBehaviorProjectId(0L);
         boolean isSuccess = baseStudentAssessmentProjectService.save(baseStudentAssessmentProject);
         return RT.ok(isSuccess);
     }

src/main/java/com/xjrsoft/module/student/controller/BaseStudentInfoController.java

@@ -58,7 +58,7 @@ public class BaseStudentInfoController {
 
 
     @PutMapping
-    @ApiOperation(value = "修改学生职务设置")
+    @ApiOperation(value = "修改学生信息")
     @SaCheckPermission("basestudentpost:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateBaseStudentInfoDto dto){
         return RT.ok(baseStudentSchoolRollService.updateInfo(dto));

src/main/java/com/xjrsoft/module/student/dto/AddBaseStudentGraduateDto.java

@@ -43,11 +43,13 @@ public class AddBaseStudentGraduateDto implements Serializable {
     * 发证日期
     */
     @ApiModelProperty("发证日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date certificateDate;
     /**
     * 离寝日期(住读的学生才村)
     */
     @ApiModelProperty("离寝日期(住读的学生才村)")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date leavingBedDate;
     /**
     * 附件id

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -5453,9 +5453,9 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                     setComment(p.getComment());
                     setStartTime(p.getStartTime());
                     setCirculateMessage(p.getCirculateMessage());
-                    setApproveUserName(approveUserNameArr[1]);
-                    setApproveResult(approveResultArr[1]);
-                    setApproveComment(approveCommentArr[1]);
+                    setApproveUserName(approveUserNameArr.length > 1 ? approveUserNameArr[1] : "");
+                    setApproveResult(approveResultArr.length > 1 ? approveResultArr[1] : "");
+                    setApproveComment(approveCommentArr.length > 1 ? approveCommentArr[1] : "");
                 }});
             }
 
@@ -5497,9 +5497,9 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                     setComment(p.getComment());
                     setStartTime(p.getStartTime());
                     setCirculateMessage(p.getCirculateMessage());
-                    setApproveUserName(approveUserNameArr[1]);
-                    setApproveResult(approveResultArr[1]);
-                    setApproveComment(approveCommentArr[1]);
+                    setApproveUserName(approveUserNameArr.length > 1 ? approveUserNameArr[1] : "");
+                    setApproveResult(approveResultArr.length > 1 ? approveResultArr[1] : "");
+                    setApproveComment(approveCommentArr.length > 1 ? approveCommentArr[1] : "");
                 }});
             }
             if(p.getNodeName().equals("开始节点")) {

src/main/resources/mapper/student/BaseStudentGraduateMapper.xml

@@ -53,7 +53,7 @@
         <if test="dto.status != null">
             and t5.status = #{dto.status}
         </if>
-        <if test="dto.classId != null  and dto.classId > 0">
+        <if test="dto.classId != null and dto.classId > 0">
             and t3.class_id = #{dto.classId}
         </if>
     </select>