Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -56,15 +56,15 @@ public class AssessmentPlanAnswerController {
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/result-page")
-    @ApiOperation(value="考核计划答题列表-学生端(分页)")
-    @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> resultPage(@Valid AssessmentPlanAnswerPageDto dto){
-        dto.setStudentUserId(StpUtil.getLoginIdAsLong());
-        Page<AssessmentPlanAnswerStudentPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<AssessmentPlanAnswerStudentPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentPageVo.class);
-        return RT.ok(pageOutput);
-    }
+//    @GetMapping(value = "/result-page")
+//    @ApiOperation(value="考核计划答题列表-学生端(分页)")
+//    @SaCheckPermission("assessmenttemplateplan:detail")
+//    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> resultPage(@Valid AssessmentPlanAnswerPageDto dto){
+//        dto.setStudentUserId(StpUtil.getLoginIdAsLong());
+//        Page<AssessmentPlanAnswerStudentPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+//        PageOutput<AssessmentPlanAnswerStudentPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentPageVo.class);
+//        return RT.ok(pageOutput);
+//    }
 
     @GetMapping(value = "/teacher-page")
     @ApiOperation(value="考核计划答题列表-教师端(分页)")
@@ -147,8 +147,8 @@ public class AssessmentPlanAnswerController {
 
     @PostMapping(value="send-msg")
     @ApiOperation(value = "推送微信通知")
-    @SaCheckPermission("assessmenttemplateplan:question-result")
-    public RT<Boolean> questionResult(@RequestParam AssessmentTemplatePlanSureDto dto){
+    @SaCheckPermission("assessmenttemplateplan:send-msg")
+    public RT<Boolean> questionResult(@Valid @RequestBody AssessmentTemplatePlanSureDto dto){
         Boolean sendMsg = planService.sendMsg(dto);
         return RT.ok(sendMsg);
     }

src/main/java/com/xjrsoft/module/assessment/dto/AssessmentPlanAnswerStudentDto.java

@@ -25,4 +25,7 @@ public class AssessmentPlanAnswerStudentDto extends PageInput {
     @ApiModelProperty("状态(0:未填写 1:已填写)")
     private Integer submitStatus;
 
+    @ApiModelProperty("班主任id")
+    private Long teacherId;
+
 }

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -56,6 +56,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -357,6 +358,10 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
 
     @Override
     public List<AssessmentPlanAnswerStudentVo> getAnswerStudent(AssessmentPlanAnswerStudentDto dto) {
+        List<String> roleList = StpUtil.getRoleList();
+        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER")){
+            dto.setTeacherId(StpUtil.getLoginIdAsLong());
+        }
         return templatePlanMapper.getAnswerStudent(dto);
     }
 
@@ -446,31 +451,25 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                 .eq(AssessmentPlanAnswerStudent::getAssessmentTemplatePlanId , dto.getId())
                 .disableSubLogicDel();
         List<XjrUser> userList = xjrUserMapper.selectJoinList(XjrUser.class, queryWrapper);
-
+        AssessmentTemplatePlan templatePlan = templatePlanMapper.selectById(dto.getId());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
         for (XjrUser user : userList) {
             WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
             weChatSendMessageDto.setUserId(user.getOpenId());
 
-            weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4");
+            weChatSendMessageDto.setTemplateId("ehYfXni7exZUmt6dJX4Ukbm9ETarFfKLfXVYwNnjKMc");
             weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/student/canteen/evaluate?id={}", commonPropertiesConfig.getDomainApp(), dto.getId()));
             weChatSendMessageDto.setMsgId(dto.getId().toString());
-            JSONObject data = new JSONObject();
 
-//            JSONObject data1 = new JSONObject();
-//            String hValue = news.getFullHead().replace("“", "").replace("”", "").replace("\"", "").replace("\n", "").replace("\r", "").replace("\t", "");
-//            data1.put("value", hValue);
-//            data.put("thing23", data1);
-//
-//            JSONObject data2 = new JSONObject();
-//            data2.put("value", (department == null) ? "重庆铜梁职业教育中心" : department.getName());
-//            data.put("thing18", data2);
-//
-//            JSONObject data3 = new JSONObject();
-//            data3.put("value", LocalDateTimeUtil.format(news.getReleaseTime(), "yyyy-MM-dd HH:mm:ss"));
-//            data.put("time17", data3);
-//            weChatSendMessageDto.setContent(data);
+            JSONObject data = new JSONObject();
+            data.put("thing1.DATA", templatePlan.getName());
+            data.put("time2.DATA", sdf.format(templatePlan.getStartTime()));
+            data.put("time3.DATA", sdf.format(templatePlan.getEndTime()));
+            data.put("thing5.DATA", "test");
+            data.put("thing8.DATA", "test");
+            weChatSendMessageDto.setContent(data);
             weChatService.sendTemplateMessage(weChatSendMessageDto);
         }
-        return null;
+        return true;
     }
 }

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageController.java

@@ -219,22 +219,22 @@ public class WfAssetManageController {
 
     }
 
-//    @PostMapping("/select-record-query")
-//    @ApiOperation(value = "选中记录导出")
-//    public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid @RequestBody WfAssetManageSelectRecordQueryDto dto) {
-    @GetMapping("/select-record-query")
+    @PostMapping("/select-record-query")
     @ApiOperation(value = "选中记录导出")
-    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid WfAssetManageSelectRecordQueryDto dto) {
+    public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid @RequestBody WfAssetManageSelectRecordQueryDto dto) {
+//    @GetMapping("/select-record-query")
+//    @ApiOperation(value = "选中记录导出")
+//    public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid WfAssetManageSelectRecordQueryDto dto) {
         ByteArrayOutputStream bot = wfAssetManageService.listWfAssetManageSelectRecordQuery(dto);
-        return RT.fileStream(bot.toByteArray(), "TextbookClaim" + ExcelTypeEnum.XLSX.getValue());
+        return RT.fileStream(bot.toByteArray(), "WfAssetManage" + ExcelTypeEnum.XLSX.getValue());
     }
 
