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

src/main/java/com/xjrsoft/common/utils/excel/CustomCellRangeAddress.java

@@ -7,6 +7,8 @@ import org.apache.poi.ss.util.CellRangeAddress;
  * @date 2024/1/8
  */
 public class CustomCellRangeAddress extends CellRangeAddress {
+
+    //字体是否加粗
     private boolean isBlod;
 
     public boolean getIsBlod() {

src/main/java/com/xjrsoft/module/personnel/controller/BasePersonnelLabourCapitalController.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.personnel.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
@@ -11,6 +12,7 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.personnel.dto.AddBasePersonnelLabourCapitalDto;
 import com.xjrsoft.module.personnel.dto.BasePersonnelLabourCapitalPageDto;
+import com.xjrsoft.module.personnel.dto.ImportBasePersonnelLabourCapitalDto;
 import com.xjrsoft.module.personnel.dto.UpdateBasePersonnelLabourCapitalDto;
 import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapital;
 import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalData;
@@ -18,10 +20,13 @@ import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalTitle;
 import com.xjrsoft.module.personnel.service.IBasePersonnelLabourCapitalService;
 import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalPageVo;
 import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalVo;
+import com.xjrsoft.module.weekly.dto.WeeklyDutySchedulePageDto;
+import com.xjrsoft.module.weekly.vo.WeeklyDutyScheduleListVo;
 import com.yomahub.liteflow.util.JsonUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -107,7 +113,7 @@ public class BasePersonnelLabourCapitalController {
     }
     @PostMapping("/import")
     @ApiOperation(value = "导入")
-    public RT<Boolean> importData(@Valid @RequestBody AddBasePersonnelLabourCapitalDto dto, @RequestParam MultipartFile file) throws IOException {
+    public RT<Boolean> importData(@Valid ImportBasePersonnelLabourCapitalDto dto, @RequestParam("file") MultipartFile file) throws IOException {
         List<Map<Integer, Object>> excelDataList = EasyExcel.read(file.getInputStream()).sheet().headRowNumber(dto.getDataRow() - 1).doReadSync();
         //验证数据
 
@@ -132,7 +138,7 @@ public class BasePersonnelLabourCapitalController {
      * @param excelDataList 表格数据
      * @return 返回集合
      */
-    List<BasePersonnelLabourCapitalData> initDataList(AddBasePersonnelLabourCapitalDto dto, List<Map<Integer, Object>> excelDataList){
+    List<BasePersonnelLabourCapitalData> initDataList(ImportBasePersonnelLabourCapitalDto dto, List<Map<Integer, Object>> excelDataList){
         List<BasePersonnelLabourCapitalData> resultList = new ArrayList<>();
         for (int i = 0; i < excelDataList.size(); i ++){
             //跳过表头
@@ -185,7 +191,7 @@ public class BasePersonnelLabourCapitalController {
 
             title.setName(value.toString());
             title.setColumnNumber(column);
-            title.setRowNumber(4);
+            title.setRowsNumber(4);
             title.setMergeColumns(mergeColumns);
             title.setMergeRows(mergeRows);
             resultList.add(title);
@@ -204,7 +210,7 @@ public class BasePersonnelLabourCapitalController {
 
             title.setName(value.toString());
             title.setColumnNumber(column);
-            title.setRowNumber(4);
+            title.setRowsNumber(4);
             title.setMergeColumns(mergeColumns);
             title.setMergeRows(mergeRows);
             resultList.add(title);
@@ -213,4 +219,15 @@ public class BasePersonnelLabourCapitalController {
         return resultList;
     }
 
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+
+    public ResponseEntity<byte[]> exportData(@Valid WeeklyDutySchedulePageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<BasePersonnelLabourCapital> list = basePersonnelLabourCapitalService.list();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, WeeklyDutyScheduleListVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(list);
+
+        return RT.fileStream(bot.toByteArray(), "WeeklyDutySchedule" + ExcelTypeEnum.XLSX.getValue());
+    }
+
 }

src/main/java/com/xjrsoft/module/personnel/dto/AddBasePersonnelLabourCapitalDto.java

@@ -66,14 +66,4 @@ public class AddBasePersonnelLabourCapitalDto implements Serializable {
     @ApiModelProperty("数据文件")
     private String dataFile;
 
-    /**
-    * basePersonnelLabourCapitalData
-    */
-    @ApiModelProperty("basePersonnelLabourCapitalData子表")
-    private List<AddBasePersonnelLabourCapitalDataDto> basePersonnelLabourCapitalDataList;
-    /**
-    * basePersonnelLabourCapitalTitle
-    */
-    @ApiModelProperty("basePersonnelLabourCapitalTitle子表")
-    private List<AddBasePersonnelLabourCapitalTitleDto> basePersonnelLabourCapitalTitleList;
 }

src/main/java/com/xjrsoft/module/personnel/dto/AddBasePersonnelLabourCapitalTitleDto.java

@@ -32,7 +32,7 @@ public class AddBasePersonnelLabourCapitalTitleDto implements Serializable {
     * 所属行
     */
     @ApiModelProperty("所属行")
-    private Integer rowNumber;
+    private Integer rowsNumber;
     /**
     * 所属列
     */

src/main/java/com/xjrsoft/module/personnel/dto/ImportBasePersonnelLabourCapitalDto.java

@@ -0,0 +1,55 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class ImportBasePersonnelLabourCapitalDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 数据开始行
+    */
+    @ApiModelProperty("数据开始行")
+    private Integer dataRow;
+    /**
+    * 证件类型所属列
+    */
+    @ApiModelProperty("证件类型所属列")
+    private Integer idTypeColumn;
+    /**
+    * 证件号码所属列
+    */
+    @ApiModelProperty("证件号码所属列")
+    private Integer idNumberColumn;
+    /**
+    * 工号所属列
+    */
+    @ApiModelProperty("工号所属列")
+    private Integer jobNumberColumn;
+    /**
+    * 名称所属列
+    */
+    @ApiModelProperty("名称所属列")
+    private Integer personnelNameColumn;
+    /**
+    * 合计所属列
+    */
+    @ApiModelProperty("合计所属列")
+    private Integer amountToColumn;
+
+}

src/main/java/com/xjrsoft/module/personnel/entity/BasePersonnelLabourCapitalTitle.java

@@ -83,7 +83,7 @@ public class BasePersonnelLabourCapitalTitle implements Serializable {
     * 所属行
     */
     @ApiModelProperty("所属行")
-    private Integer rowNumber;
+    private Integer rowsNumber;
     /**
     * 所属列
     */

src/main/java/com/xjrsoft/module/personnel/vo/BasePersonnelLabourCapitalTitleVo.java

@@ -31,7 +31,7 @@ public class BasePersonnelLabourCapitalTitleVo {
     * 所属行
     */
     @ApiModelProperty("所属行")
-    private Integer rowNumber;
+    private Integer rowsNumber;
     /**
     * 所属列
     */

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

@@ -2,7 +2,6 @@ package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
@@ -19,14 +18,7 @@ import com.xjrsoft.module.student.vo.ClassHonorsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
@@ -53,9 +45,6 @@ public class ClassHonorsController {
     @SaCheckPermission("classhonors:detail")
     public RT<List<ClassHonorsSemesterClassTreeVo>> semesterClassTree(){
         List<ClassHonorsSemesterClassTreeVo> list = classHonorsService.getSemesterClassTree();
-        if(ObjectUtil.isNull(list) || list.size() == 0){
-            return RT.error("找不到此数据！");
-        }
         return RT.ok(list);
     }
 

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

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -53,7 +52,7 @@ public class AddClassHonorsDto implements Serializable {
     * 获奖日期
     */
     @ApiModelProperty("获奖日期")
-    private Date awardDate;
+    private String awardDate;
     /**
     * 附件文件id
     */

src/main/java/com/xjrsoft/module/student/vo/ClassHonorsPageVo.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.student.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -57,5 +58,6 @@ public class ClassHonorsPageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("获奖日期")
     @ApiModelProperty("获奖日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date awardDate;
 }

src/main/resources/application-dev.yml

@@ -13,9 +13,6 @@ spring:
           username: root
           password: Zwr~-f6H,u6QE^]C-AD_
 
-
-
-
   redis:
     database: 11
     host: 10.150.10.139

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

@@ -0,0 +1,52 @@
+
+
+ALTER TABLE xjr_oa_news ADD COLUMN `wf_status` int not null default 0 COMMENT '状态（1:结束 0:未结束）' AFTER send_range;
+
+-- ------------------------------------------------------------------评价--------------------------------------------------------------------
+
+-- ----------------------------
+-- 评价模版
+-- ----------------------------
+DROP TABLE IF EXISTS evaluate_template;
+CREATE TABLE evaluate_template
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `name`  varchar(200) NULL DEFAULT NULL COMMENT '模板名称',
+    `evaluate_type` VARCHAR(30) NULL DEFAULT NULL COMMENT '评价类型(xjr_dictionary_item[evaluate_type])',
+    `total` float NULL DEFAULT NULL COMMENT '评价总分',
+    `dept_ids` json NULL DEFAULT NULL COMMENT '使用部门ids',
+    `remark` varchar(1000)NULL DEFAULT NULL  COMMENT '备注',
+    `status` int not null default 0 COMMENT '状态（0:禁用 1:启用）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '评价模版';
+
+-- ------------------------------------------------------------------评价--------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `wf_head_teacher_leave`;
+CREATE TABLE `wf_head_teacher_leave` (
+     `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 '序号',
+     `wf_teacherleave_id` bigint DEFAULT NULL COMMENT '教职工请假编号',
+     `applicant_user_id` bigint DEFAULT NULL COMMENT '申请人',
+     `leave_reason` varchar(20) DEFAULT NULL COMMENT '请假原因(xjr_dictionary_item[leave_reason])',
+     `start_time` date DEFAULT NULL COMMENT '请假日期',
+     `time_period` int DEFAULT NULL COMMENT '请假时间段 1=上午 2=下午',
+     `is_substitute` int NOT NULL DEFAULT '0' COMMENT '是否有替班教师（1:是 0:否）',
+     `substitute_user_id` bigint DEFAULT NULL COMMENT '替换教师',
+     `remark` varchar(1000) DEFAULT NULL COMMENT '备注',
+     `status` int NOT NULL DEFAULT '0' COMMENT '状态（1:结束 0:未结束）',
+     PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='班主任事项请假';