Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateManageServiceImpl.java

@@ -151,22 +151,22 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
                     //将对应的分数给到对应的记录
                     for (MobileResultPageVo mobileResultPageVo : mobileResultPage.getRecords()) {
                         //评价类型是学生评价班主任
-                        if(mobileResultPageVo.getEvaluateType().equals(EvaluateTypeEnum.STUDENT_EVALUATE_HEAD_TEACHER.getCode()) && scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateObjectId()) != null){
+                        if(mobileResultPageVo.getEvaluateType().equals(EvaluateTypeEnum.STUDENT_EVALUATE_HEAD_TEACHER.getCode()) && scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateSubmitRecordId()) != null){
                             mobileResultPageVo.setTotalScore((double)scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateObjectId()).getTotalScore());
                             mobileResultPageVo.setItemCount(scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateObjectId()).getItemCount());
                         }
 
                         //评价类型是教官评级班级
-                        if(mobileResultPageVo.getEvaluateType().equals(EvaluateTypeEnum.DRILLMASTER_EVALUATE_CLASS.getCode()) && scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateObjectId()) != null){
+                        if(mobileResultPageVo.getEvaluateType().equals(EvaluateTypeEnum.DRILLMASTER_EVALUATE_CLASS.getCode()) && scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateSubmitRecordId()) != null){
                             ScriptEngine engine = new ScriptEngineManager().getEngineByName("js");
                             String zonghezhishu = "totalScore/itemCount";
-                            int totalScore = scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateObjectId()).getTotalScore();
-                            int itemCount = scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateObjectId()).getItemCount();
+                            int totalScore = scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateSubmitRecordId()).getTotalScore();
+                            int itemCount = scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateSubmitRecordId()).getItemCount();
                             double res = 0;
                             String newStr1 = zonghezhishu.replace("totalScore", ""+totalScore);
                             String newStr2 = newStr1.replace("itemCount", ""+itemCount);
                             try{
-                                res = (double)engine.eval(newStr2);
+                                res = Double.parseDouble(engine.eval(newStr2).toString());
                             }catch (ScriptException s){
 
                             }
@@ -175,7 +175,7 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
                             // 格式化double值为字符串
                             String formattedNumber = decimalFormat.format(res);
                             mobileResultPageVo.setTotalScore(Double.valueOf(formattedNumber));
-                            mobileResultPageVo.setItemCount(scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateObjectId()).getItemCount());
+                            mobileResultPageVo.setItemCount(scoreBySubmitRecordId.get(mobileResultPageVo.getEvaluateSubmitRecordId()).getItemCount());
                         }
                     }
                 }

src/main/java/com/xjrsoft/module/liteflow/node/StudentAssessmentInspectionNode.java

@@ -0,0 +1,30 @@
+package com.xjrsoft.module.liteflow.node;
+
+import cn.hutool.core.convert.Convert;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 新闻审核成功后发送消息
+ */
+@Component("student_assessment_inspection_node")
+public class StudentAssessmentInspectionNode extends NodeComponent {
+    @Autowired
+    private IBaseStudentAssessmentInspectionService baseStudentAssessmentInspectionService;
+
+    @Override
+    public void process() throws Exception {
+        // 获取表单中数据编号
+        Map<String, Object> params = this.getFirstContextBean();
+        Object value = util.getFormDatKey(params,"id");
+        Long formId = Convert.toLong(value);
+        if (formId != null) {
+            // 数据处理
+            baseStudentAssessmentInspectionService.dataHandle(formId);
+        }
+    }
+}

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

@@ -94,6 +94,14 @@ public class BaseStudentAssessmentInspectionController {
         return RT.ok(baseStudentAssessmentInspectionService.removeBatchByIds(ids));
     }
 
+    @GetMapping(value = "/calss-quantitative-assessment-page")
+    @ApiOperation(value = "班级量化考核列表(分页)")
+    @SaCheckPermission("basestudentassessmentinspection:detail")
+    public RT<PageOutput<CalssQuantitativeAssessmentPageVo>> calssQuantitativeAssessmentPage(@Valid CalssQuantitativeAssessmentPageDto dto) {
+        Page<CalssQuantitativeAssessmentPageVo> page = baseStudentAssessmentInspectionService.getCalssQuantitativeAssessmentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        return RT.ok(ConventPage.getPageOutput(page, CalssQuantitativeAssessmentPageVo.class));
+    }
+
 //    @PostMapping("/export-query")
 //    @ApiOperation(value = "入参导出")
 //    public ResponseEntity<byte[]>  exportDataQuery(@Valid @RequestBody QuantitativeAssessmentExcelDto dto) {