-//    @PostMapping("/conditional-search-query")
-//    @ApiOperation(value = "条件搜索导出")
-//    public ResponseEntity<byte[]> assetManageConditionalSearchQuery(@Valid @RequestBody WfAssetManageConditionalSearchQueryDto dto) {
-    @GetMapping("/conditional-search-query")
+    @PostMapping("/conditional-search-query")
     @ApiOperation(value = "条件搜索导出")
-    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid WfAssetManageConditionalSearchQueryDto dto) {
+    public ResponseEntity<byte[]> assetManageConditionalSearchQuery(@Valid @RequestBody WfAssetManageConditionalSearchQueryDto dto) {
+//    @GetMapping("/conditional-search-query")
+//    @ApiOperation(value = "条件搜索导出")
+//    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid WfAssetManageConditionalSearchQueryDto dto) {
         ByteArrayOutputStream bot = wfAssetManageService.listWfAssetManageConditionalSearchQuery(dto);
         return RT.fileStream(bot.toByteArray(), "WfAssetManage" + ExcelTypeEnum.XLSX.getValue());
     }

src/main/java/com/xjrsoft/module/textbook/controller/TextbookController.java

@@ -146,7 +146,6 @@ public class TextbookController {
     @SaCheckPermission("textbook:delete")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(textbookService.delete(ids));
-
     }
 
     @GetMapping("/export")

src/main/java/com/xjrsoft/module/textbook/entity/TextbookCoreAttribute.java

@@ -103,6 +103,4 @@ public class TextbookCoreAttribute implements Serializable {
     */
     @ApiModelProperty("主编")
     private String editorInChief;
-
-
 }

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -40,10 +40,7 @@ import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.*;
 import com.xjrsoft.module.textbook.mapper.*;
-import com.xjrsoft.module.textbook.service.ITextbookService;
-import com.xjrsoft.module.textbook.service.ITextbookWarehouseRecordService;
-import com.xjrsoft.module.textbook.service.IWfExerciseBookService;
-import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
+import com.xjrsoft.module.textbook.service.*;
 import com.xjrsoft.module.textbook.vo.*;
 import lombok.AllArgsConstructor;
 import org.apache.poi.ss.usermodel.BorderStyle;
@@ -96,6 +93,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
     private final BaseSemesterMapper baseSemesterMapper;
 
+    private final ITextbookCoreAttributeService textbookCoreAttributeService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -833,6 +831,9 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
         //批量插入或更新数据
         for (TextbookImportDto textbookImportDto : dataList) {
+            TextbookCoreAttribute textbookCoreAttribute = new TextbookCoreAttribute();
+            BeanUtils.copyProperties(textbookImportDto, textbookCoreAttribute);
+
             Textbook textbook = new Textbook();
             BeanUtils.copyProperties(textbookImportDto, textbook);
 
@@ -898,6 +899,8 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
             Textbook oldTextbook = this.getOne(textbookLambdaQueryWrapper);
 
+
+
             // 已经存在，更新数据
             if (oldTextbook != null) {
                 // 更新教材数据
@@ -919,6 +922,9 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     }});
                 }
             } else {
+                textbookCoreAttributeService.save(textbookCoreAttribute);
+
+                textbook.setTextbookCoreAttributeId(textbookCoreAttribute.getId());
                 // 插入教材数据
                 textbookTextbookMapper.insert(textbook);
 

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

@@ -345,6 +345,9 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         if (!taskNodeConfigMap.isPresent()) {
             throw new MyException("找不到当前节点的配置信息！");
         }
+        if(taskNodeConfigMap.get().get("styleType") != null){
+            vo.setStyleType(Integer.parseInt(taskNodeConfigMap.get().get("styleType").toString()));
+        }
 
         UserTaskConfig userTaskConfig = Convert.convert(UserTaskConfig.class, taskNodeConfigMap.get());
 

src/main/resources/application-pre.yml

@@ -108,8 +108,8 @@ xjrsoft:
     secret1: z3R17Od4ROW1zPisguiQmTfx0NvcYKmoIu19-82vdtU
     agentid: 1000003
   mpWeChat:
-    appKey: wx628ac080912b2a98
-    appSecret: f05692a5d71a9568d01a461928dd2b8f
+    appKey: wxfeafb4ef984a4282
+    appSecret: bad871713dd2d9c0bbf8f813eebcacbc
   appletWeChat:
     appKey: wx72e974483a9174e4
     appSecret: 3bbe99f6964c9f4fc11a8aa1224ac4b3

src/main/resources/mapper/assessment/AssessmentTemplatePlanMapper.xml

@@ -104,10 +104,14 @@
         SELECT t1.student_user_id,t2.name,t1.submit_status,t1.assessment_template_plan_id FROM assessment_plan_answer_student t1
         LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
         LEFT JOIN base_student_school_roll t3 ON t1.student_user_id = t3.user_id
+        LEFT JOIN base_class t4 ON t3.class_id = t4.id
         WHERE t1.delete_mark = 0 AND t1.assessment_template_plan_id = #{dto.assessmentTemplatePlanId}
         <if test="dto.keyword != null and dto.keyword != ''">
             and t2.name like concat('%', #{dto.keyword}, '%')
         </if>
+        <if test="dto.teacherId != null">
+            AND t4.teacher_id = #{dto.teacherId}
+        </if>
     </select>
 
     <select id="getSemesterClass" resultType="java.lang.Long">