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

src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -97,7 +97,6 @@ public class FormExecuteController {
         return R.ok(formExecuteService.list(dto));
     }
 
-
     /**
      * 自定义表单 根据配置获取列表数据 不分页
      *
@@ -110,7 +109,6 @@ public class FormExecuteController {
         return R.ok(formExecuteService.appList(dto));
     }
 
-
     /**
      * 自定义表单 根据配置获取列表数据 分页
      *
@@ -135,7 +133,6 @@ public class FormExecuteController {
         return R.ok(formExecuteService.appPage(dto));
     }
 
-
     /**
      * 自定义表单 根据配置获取 表单数据
      *
@@ -182,7 +179,6 @@ public class FormExecuteController {
         return R.ok(formExecuteService.appAdd(dto));
     }
 
-
     /**
      * 自定义表单 根据配置获取 修改 表单数据
      *
@@ -216,8 +212,6 @@ public class FormExecuteController {
         return R.ok(formExecuteService.delete(dto));
     }
 
-
-
     /**
      * app 自定义表单 根据配置获取 删除 表单数据
      *
@@ -229,7 +223,6 @@ public class FormExecuteController {
         return R.ok(formExecuteService.appDelete(dto));
     }
 
-
     /**
      * 工作流模块 使用 自定义表单 根据配置获取 表单数据
      *
@@ -242,7 +235,6 @@ public class FormExecuteController {
         return R.ok(formExecuteService.workFlowInfo(dto));
     }
 
-
     @PostMapping(value = "/export")
     @ApiOperation(value = "导出")
     @XjrLog(value = "导出表单数据")

src/main/java/com/xjrsoft/module/form/service/impl/FormExecuteServiceImpl.java

@@ -230,7 +230,6 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
 
         FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
 
-
         String configJson = formRelease.getConfigJson();
 
         //发布配置
@@ -262,7 +261,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
             }
             if (StrUtil.isNotBlank(field)) {
                 Order order = new Order();
-                order.setDirection(StrUtil.equalsIgnoreCase(orderStr, "desc") ? Direction.DESC : Direction.ASC);
+                order.setDirection(StrUtil.equalsIgnoreCase(orderStr, "descend") ? Direction.DESC : Direction.ASC);
                 order.setField(field);
                 page.setOrder(order);
             }

src/main/java/com/xjrsoft/module/room/controller/RoomController.java

@@ -118,7 +118,7 @@ public class RoomController {
     public ResponseEntity<byte[]> exportData(@Valid RoomPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<RoomExcelVo> customerList = roomService.getList(dto);
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
-        EasyExcel.write(bot, RoomPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+        EasyExcel.write(bot, RoomExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
 
         return RT.fileStream(bot.toByteArray(), "Room" + ExcelTypeEnum.XLSX.getValue());
     }

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -154,7 +154,7 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
                 .select(BaseStudent::getUserId)
                 .eq(BaseClass::getId, classId)
                 .eq(XjrUser::getGender, genderNumber)
-                .eq(BaseStudentSchoolRoll::getStduyStatus, "FB3001")
+                .eq(BaseStudentSchoolRoll::getStduyStatus, "FB3002")
                 .eq(BaseStudent::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(XjrUser::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .innerJoin(XjrUser.class, XjrUser::getId, BaseStudent::getUserId)

src/main/java/com/xjrsoft/module/workflow/controller/WorkflowSchemaController.java

@@ -140,6 +140,7 @@ public class WorkflowSchemaController {
             return R.error("找不到此模板信息！");
         }
         WorkflowSchemaConfig workflowSchemaConfig = JSONUtil.toBean(workflowSchema.getJsonContent(), WorkflowSchemaConfig.class);
+        workflowSchemaConfig.setId(workflowSchema.getId().toString());
         workflowSchemaConfig.getProcessConfig().setXmlContent(workflowSchema.getXmlContent());
 
         return R.ok(JSONUtil.toJsonStr(workflowSchemaConfig));

src/main/java/com/xjrsoft/module/workflow/model/WorkflowSchemaConfig.java

@@ -13,6 +13,9 @@ import java.util.Map;
  */
 @Data
 public class WorkflowSchemaConfig {
+
+    private String id;
+
     @NotNull(message = "流程配置不能为空")
     private ProcessConfig processConfig;
 

src/main/java/com/xjrsoft/module/workflow/service/IWorkflowSchemaService.java

@@ -70,7 +70,7 @@ public interface IWorkflowSchemaService extends MPJBaseService<WorkflowSchema> {
 
 
     /**
-     * 删除流程模板设计
+     * 导入流程模板设计
      * @param multipartFile
      * @return
      */

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -428,7 +429,7 @@ public class WorkflowSchemaServiceImpl extends MPJBaseServiceImpl<WorkflowSchema
 
         try {
             repositoryService.deleteProcessDefinitions().byIds(StrUtil.join(",", definitionIds)).delete();
-        }catch (Exception e){
+        } catch (Exception e) {
             if (e.getMessage().contains("since there exists")) {
                 throw new MyException("有流程正在执行 无法删除！");//避免有外部任务正在执行的流程删除时，提示引擎删除错误。
             }
@@ -464,6 +465,9 @@ public class WorkflowSchemaServiceImpl extends MPJBaseServiceImpl<WorkflowSchema
         WorkflowSchemaConfig workflowSchemaConfig = JSONUtil.toBean(content.toString(), WorkflowSchemaConfig.class);
 
         WorkflowSchema workflowSchema = BeanUtil.toBean(workflowSchemaConfig.getProcessConfig(), WorkflowSchema.class);
+        if (StrUtil.isNotBlank(workflowSchemaConfig.getId())) {
+            workflowSchema.setId(Convert.toLong(workflowSchemaConfig.getId()));
+        }
 
         Deployment deploy = repositoryService.createDeployment()
                 .addInputStream(workflowSchemaConfig.getProcessConfig().getName() + StringPool.DOT + WorkflowConstant.WORKFLOW_SUFFIX, IoUtil.stringAsInputStream(workflowSchemaConfig.getProcessConfig().getXmlContent())).name(workflowSchemaConfig.getProcessConfig().getName()).deploy();

src/main/resources/mapper/room/RoomBedMapper.xml

@@ -174,12 +174,11 @@
     </select>
 
     <select id="getBedStudentInfo" parameterType="com.xjrsoft.module.room.dto.AdjustBedPageDto" resultType="com.xjrsoft.module.room.vo.AdjustBedStudentPageVo">
-        SELECT t1.id,t3.name AS build_name,t2.room_name,t5.name AS gender_cn,t1.bed_number,t4.name AS student_name,t4.id as student_user_id,t6.student_user_id as student_appoint_id,t2.is_max,t2.id as room_id FROM room_bed t1
+        SELECT t1.id,t3.name AS build_name,t2.room_name,t5.name AS gender_cn,t1.bed_number,t4.name AS student_name,t4.id as student_user_id,t2.is_max,t2.id as room_id FROM room_bed t1
         LEFT JOIN room t2 ON t1.room_id = t2.id
         LEFT JOIN base_office_build t3 ON t2.office_build_id = t3.id
         LEFT JOIN xjr_user t4 ON t1.student_user_id = t4.id
         LEFT JOIN xjr_dictionary_detail t5 ON t2.gender = t5.code AND t5.item_id = 2023000000000000004
-        LEFT JOIN room_student_appoint t6 ON t6.room_bed_id = t1.id
         LEFT JOIN base_student_school_roll t7 ON t4.id = t7.user_id
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         <if test="dto.isEmptyRoom != null">
@@ -205,6 +204,9 @@
         <if test="dto.classId != null">
             and t7.class_id = #{dto.classId}
         </if>
+        <if test="dto.buildId != null">
+            and t3.id = #{dto.buildId}
+        </if>
         ORDER BY t2.sort_code,t1.sort_code
     </select>
 

src/main/resources/mapper/room/RoomValueWeekItemMapper.xml

@@ -34,7 +34,7 @@
             and #{dto.endTime} >= t2.end_time
         </if>
         <if test="dto.userName != null and dto.userName != ''">
-            and t3.name like concat('%', #{dto.userId}, '%')
+            and t3.name like concat('%', #{dto.userName}, '%')
         </if>
         <if test="dto.roomType != null and dto.roomType != ''">
             and t1.room_type = #{dto.roomType}

src/main/resources/sqlScript/20231218_sql.sql

@@ -1016,5 +1016,37 @@ CREATE TABLE `wf_teacherleave` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='教职工请假流程';
 
 
+DROP TABLE IF EXISTS `teacher_award`;
+CREATE TABLE `teacher_award` (
+     `id` bigint NOT NULL COMMENT '主键编号',
+     `create_user_id` bigint DEFAULT NULL COMMENT '创建人',
+     `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+     `modify_user_id` bigint DEFAULT NULL COMMENT '修改人',
+     `modify_date` datetime DEFAULT NULL COMMENT '修改时间',
+     `delete_mark` int NOT NULL COMMENT '删除标记',
+     `enabled_mark` int NOT NULL COMMENT '有效标志',
+     `sort_code` int DEFAULT NULL COMMENT '序号',
+     `applicant_user_id` bigint DEFAULT NULL COMMENT '申请人',
+     `award_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '获奖类型(xjr_dictionary_item[award_type])',
+     `award_level` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '奖项级别(xjr_dictionary_item[honors_level])',
+     `competition_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '赛项名称',
+     `award_grade` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '获奖等级（一等奖、二等奖、三等奖、指导奖一等奖、指导奖二等奖、指导奖三等奖）',
+     `award_group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '组别（职工、师生同赛）',
+     `paper_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '作品名称',
+     `issn` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '国际标准刊号字',
+     `media_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '媒体类型（期刊、图书、报纸、音像、论文集）',
+
+     `journal_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '媒体名称',
+     `journal_number` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '国内统一刊号CN',
+     `journal_level` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '期刊级别（核心期刊、一般期刊、(校级、内部论文)）',
+
+     `issue_date` date DEFAULT NULL COMMENT '发表时间',
+     `approval_user_id` bigint DEFAULT NULL COMMENT '审核人',
+     `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注',
+     `file_id` bigint DEFAULT NULL COMMENT '附件文件id',
+     `status` int NOT NULL DEFAULT '0' COMMENT '状态（1:结束 0:未结束）',
+     PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='教师获奖登记';
+