@@ -102,12 +110,4 @@ public class BaseStudentAssessmentInspectionController {
     public ResponseEntity<byte[]>  exportDataQuery() {
         return baseStudentAssessmentInspectionService.getQuantitativeAssessmentExcelByte(new QuantitativeAssessmentExcelDto());
     }
-
-    @GetMapping(value = "/calss-quantitative-assessment-page")
-    @ApiOperation(value = "班级量化考核列表(分页)")
-    @SaCheckPermission("basestudentassessmentinspection:detail")
-    public RT<PageOutput<CalssQuantitativeAssessmentPageVo>> calssQuantitativeAssessmentPage(@Valid CalssQuantitativeAssessmentPageDto dto) {
-        Page<CalssQuantitativeAssessmentPageVo> page = baseStudentAssessmentInspectionService.getCalssQuantitativeAssessmentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        return RT.ok(ConventPage.getPageOutput(page, CalssQuantitativeAssessmentPageVo.class));
-    }
 }

src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentInspectionService.java

@@ -54,4 +54,6 @@ public interface IBaseStudentAssessmentInspectionService extends MPJBaseService<
      * @return
      */
     Page<CalssQuantitativeAssessmentPageVo> getCalssQuantitativeAssessmentPage(Page<CalssQuantitativeAssessmentPageDto> page, CalssQuantitativeAssessmentPageDto dto);
+
+    Boolean dataHandle(Long id);
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.ScoreTypeEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
@@ -20,10 +21,7 @@ import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageD
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.dto.CalssQuantitativeAssessmentPageDto;
 import com.xjrsoft.module.student.dto.QuantitativeAssessmentExcelDto;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
-import com.xjrsoft.module.student.entity.BaseStudentAssessmentStudentRelation;
+import com.xjrsoft.module.student.entity.*;
 import com.xjrsoft.module.student.mapper.BaseStudentAssessmentCategoryMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentAssessmentClassRelationMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentAssessmentInspectionMapper;
@@ -225,6 +223,26 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
     @Override
     public Page<CalssQuantitativeAssessmentPageVo> getCalssQuantitativeAssessmentPage(Page<CalssQuantitativeAssessmentPageDto> page, CalssQuantitativeAssessmentPageDto dto) {
+        //以班级为数据的基础
+        MPJLambdaWrapper<BaseClass> baseClassMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        baseClassMPJLambdaWrapper
+                .selectAs(BaseClass::getTeacherId, CalssQuantitativeAssessmentPageVo::getHeadTeacherId)
+                .selectAs(XjrUser::getUserName, CalssQuantitativeAssessmentPageVo::getOa)
+                .selectAs(XjrUser::getName, CalssQuantitativeAssessmentPageVo::getHeadTeacherName)
+                .selectAs(BaseClass::getId, CalssQuantitativeAssessmentPageVo::getClassId)
+                .selectAs(BaseClass::getName, CalssQuantitativeAssessmentPageVo::getClassName)
+                .selectAs(BaseClassMajorSet::getTotalStudent, CalssQuantitativeAssessmentPageVo::getStudentNum)
+                .selectAs(BaseClass::getIsGraduate, CalssQuantitativeAssessmentPageVo::getClassStatus)
+                .leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId)
+                .leftJoin(BaseClassMajorSet.class, BaseClassMajorSet::getClassId, BaseClass::getId)
+                .disableSubLogicDel();
+
+        return null;
+    }
+
+    @Override
+    public Boolean dataHandle(Long id) {
+
         return null;
     }
 }

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

@@ -3524,6 +3524,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             String allUserIdStr = StrUtil.join(StringPool.COMMA, dto.getOriginator());
             ids = Arrays.stream(allUserIdStr.split(StringPool.COMMA)).map(Convert::toLong).collect(Collectors.toList());
         }
+        ids.add(StpUtil.getLoginIdAsLong());
 
         //因为多表关联 会有多个表都使用了id字段，  所以必须专门指定主表的Id
         IPage<DraftPageVo> page = workflowDraftService.selectJoinListPage(ConventPage.getPage(dto), DraftPageVo.class,