Merge remote-tracking branch 'origin/master'

hzims-service-api/basic-api/src/main/java/com/hnac/hzims/basic/entity/CertificatetEntity.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.basic.entity;
 
 import com.baomidou.mybatisplus.annotation.SqlCondition;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -21,7 +22,7 @@ import java.util.Date;
 @Data
 @TableName("hzims_certificatet")
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "档案管理表", description = "档案管理表")
+@ApiModel(value = "证书管理表", description = "证书管理表")
 public class CertificatetEntity extends TenantEntity {
 
 	private static final long serialVersionUID = 1L;
@@ -35,7 +36,7 @@ public class CertificatetEntity extends TenantEntity {
 	/**
 	 * 档案类型
 	 */
-	@ApiModelProperty(value = "档案类型")
+	@ApiModelProperty(value = "证书类型")
 	@QueryField(condition = SqlCondition.LIKE)
 	private String type;
 	/**
@@ -54,6 +55,11 @@ public class CertificatetEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "图片地址")
 	private String pic;
-
+	/**
+	 * 是否过期
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "是否过期")
+	private String isDead;
 
 }

hzims-service-api/basic-api/src/main/java/com/hnac/hzims/basic/entity/CertificatetNoticeEntity.java

@@ -0,0 +1,44 @@
+package com.hnac.hzims.basic.entity;
+
+import com.baomidou.mybatisplus.annotation.SqlCondition;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.QueryField;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+
+
+/**
+ *  实体类
+ * @author Chill
+ */
+@Data
+@TableName("hzims_certificatet_notice")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "证书通知配置表", description = "证书通知配置表")
+public class CertificatetNoticeEntity extends TenantEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 通知类型
+	 */
+	@ApiModelProperty(value = "通知类型")
+	@QueryField(condition = SqlCondition.EQUAL)
+	private String sendType;
+	/**
+	 * 距离过期前几天通知
+	 */
+	@ApiModelProperty(value = "距离过期前几天通知")
+	@QueryField(condition = SqlCondition.EQUAL)
+	private Integer safeTime;
+	/**
+	 * 通知用户
+	 */
+	@ApiModelProperty(value = "通知用户")
+	@QueryField(condition = SqlCondition.LIKE)
+	private String noticeUsers;
+}

hzims-service-api/basic-api/src/main/java/com/hnac/hzims/basic/vo/PersonManagemetVo.java

@@ -62,11 +62,6 @@ public class PersonManagemetVo extends PersonManagemetEntity {
 	)
 	@ApiModelProperty(value = "到期时间")
 	private Date deadTime;
-	/**
-	 * 图片地址
-	 */
-	@ApiModelProperty(value = "图片地址")
-	private String pic;
 
 	/**
 	 * 档案编号

hzims-service-api/common-api/src/main/java/com/hnac/hzims/vo/VoteChartVo.java

@@ -36,4 +36,7 @@ public class VoteChartVo {
 	@ApiModelProperty(value = "完成id")
 	@ExcelIgnore
 	private List<Long> finishIds;
+	@ApiModelProperty(value = "完成率")
+	@ExcelProperty(value = "完成率", index = 3)
+	private Double finishRate;
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/MainConstants.java

@@ -87,6 +87,7 @@ public interface MainConstants {
 	String LOAD_PHOTOVOLTAIC_REAL = "loadPhotovoltaicReal";
 
 	String DUTY_NOTICE = "dutyNotice";
+	String CERTIFICATET_DEAD_LINE_NOTICE = "certificatetDeadLineNotice";
 
 	String PROJECT_MANAGER = "projectManager";
 

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/MessageConstants.java

@@ -60,6 +60,7 @@ public class MessageConstants {
 		OPERATIONTICKETMESSAGE("operation-ticket-message","操作票消息"),
 		ROUTINEMAINTENANCE("operation-maintenance-message","日常维护消息"),
 		OPERATIONDEFECTMESSAGE("operation-defect-message","消缺消息"),
+		CERTIFICATETNOTICE("certificatet-notice-message","证书消息"),
 
 		OVERHAUL_PLAN("overhaul-plan","检修计划"),
 

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/constants/SafeProductConstant.java

@@ -8,6 +8,11 @@ package com.hnac.hzims.safeproduct.constants;
  */
 public interface SafeProductConstant {
 
+    String TENANT_ID = "200000";
+
+    int SUCCESS = 1;
+    int FAILURE = 0;
+
     int TRAIN_PLAN_HAS_TEST = 1;
     int TRAIN_PLAN_HAS_NO_TEST = 0;
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/ConferenceExportDTO.java

@@ -0,0 +1,59 @@
+package com.hnac.hzims.safeproduct.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Data
+@ExcelIgnoreUnannotated
+@ApiModel(value = "会议数据导出DTO类")
+public class ConferenceExportDTO {
+
+    @ApiModelProperty("单位")
+    @ExcelProperty(value = "单位", index = 0)
+    private String unit;
+
+    @ApiModelProperty("会议计划开始时间")
+    @ExcelProperty(value = "会议计划开始时间", index = 1)
+    private Date scheduledStartTime;
+
+    @ApiModelProperty("会议计划结束时间")
+    @ExcelProperty(value = "会议计划结束时间", index = 2)
+    private Date scheduledEndTime;
+
+    @ApiModelProperty("会议主题")
+    @ExcelProperty(value = "会议主题", index = 3)
+    private String theme;
+
+    @ApiModelProperty("会议地点")
+    @ExcelProperty(value = "会议地点", index = 4)
+    private String location;
+
+    @ApiModelProperty("会议方式")
+    @ExcelProperty(value = "会议方式", index = 5)
+    private String conferenceMethod;
+
+    @ApiModelProperty("主持人")
+    @ExcelProperty(value = "主持人", index = 6)
+    private String host;
+
+    @ApiModelProperty("会议实际开始时间")
+    @ExcelProperty(value = "会议实际开始时间", index = 7)
+    private Date actualStartTime;
+
+    @ApiModelProperty("会议实际结束时间")
+    @ExcelProperty(value = "会议实际结束时间", index = 8)
+    private Date actualEndTime;
+
+    @ApiModelProperty("会议状态")
+    @ExcelProperty(value = "会议状态", index = 9)
+    private String conferenceStatus;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/dto/RehearsalExportDTO.java

@@ -0,0 +1,55 @@
+package com.hnac.hzims.safeproduct.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Data
+@ExcelIgnoreUnannotated
+@ApiModel(value = "演练数据导出DTO类")
+public class RehearsalExportDTO {
+
+    @ApiModelProperty("单位")
+    @ExcelProperty(value = "单位", index = 0)
+    private String unit;
+
+    @ApiModelProperty("演练科目")
+    @ExcelProperty(value = "演练科目", index = 1)
+    private String subject;
+
+    @ApiModelProperty("演练计划开始时间")
+    @ExcelProperty(value = "演练计划开始时间", index = 2)
+    private Date scheduledStartTime;
+
+    @ApiModelProperty("演练计划结束时间")
+    @ExcelProperty(value = "演练计划结束时间", index = 3)
+    private Date scheduledEndTime;
+
+    @ApiModelProperty("演练地点")
+    @ExcelProperty(value = "演练地点", index = 4)
+    private String location;
+
+    @ApiModelProperty("参演人数")
+    @ExcelProperty(value = "参演人数", index = 5)
+    private Integer peopleNum;
+
+    @ApiModelProperty("演练实际开始时间")
+    @ExcelProperty(value = "演练实际开始时间", index = 6)
+    private Date actualStartTime;
+
+    @ApiModelProperty("演练实际结束时间")
+    @ExcelProperty(value = "演练实际结束时间", index = 7)
+    private Date actualEndTime;
+
+    @ApiModelProperty("演练状态")
+    @ExcelProperty(value = "演练状态", index = 8)
+    private String rehearsalStatus;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferencePlanEntity.java

@@ -0,0 +1,60 @@
+package com.hnac.hzims.safeproduct.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+/**
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hzims_conference_plan")
+@ApiModel(value = "会议计划实体类")
+public class ConferencePlanEntity extends BaseEntity {
+
+    @NotNull
+    @Size(max = 50, message = "单位字段长度不能超过50")
+    @ApiModelProperty("单位")
+    private String unit;
+
+    @NotNull
+    @Size(max = 50, message = "会议主题字段长度不能超过50")
+    @ApiModelProperty("会议主题")
+    private String theme;
+
+    @NotNull
+    @ApiModelProperty("会议计划开始时间")
+    private Date scheduledStartTime;
+
+    @NotNull
+    @ApiModelProperty("会议计划结束时间")
+    private Date scheduledEndTime;
+
+    @NotNull
+    @Size(max = 255, message = "演练地点字段长度不能超过255")
+    @ApiModelProperty("会议地点")
+    private String location;
+
+    @NotNull
+    @Size(max = 10, message = "总指挥字段长度不能超过10")
+    @ApiModelProperty("主持人")
+    private String host;
+
+    @Size(max = 20, message = "会议方式字段长度不能超过20")
+    @ApiModelProperty("会议方式")
+    private String conferenceMethod;
+
+    @NotNull
+    @Size(max = 20, message = "会议状态字段长度不能超过20")
+    @ApiModelProperty("会议状态")
+    private String conferenceStatus;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/ConferenceRecordEntity.java

@@ -0,0 +1,55 @@
+package com.hnac.hzims.safeproduct.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+/**
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hzims_conference_record")
+@ApiModel(value = "会议记录实体类")
+public class ConferenceRecordEntity extends BaseEntity {
+
+    @ApiModelProperty("会议计划id")
+    private Long conferencePlanId;
+
+    @Size(max = 50, message = "编码字段长度不能超过50")
+    @ApiModelProperty("编码")
+    private String code;
+
+    @Size(max = 5000, message = "参会人员字段长度超出限制范围")
+    @ApiModelProperty("参会人员")
+    private String peopleName;
+
+    @ApiModelProperty("会议实际开始时间")
+    private Date actualStartTime;
+
+    @ApiModelProperty("会议实际结束时间")
+    private Date actualEndTime;
+
+    @Size(max = 20, message = "记录人字段长度不能超过20")
+    @ApiModelProperty("记录人")
+    private String recorder;
+
+    @Size(max = 250, message = "会议内容字段长度不能超过250")
+    @ApiModelProperty("会议内容")
+    private String content;
+
+    @Size(max = 1000, message = "会议图片字段长度不能超过1000")
+    @ApiModelProperty("会议图片")
+    private String imgPath;
+
+    @Size(max = 1000, message = "会议附件字段长度不能超过1000")
+    @ApiModelProperty("会议附件")
+    private String filePath;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalPlanEntity.java

@@ -0,0 +1,60 @@
+package com.hnac.hzims.safeproduct.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+/**
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("hzims_rehearsal_plan")
+@ApiModel(value = "演练计划实体类")
+public class RehearsalPlanEntity extends BaseEntity {
+
+    @NotNull
+    @Size(max = 50, message = "单位字段长度不能超过50")
+    @ApiModelProperty("单位")
+    private String unit;
+
+    @NotNull
+    @Size(max = 50, message = "演练科目字段长度不能超过50")
+    @ApiModelProperty("演练科目")
+    private String subject;
+
+    @NotNull
+    @ApiModelProperty("演练计划开始时间")
+    private Date scheduledStartTime;
+
+    @NotNull
+    @ApiModelProperty("演练计划结束时间")
+    private Date scheduledEndTime;
+
+    @NotNull
+    @Size(max = 255, message = "演练地点字段长度不能超过255")
+    @ApiModelProperty("演练地点")
+    private String location;
+
+    @NotNull
+    @Size(max = 10, message = "总指挥字段长度不能超过10")
+    @ApiModelProperty("总指挥")
+    private String commander;
+
+    @Size(max = 20, message = "演练方式字段长度不能超过20")
+    @ApiModelProperty("演练方式")
+    private String rehearsalMethod;
+
+    @NotNull
+    @Size(max = 20, message = "演练状态字段长度不能超过20")
+    @ApiModelProperty("演练状态")
+    private String rehearsalStatus;
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/RehearsalRecordEntity.java

@@ -1,7 +1,5 @@
 package com.hnac.hzims.safeproduct.entity;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +9,6 @@ import org.springblade.core.mp.base.BaseEntity;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Date;
 
@@ -21,65 +18,30 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ExcelIgnoreUnannotated
 @TableName("hzims_rehearsal_record")
 @ApiModel(value = "演练记录实体类")
 public class RehearsalRecordEntity extends BaseEntity {
 
+    @ApiModelProperty("演练计划id")
+    private Long rehearsalPlanId;
+
     @Size(max = 50, message = "编码字段长度不能超过50")
     @ApiModelProperty("编码")
-    @ExcelProperty(value = "编码", index = 0)
     private String code;
 
-    @NotNull
-    @Size(max = 50, message = "单位字段长度不能超过50")
-    @ApiModelProperty("单位")
-    @ExcelProperty(value = "单位", index = 1)
-    private String unit;
-
-    @NotNull
-    @Size(max = 50, message = "演练科目字段长度不能超过50")
-    @ApiModelProperty("演练科目")
-    @ExcelProperty(value = "演练科目", index = 2)
-    private String subject;
-
-    @NotNull
-    @ApiModelProperty("演练计划开始时间")
-    @ExcelProperty(value = "演练计划开始时间", index = 3)
-    private Date scheduledStartTime;
-
-    @NotNull
-    @ApiModelProperty("演练计划结束时间")
-    @ExcelProperty(value = "演练计划结束时间", index = 4)
-    private Date scheduledEndTime;
-
-    @NotNull
-    @Size(max = 255, message = "演练地点字段长度不能超过255")
-    @ApiModelProperty("演练地点")
-    @ExcelProperty(value = "演练地点", index = 5)
-    private String location;
-
     @Min(value = 0, message = "参演人数不能小于0")
     @Max(value = 1000, message = "参演人数字段长度超出限制范围")
     @ApiModelProperty("参演人数")
-    @ExcelProperty(value = "参演人数", index = 6)
     private Integer peopleNum;
 
     @Size(max = 5000, message = "参演人员字段长度超出限制范围")
     @ApiModelProperty("参演人员")
     private String peopleName;
 
-    @NotNull
-    @Size(max = 10, message = "总指挥字段长度不能超过10")
-    @ApiModelProperty("总指挥")
-    private String commander;
-
     @ApiModelProperty("演练实际开始时间")
-    @ExcelProperty(value = "演练实际开始时间", index = 7)
     private Date actualStartTime;
 
     @ApiModelProperty("演练实际结束时间")
-    @ExcelProperty(value = "演练实际结束时间", index = 8)
     private Date actualEndTime;
 
     @Size(max = 250, message = "演练记录字段长度不能超过250")
@@ -90,16 +52,6 @@ public class RehearsalRecordEntity extends BaseEntity {
     @ApiModelProperty("演练评价")
     private String comment;
 
-    @Size(max = 20, message = "演练方式字段长度不能超过20")
-    @ApiModelProperty("演练方式")
-    private String rehearsalMethod;
-
-    @NotNull
-    @Size(max = 20, message = "演练状态字段长度不能超过20")
-    @ApiModelProperty("演练状态")
-    @ExcelProperty(value = "演练状态", index = 9)
-    private String rehearsalStatus;
-
     @Size(max = 1000, message = "演练图片字段长度不能超过1000")
     @ApiModelProperty("演练图片")
     private String imgPath;

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TrainPlanEntity.java

@@ -1,5 +1,8 @@
 package com.hnac.hzims.safeproduct.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +20,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ExcelIgnoreUnannotated
 @TableName("hzims_train_plan")
 @ApiModel(value = "培训计划实体类")
 public class TrainPlanEntity extends BaseEntity {
@@ -24,24 +28,29 @@ public class TrainPlanEntity extends BaseEntity {
     @NotNull
     @Size(max = 50, message = "单位字段长度不能超过50")
     @ApiModelProperty("单位")
+    @ExcelProperty(value = "单位", index = 0)
     private String unit;
 
     @NotNull
     @ApiModelProperty("计划培训开始时间")
+    @ExcelProperty(value = "计划开始时间", index = 6)
     private Date scheduledStartTime;
 
     @NotNull
     @ApiModelProperty("计划培训结束时间")
+    @ExcelProperty(value = "计划结束时间", index = 7)
     private Date scheduledEndTime;
 
     @NotNull
     @Size(max = 255, message = "单位字段长度不能超过255")
     @ApiModelProperty("培训课程")
+    @ExcelProperty(value = "培训课程", index = 1)
     private String lesson;
 
     @NotNull
     @Size(max = 255, message = "培训地点字段长度不能超过255")
     @ApiModelProperty("培训地点")
+    @ExcelProperty(value = "培训地点", index = 2)
     private String location;
 
     @Size(max = 20, message = "培训方式字段长度不能超过20")
@@ -51,14 +60,21 @@ public class TrainPlanEntity extends BaseEntity {
     @NotNull
     @Size(max = 20, message = "培训讲师字段长度不能超过20")
     @ApiModelProperty("培训讲师")
+    @ExcelProperty(value = "培训讲师", index = 4)
     private String teacher;
 
     @NotNull
     @Size(max = 20, message = "培训状态字段长度不能超过20")
     @ApiModelProperty("培训状态")
+    @ExcelProperty(value = "培训状态", index = 3)
     private String trainStatus;
 
     @NotNull
     @ApiModelProperty("关联考试：0-否，1-是")
     private Integer isTest;
+
+    @TableField(exist = false)
+    @ApiModelProperty("是否考试")
+    @ExcelProperty(value = "是否考试", index = 5)
+    private String hasTest;
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TrainRecordEntity.java

@@ -1,5 +1,7 @@
 package com.hnac.hzims.safeproduct.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,6 +18,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ExcelIgnoreUnannotated
 @TableName("hzims_train_record")
 @ApiModel(value = "培训记录实体类")
 public class TrainRecordEntity extends BaseEntity {
@@ -25,28 +28,35 @@ public class TrainRecordEntity extends BaseEntity {
 
     @Size(max = 50, message = "名称字段长度不能超过50")
     @ApiModelProperty("培训记录名称")
+    @ExcelProperty(value = "培训记录名称", index = 1)
     private String trainRecordName;
 
     @Size(max = 50, message = "编码字段长度不能超过50")
     @ApiModelProperty("编码")
+    @ExcelProperty(value = "编码", index = 0)
     private String code;
 
     @Size(max = 5000, message = "培训学员字段长度超出限制范围")
     @ApiModelProperty("培训学员")
+    @ExcelProperty(value = "培训学员", index = 3)
     private String peopleName;
 
     @Size(max = 5000, message = "培训内容字段长度超出限制范围")
     @ApiModelProperty("培训内容")
+    @ExcelProperty(value = "培训内容", index = 2)
     private String content;
 
     @ApiModelProperty("实际培训开始时间")
+    @ExcelProperty(value = "实际开始时间", index = 5)
     private Date actualStartTime;
 
     @ApiModelProperty("实际培训结束时间")
+    @ExcelProperty(value = "实际结束时间", index = 6)
     private Date actualEndTime;
 
     @Size(max = 250, message = "培训评价字段长度不能超过250")
     @ApiModelProperty("培训评价")
+    @ExcelProperty(value = "培训评价", index = 4)
     private String command;
 
     @Size(max = 1000, message = "培训图片字段长度不能超过1000")

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/ConferenceMethodEnum.java

@@ -0,0 +1,31 @@
+package com.hnac.hzims.safeproduct.enums;
+
+/**
+ * 会议方式枚举类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+public enum ConferenceMethodEnum {
+
+    ONLINE("ONLINE", "线上"),
+    OFFLINE("OFFLINE", "线下"),
+    MIXED("MIXED", "线上+线下");
+
+    private final String value;
+
+    private final String desc;
+
+    ConferenceMethodEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/ConferenceStatusEnum.java

@@ -0,0 +1,31 @@
+package com.hnac.hzims.safeproduct.enums;
+
+/**
+ * 会议状态枚举类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+public enum ConferenceStatusEnum {
+
+    WAITING("WAITING", "未开始"),
+    UNFINISHED("UNFINISHED", "未完成"),
+    FINISHED("FINISHED", "已完成");
+
+    private final String value;
+
+    private final String desc;
+
+    ConferenceStatusEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/enums/TrainStatusEnum.java

@@ -0,0 +1,31 @@
+package com.hnac.hzims.safeproduct.enums;
+
+/**
+ * 培训计划状态枚举类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+public enum TrainStatusEnum {
+
+    WAITING("WAITING", "未开始"),
+    UNFINISHED("UNFINISHED", "未完成"),
+    FINISHED("FINISHED", "已完成");
+
+    private final String value;
+
+    private final String desc;
+
+    TrainStatusEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TestScoreVO.java

@@ -12,6 +12,9 @@ import lombok.Data;
 @ApiModel(value = "考试成绩VO类")
 public class TestScoreVO {
 
+    @ApiModelProperty("考试成绩id")
+    private Long id;
+
     @ApiModelProperty("姓名")
     private String name;
 

hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/controller/CertificatetNoticeController.java

@@ -0,0 +1,63 @@
+package com.hnac.hzims.basic.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
+import com.hnac.hzims.basic.service.IImsCertificatetNoticeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 控制器
+ *
+ * @author Chill
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/certificatetNotice")
+@Api(value = "档案通知配置页面", tags = "档案通知配置页面")
+public class CertificatetNoticeController extends BladeController {
+
+
+    private final IImsCertificatetNoticeService iImsCertificatetNoticeService;
+
+
+    /**
+     * 新增或修改
+     */
+    @PostMapping("/submit")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "增加", notes = "传入imsDutyClass")
+    public R submit(@RequestBody CertificatetNoticeEntity certificatetNoticeEntity) {
+        Boolean submit = iImsCertificatetNoticeService.saveOrUpdate(certificatetNoticeEntity);
+        if (submit) {
+            return R.success("保存成功");
+        }
+        return R.fail("保存失败");
+
+    }
+
+    /**
+     * 新增或修改
+     */
+    @PostMapping("/getCertificatetNotice")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "增加", notes = "传入imsDutyClass")
+    public R getCertificatetNotice() {
+        CertificatetNoticeEntity res = iImsCertificatetNoticeService.getOne(Wrappers.<CertificatetNoticeEntity>lambdaQuery()
+                .eq(CertificatetNoticeEntity::getIsDeleted, 0)
+                .last("limit 1;"));
+        if (ObjectUtil.isNotEmpty(res)) {
+            return R.data(res);
+        }
+        return R.data("");
+
+    }
+
+}

hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/mapper/CertificatetNoticeMapper.java

@@ -0,0 +1,15 @@
+package com.hnac.hzims.basic.mapper;
+
+import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author Chill
+ */
+@Mapper
+public interface CertificatetNoticeMapper extends UserDataScopeBaseMapper<CertificatetNoticeEntity> {
+
+}

hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/mapper/CertificatetNoticeMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.basic.mapper.CertificatetNoticeMapper">
+
+
+</mapper>

hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/mapper/PersonManagemetMapper.xml

@@ -20,13 +20,15 @@
             <result property="pic" column="pic" />
             <result property="status" column="status" />
             <result property="createTime" column="CREATE_TIME" />
+            <result property="isDead" column="isDead" />
         </collection>
     </resultMap>
 
     <!--嵌套查询-->
     <select id="getPersonManagemetEntity" resultMap="PersonManagemetMap">
         select a.id ,a.name,a.unit_name ,a.sex,a.job ,a.academic_title,a.phone ,a.CREATE_TIME,
-                b.id as certificatetId,b.person_id,b.type,b.dead_time,b.pic,b.CREATE_TIME,b.status,b.create_dept
+                b.id as certificatetId,b.person_id,b.type,b.dead_time,b.pic,b.CREATE_TIME,b.status,b.create_dept,
+        case when b.dead_time &lt; NOW() then "过期" else "未过期" end as isDead
         from hzims_person_managemet as a
         left join hzims_certificatet as b
         on a.id=b.person_id
@@ -55,9 +57,6 @@
         <if test="academicTitle != null and academicTitle != ''">
             and a.academic_title like CONCAT('%',#{academic_title},'%')
         </if>
-        <if test="status != null and status != ''">
-            and b.status =#{status}
-        </if>
         LIMIT #{current}, #{size}
     </select>
     <!--嵌套查询-->

hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/IImsCertificatetNoticeService.java

@@ -0,0 +1,13 @@
+package com.hnac.hzims.basic.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
+
+/**
+ *  服务类
+ *
+ * @author Chill
+ */
+public interface IImsCertificatetNoticeService extends IService<CertificatetNoticeEntity> {
+}

hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/CertificatetNoticeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hnac.hzims.basic.service.impl;
+
+import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
+import com.hnac.hzims.basic.mapper.CertificatetNoticeMapper;
+import com.hnac.hzims.basic.service.IImsCertificatetNoticeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 证书实现类
+ * @author ty
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class CertificatetNoticeServiceImpl extends BaseServiceImpl<CertificatetNoticeMapper, CertificatetNoticeEntity> implements IImsCertificatetNoticeService {
+}

hzims-service/hzims-scheduled/pom.xml

@@ -167,6 +167,10 @@
             <artifactId>weather-api</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>basic-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/CertificatetMapper.java

@@ -0,0 +1,15 @@
+package com.hnac.hzims.scheduled.mapper.basic;
+
+import com.hnac.hzims.basic.entity.CertificatetEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author Chill
+ */
+@Mapper
+public interface CertificatetMapper extends UserDataScopeBaseMapper<CertificatetEntity> {
+
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/CertificatetMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.basic.CertificatetMapper">
+
+
+</mapper>

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/CertificatetNoticeMapper.java

@@ -0,0 +1,15 @@
+package com.hnac.hzims.scheduled.mapper.basic;
+
+import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author Chill
+ */
+@Mapper
+public interface CertificatetNoticeMapper extends UserDataScopeBaseMapper<CertificatetNoticeEntity> {
+
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/CertificatetNoticeMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.basic.CertificatetNoticeMapper">
+
+
+</mapper>

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/PersonManagemetMapper.java

@@ -0,0 +1,29 @@
+package com.hnac.hzims.scheduled.mapper.basic;
+
+import com.hnac.hzims.basic.entity.PersonManagemetEntity;
+import com.hnac.hzims.basic.vo.PersonManagemetVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author Chill
+ */
+@Mapper
+public interface PersonManagemetMapper extends UserDataScopeBaseMapper<PersonManagemetEntity> {
+
+    List<PersonManagemetVo> getPersonManagemetEntity(
+            @Param(value = "type")String type, @Param(value = "deadStartTime") Date deadStartTime, @Param(value = "deadTime")Date deadTime,
+            @Param(value = "name")String name, @Param(value = "unitName")String unitName, @Param(value = "sex")String sex, @Param(value = "job")String job,
+            @Param(value = "academicTitle")String academicTitle, @Param(value = "status")Integer status, @Param(value = "current")Integer current, @Param(value = "size")Integer size) ;
+    Integer getCountByPersonManagemetEntity(
+            @Param(value = "type")String type, @Param(value = "deadStartTime") Date deadStartTime, @Param(value = "deadTime")Date deadTime,
+            @Param(value = "name")String name, @Param(value = "unitName")String unitName, @Param(value = "sex")String sex, @Param(value = "job")String job,
+            @Param(value = "academicTitle")String academicTitle, @Param(value = "status")Integer status, @Param(value = "current")Integer current, @Param(value = "size")Integer size) ;
+
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/PersonManagemetMapper.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.basic.PersonManagemetMapper">
+
+    <!--嵌套结果的 resultMap-->
+    <resultMap id="PersonManagemetMap" type="com.hnac.hzims.basic.vo.PersonManagemetVo">
+        <id property="id" column="id" jdbcType="VARCHAR" />
+        <result property="name" column="name" jdbcType="VARCHAR" />
+        <result property="unitName" column="unitName" jdbcType="VARCHAR" />
+        <result property="sex" column="sex" jdbcType="VARCHAR" />
+        <result property="job" column="job" jdbcType="VARCHAR" />
+        <result property="academicTitle" column="academic_title" jdbcType="VARCHAR"/>
+        <result property="phone" column="phone" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <collection property="certificatetEntityList" ofType="com.hnac.hzims.basic.entity.CertificatetEntity">
+            <id property="id" column="certificatetId" />
+            <result property="personId" column="person_id" />
+            <result property="type" column="type" />
+            <result property="deadTime" column="dead_time" />
+            <result property="pic" column="pic" />
+            <result property="status" column="status" />
+            <result property="isDead" column="isDead" />
+        </collection>
+    </resultMap>
+
+    <!--嵌套查询-->
+    <select id="getPersonManagemetEntity" resultMap="PersonManagemetMap">
+        select a.id ,a.name,a.unit_name ,a.sex,a.job ,a.academic_title,a.phone ,a.CREATE_TIME,
+                b.id as certificatetId,b.person_id,b.type,b.dead_time,b.pic,b.CREATE_TIME,b.status,b.create_dept,
+        case when b.dead_time &lt; NOW() then "过期" else "未过期" end as isDead
+        from hzims_person_managemet as a
+        left join hzims_certificatet as b
+        on a.id=b.person_id
+        where a.is_deleted = 0 and b.is_deleted = 0
+        <if test="type != null and type != ''">
+            and b.type = #{type}
+        </if>
+        <if test="deadStartTime != null and type != ''">
+            and b.dead_time  &gt;= #{deadStartTime}
+        </if>
+        <if test="deadTime != null and type != ''">
+            and b.dead_time &lt;=  #{deadTime}
+        </if>
+        <if test="name != null and name != ''">
+            and a.name like CONCAT('%',#{name},'%')
+        </if>
+        <if test="unitName != null and unitName != ''">
+            and a.unit_name like CONCAT('%',#{unitName},'%')
+        </if>
+        <if test="sex != null and sex != ''">
+            and a.sex = #{sex}
+        </if>
+        <if test="job != null and job != ''">
+            and a.job like CONCAT('%',#{job},'%')
+        </if>
+        <if test="academicTitle != null and academicTitle != ''">
+            and a.academic_title like CONCAT('%',#{academic_title},'%')
+        </if>
+        LIMIT #{current}, #{size}
+    </select>
+    <!--嵌套查询-->
+    <select id="getCountByPersonManagemetEntity" resultType="Integer">
+        select count(*)
+        from hzims_person_managemet as a
+        left join hzims_certificatet as b
+        on a.id=b.person_id
+        where a.is_deleted = 0 and b.is_deleted = 0
+        <if test="type != null and type != ''">
+            and b.type = #{type}
+        </if>
+        <if test="deadStartTime != null and type != ''">
+            and b.dead_time  &gt;= #{deadStartTime}
+        </if>
+        <if test="deadTime != null and type != ''">
+            and b.dead_time &lt;=  #{deadTime}
+        </if>
+        <if test="name != null and name != ''">
+            and a.name like CONCAT('%',#{name},'%')
+        </if>
+        <if test="unitName != null and unitName != ''">
+            and a.unit_name like CONCAT('%',#{unitName},'%')
+        </if>
+        <if test="sex != null and sex != ''">
+            and a.sex = #{sex}
+        </if>
+        <if test="job != null and job != ''">
+            and a.job like CONCAT('%',#{job},'%')
+        </if>
+        <if test="academicTitle != null and academicTitle != ''">
+            and a.academic_title like CONCAT('%',#{academic_title},'%')
+        </if>
+        <if test="status != null and status != ''">
+            and b.status =#{status}
+        </if>
+    </select>
+</mapper>
+

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/basicScheduledTask.java

@@ -0,0 +1,141 @@
+package com.hnac.hzims.scheduled.scheduled;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hnac.hzims.basic.entity.CertificatetEntity;
+import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
+import com.hnac.hzims.basic.entity.PersonManagemetEntity;
+import com.hnac.hzims.message.MessageConstants;
+import com.hnac.hzims.message.dto.BusinessMessageDTO;
+import com.hnac.hzims.message.entity.config.SmsConfigEntity;
+import com.hnac.hzims.message.fegin.IMessageClient;
+import com.hnac.hzims.message.fegin.IMessageConfigClient;
+import com.hnac.hzims.scheduled.mapper.basic.PersonManagemetMapper;
+import com.hnac.hzims.scheduled.service.basic.IImsCertificatetNoticeService;
+import com.hnac.hzims.scheduled.service.basic.IImsCertificatetService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.system.user.cache.UserCache;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.hnac.hzims.operational.main.constant.MainConstants.*;
+
+
+/**
+ * 排班到期定时任务通知
+ *
+ * @author ty
+ */
+@Slf4j
+@Component
+public class basicScheduledTask {
+
+    @Autowired
+    private IImsCertificatetService iImsCertificatetService;
+    @Autowired
+    private IImsCertificatetNoticeService iImsCertificatetNoticeService;
+    @Autowired
+    private ISysClient sysClient;
+    @Autowired
+    private IUserClient userClient;
+    @Autowired
+    private IMessageClient messageClient;
+    @Autowired
+    private PersonManagemetMapper personManagemetMapper;
+    @Autowired
+    private IMessageConfigClient messageConfigClient;
+
+    /**
+     * realId刷新
+     */
+    @XxlJob(CERTIFICATET_DEAD_LINE_NOTICE)
+//    @Scheduled(cron = "0 */1 * * * ? ")
+    public ReturnT<String> certificatetDeadLineNotice(String param) throws ParseException {
+        Date endTime = new Date();
+        if (Func.isBlank(param)) {
+            endTime = new SimpleDateFormat("yyyy-MM-dd").parse(param);
+        }
+        CertificatetNoticeEntity noticeEntity = iImsCertificatetNoticeService.getOne(Wrappers.<CertificatetNoticeEntity>lambdaQuery()
+                .eq(CertificatetNoticeEntity::getIsDeleted, 0)
+                .last("limit 1;"));
+        //用户档案过期截止时间
+        Date date = DateUtil.plusDays(endTime, noticeEntity.getSafeTime());
+        List<CertificatetEntity> list = iImsCertificatetService.list(Wrappers.<CertificatetEntity>lambdaQuery()
+                .le(CertificatetEntity::getDeadTime, date));
+        String noticeUsers = noticeEntity.getNoticeUsers();
+        List<String> userList = Arrays.asList(noticeUsers.split(","));
+        if (CollectionUtil.isNotEmpty(userList) && CollectionUtil.isNotEmpty(list)) {
+            List<String> personIds = list.stream().map(CertificatetEntity::getPersonId).collect(Collectors.toList());
+            List<PersonManagemetEntity> personManagemetEntities = personManagemetMapper.selectList(Wrappers.<PersonManagemetEntity>query().lambda().in(PersonManagemetEntity::getId, personIds));
+            String personNotice="";
+            if (CollectionUtil.isNotEmpty(personManagemetEntities)) {
+                personNotice = personManagemetEntities.stream().map(PersonManagemetEntity::getName).collect(Collectors.joining(","));
+            }
+            if ("1".equals(noticeEntity.getSendType())) {
+                sendSmsByUserList(userList, date,personNotice);
+            }
+            sendMessage(list.get(0), noticeEntity.getSafeTime(), noticeEntity.getNoticeUsers(),personNotice);
+        }
+        return new ReturnT<>("SUCCESS");
+    }
+
+    private void sendSmsByUserList(List<String> userList, Date date,String personNotice) {
+        //区分用户
+        for (String s : userList) {
+            User user = UserCache.getUser(Long.valueOf(s));
+            String phone = "";
+            if (ObjectUtil.isNotEmpty(user)) {
+                phone = user.getPhone();
+            }
+            //短信推送
+            String code = "certificatetNotice";
+            SmsConfigEntity smsConfigEntity = messageConfigClient.getSmsConfigByBusinessKey(code);
+            Map<String, String> contentParams = new HashMap<>(2);
+            contentParams.put("one", personNotice);
+            String deadLine = DateUtil.format(date, "yyyy-MM-dd");
+            contentParams.put("two", deadLine);
+            smsConfigEntity.setTemplateParam(JSONObject.toJSONString(contentParams));
+            smsConfigEntity.setPhones(phone);
+            messageConfigClient.pushSmsMessageByConfig(smsConfigEntity);
+        }
+    }
+
+    private void sendMessage(CertificatetEntity certificatetEntity, Integer date, String users,String personNotice) {
+//        //注意：通知人是创建人所在机构
+        BusinessMessageDTO message = new BusinessMessageDTO();
+        message.setBusinessClassify("system");
+        message.setBusinessKey(MessageConstants.BusinessClassifyEnum.CERTIFICATETNOTICE.getKey());
+        message.setSubject(MessageConstants.BusinessClassifyEnum.CERTIFICATETNOTICE.getDescription());
+        message.setTaskId(System.currentTimeMillis());
+        message.setTenantId("200000");
+        String countent =
+                 personNotice + "的证书即将到期，请提交新的证书资料";
+        message.setContent(countent);
+        message.setDeptId(certificatetEntity.getCreateDept());
+        R<String> deptName = sysClient.getDeptName(certificatetEntity.getCreateDept());
+        if (deptName.isSuccess()) {
+            message.setDeptName(deptName.getData());
+        }
+        message.setUserIds(users);
+        User admin = userClient.userByAccount("200000", "admin").getData();
+        message.setCreateUser(admin.getId());
+        messageClient.sendAppAndWsMsgByUsers(message);
+    }
+
+
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/IImsCertificatetNoticeService.java

@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.service.basic;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
+
+/**
+ *  服务类
+ *
+ * @author Chill
+ */
+public interface IImsCertificatetNoticeService extends IService<CertificatetNoticeEntity> {
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/IImsCertificatetService.java

@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.service.basic;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.basic.entity.CertificatetEntity;
+
+/**
+ *  服务类
+ *
+ * @author Chill
+ */
+public interface IImsCertificatetService extends IService<CertificatetEntity> {
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java

@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.basic.impl;
+
+import com.hnac.hzims.basic.entity.CertificatetNoticeEntity;
+import com.hnac.hzims.scheduled.mapper.basic.CertificatetNoticeMapper;
+import com.hnac.hzims.scheduled.service.basic.IImsCertificatetNoticeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 证书实现类
+ * @author ty
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class CertificatetNoticeServiceImpl extends BaseServiceImpl<CertificatetNoticeMapper, CertificatetNoticeEntity> implements IImsCertificatetNoticeService {
+}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java

@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.basic.impl;
+
+import com.hnac.hzims.basic.entity.CertificatetEntity;
+import com.hnac.hzims.scheduled.mapper.basic.CertificatetMapper;
+import com.hnac.hzims.scheduled.service.basic.IImsCertificatetService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+
+/**
+ * 证书实现类
+ * @author ty
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class CertificatetServiceImpl extends BaseServiceImpl<CertificatetMapper, CertificatetEntity> implements IImsCertificatetService {
+}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java

@@ -54,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -1162,6 +1163,12 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> imp
         voteChartVo.setFinishIds(finishIds);
         voteChartVo.setUndoneNum(undoneIds.size());
         voteChartVo.setUndoneIds(undoneIds);
+        if (CollectionUtil.isEmpty(list)||CollectionUtil.isEmpty(undoneIds)){
+            voteChartVo.setFinishRate(0.00d);
+        }else {
+            BigDecimal divide = new BigDecimal(list.size()).divide(new BigDecimal(list.size()),2,BigDecimal.ROUND_UP);
+            voteChartVo.setFinishRate(  divide.doubleValue());
+        }
         return voteChartVo;
     }
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java

@@ -143,17 +143,17 @@ public class OperDefectController extends BladeController {
     @OperationAnnotation(moduleName = "生产月报", title = "缺陷月报表", operatorType = OperatorType.MOBILE, businessType =
             BusinessType.GENCODE,
             action = "获取缺陷的统计月报")
-    public R<Map<String, Object>> getDefectStatistics(@ApiParam(value = "month 格式：2021-01", required = true) @RequestParam String month) {
+    public R<Map<String, Object>> getDefectStatistics(@ApiParam(value = "month 格式：2021-01", required = true) @RequestParam String month, @RequestParam String deptId) {
-        Map<String, Object> defectStatistics = defectService.getDefectStatistics(month);
+        Map<String, Object> defectStatistics = defectService.getDefectStatistics(month,deptId);
         return R.data(defectStatistics);
     }
 
     @ApiOperation(value = "缺陷月报表导出-Excel")
     @RequestMapping(value = "/exportFualtMonthExcel", method = {RequestMethod.GET, RequestMethod.POST})
-    public void exportFualtMonthExcel(HttpServletResponse response, @ApiParam(value = "month 格式：2021-01", required = true) @RequestParam String month) {
+    public void exportFualtMonthExcel(HttpServletResponse response, @ApiParam(value = "month 格式：2021-01", required = true) @RequestParam String month,@ApiParam String deptId) {
         Map<String, Object> result = new HashMap<>();
         try {
-            defectService.exportFualtMonthExcel(response, month);
+            defectService.exportFualtMonthExcel(response, month, deptId);
             result.put("success", "true");
         } catch (IOException e) {
             result.put("success", "false");

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.java

@@ -27,7 +27,7 @@ public interface OperDefectMapper extends UserDataScopeBaseMapper<OperDefectEnti
 	 * @return
 	 */
 	List<OperDefectStatisticsStatusDTO> getStatisticByMonth(@Param("month") String month,
-															@Param("createDept") String createDept);
+															@Param("createDept") List<String> createDept);
 
 	/**
 	 * 当年1月 - 当前月获取缺陷等级统计数据
@@ -37,13 +37,13 @@ public interface OperDefectMapper extends UserDataScopeBaseMapper<OperDefectEnti
 	 */
 	List<OperDefectStatisticsStatusDTO> getStatisticBySeveralMonth(@Param("firstMonth") String firstMonth,
 																   @Param("endMonth") String endMonth,
-																   @Param("createDept") String createDept);
+																   @Param("createDept") List<String> createDept);
 
 	/**
 	 * 获取重复缺陷等级统计数据
 	 * @return
 	 */
-	List<OperDefectStatisticsCodeDTO> getRepetStatistics(@Param("createDept") String createDept);
+	List<OperDefectStatisticsCodeDTO> getRepetStatistics(@Param("createDept") List<String> createDept);
 
 	/**
 	 * 获取按月管理指标统计数据
@@ -52,7 +52,7 @@ public interface OperDefectMapper extends UserDataScopeBaseMapper<OperDefectEnti
 	 * @return
 	 */
 	List<Integer> getManageIndex(@Param("month") String month,
-								 @Param("createDept") String createDept);
+								 @Param("createDept") List<String> createDept);
 
 
 	List<OperDefectEntity> selectDefectList(String emCode,List<String> list);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.xml

@@ -8,8 +8,11 @@
         hzims_oper_phenomenon P
         ON D.DEFECT_CODE = P.DEFECT_CODE
         WHERE DATE_FORMAT(D.CREATE_TIME,'%Y-%m') = #{month}
-        <if test="createDept != null and createDept != ''">
+        <if test="createDept != null and createDept.size > 0">
-            AND D.CREATE_DEPT = #{createDept}
+            and D.CREATE_DEPT in
+            <foreach collection="createDept" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         GROUP BY P.DEFECT_LEVEL,D.HANDLE_STATUS
         ORDER BY P.DEFECT_LEVEL
@@ -22,8 +25,11 @@
         LEFT JOIN hzims_oper_phenomenon P
         ON D.DEFECT_CODE = P.DEFECT_CODE
         WHERE D.CREATE_TIME BETWEEN #{firstMonth} AND #{endMonth}
-        <if test="createDept != null and createDept != ''">
+        <if test="createDept != null and createDept.size > 0">
-            AND D.CREATE_DEPT = #{createDept}
+            and D.CREATE_DEPT in
+            <foreach collection="createDept" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         GROUP BY P.DEFECT_LEVEL,D.HANDLE_STATUS
         ORDER BY P.DEFECT_LEVEL
@@ -34,8 +40,11 @@
         hzims_oper_phenomenon P
         ON D.DEFECT_CODE = P.DEFECT_CODE
         WHERE 1=1
-        <if test="createDept != null and createDept != ''">
+        <if test="createDept != null and createDept.size > 0">
-            AND D.CREATE_DEPT = #{createDept}
+            and D.CREATE_DEPT in
+            <foreach collection="createDept" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         GROUP BY P.DEFECT_LEVEL,P.FAULT_CODE
     </select>
@@ -47,8 +56,11 @@
         WHERE DATE_FORMAT(D.CREATE_TIME,'%Y-%m') = #{month}
         AND D.HANDLE_STATUS = 1
         AND D.ACT_END_TIME &lt;= P.PLAN_END_TIME
-        <if test="createDept != null and createDept != ''">
+        <if test="createDept != null and createDept.size > 0">
-            AND D.CREATE_DEPT = #{createDept}
+            and D.CREATE_DEPT in
+            <foreach collection="createDept" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         )
         UNION ALL
@@ -57,8 +69,11 @@
         SELECT COUNT(D.ID) AS DEFECT_NUM from hzims_oper_defect D
         WHERE DATE_FORMAT(D.CREATE_TIME,'%Y-%m') = #{month}
         AND D.HANDLE_STATUS = 1
-        <if test="createDept != null and createDept != ''">
+        <if test="createDept != null and createDept.size > 0">
-            AND D.CREATE_DEPT = #{createDept}
+            and D.CREATE_DEPT in
+            <foreach collection="createDept" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         )
         UNION ALL
@@ -67,8 +82,11 @@
         SELECT COUNT(D.ID) AS DEFECT_NUM from hzims_oper_defect D
         WHERE DATE_FORMAT(D.CREATE_TIME,'%Y-%m') = #{month}
         AND D.HANDLE_STATUS = 0
-        <if test="createDept != null and createDept != ''">
+        <if test="createDept != null and createDept.size > 0">
-            AND D.CREATE_DEPT = #{createDept}
+            and D.CREATE_DEPT in
+            <foreach collection="createDept" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         )
         UNION ALL
@@ -77,8 +95,11 @@
         SELECT COUNT(D.ID) AS DEFECT_NUM from hzims_oper_defect D
         WHERE DATE_FORMAT(D.CREATE_TIME,'%Y-%m') &lt; CONCAT(#{month}, '-01')
         AND D.HANDLE_STATUS = 0
-        <if test="createDept != null and createDept != ''">
+        <if test="createDept != null and createDept.size > 0">
-            AND D.CREATE_DEPT = #{createDept}
+            and D.CREATE_DEPT in
+            <foreach collection="createDept" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         )
         UNION ALL
@@ -86,8 +107,11 @@
         (
         SELECT COUNT(D.ID) AS DEFECT_NUM from hzims_oper_defect D
         WHERE DATE_FORMAT(D.CREATE_TIME,'%Y-%m') = #{month}
-        <if test="createDept != null and createDept != ''">
+        <if test="createDept != null and createDept.size > 0">
-            AND D.CREATE_DEPT = #{createDept}
+            and D.CREATE_DEPT in
+            <foreach collection="createDept" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         )
     </select>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java

@@ -43,7 +43,7 @@ public interface IOperDefectService extends BaseService<OperDefectEntity> {
      * 获取缺陷的统计月报
      * @param month 格式："2021-01"
      */
-    Map<String, Object> getDefectStatistics(String month);
+    Map<String, Object> getDefectStatistics(String month,String deptId);
 
     /**
      * 导出缺陷统计月报报表
@@ -51,7 +51,7 @@ public interface IOperDefectService extends BaseService<OperDefectEntity> {
      * @param month 格式 "2021-01"
      * @throws IOException
      */
-    void exportFualtMonthExcel(HttpServletResponse response, String month) throws IOException;
+    void exportFualtMonthExcel(HttpServletResponse response, String month,String deptId) throws IOException;
 
 
     List<OperDefectEntity> getDefectList(String emCode,List<String> list);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java

@@ -50,6 +50,8 @@ import org.springblade.flow.core.feign.IFlowClient;
 import org.springblade.flow.core.utils.FlowUtil;
 import org.springblade.flow.core.vo.ComleteTask;
 import org.springblade.system.cache.DictCache;
+import org.springblade.system.entity.Dept;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -57,6 +59,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
@@ -85,6 +88,8 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
 
     private final IUserClient userClient;
 
+    private final ISysClient sysClient;
+
     private final OperPhenomenonMapper operPhenomenonMapper;
 
     /**
@@ -118,6 +123,7 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
         }
 
     }
+
     @Override
     public LambdaQueryWrapper<OperDefectEntity> getQueryWrapper(OperDefectVO defectVO) {
         LambdaQueryWrapper<OperDefectEntity> queryWrapper = Condition.getQueryWrapper(new OperDefectEntity(), defectVO);
@@ -180,6 +186,7 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
         queryWrapper.orderByDesc(OperDefectEntity::getCreateTime);
         return queryWrapper;
     }
+
     /**
      * 处理问题
      *
@@ -238,19 +245,19 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
      * @param month 格式："2021-01"
      */
     @Override
-    public Map<String, Object> getDefectStatistics(String month) {
+    public Map<String, Object> getDefectStatistics(String month, String deptId) {
         Map<String, Object> re = new HashMap<>();
-        re.put("currentMonth", getCurrentMonthStatic(month));
+        re.put("currentMonth", getCurrentMonthStatic(month, deptId));
-        re.put("severalMonths", getStatisticBySeveralMonth(month));
+        re.put("severalMonths", getStatisticBySeveralMonth(month, deptId));
-        re.put("manageIndex", getManageIndexStatistic(month));
+        re.put("manageIndex", getManageIndexStatistic(month, deptId));
-        re.put("repeat", getRepeatStatistic(month));
+        re.put("repeat", getRepeatStatistic(deptId));
         return re;
     }
 
     @Override
-    public void exportFualtMonthExcel(HttpServletResponse response, String month) throws IOException {
+    public void exportFualtMonthExcel(HttpServletResponse response, String month, String deptId) throws IOException {
         Map<String, Object> re = new HashMap<>();
-        re = this.getDefectStatistics(month);
+        re = this.getDefectStatistics(month, deptId);
         //获取数据
         List<OperDefectRatioDTO> currentMonth = (List<OperDefectRatioDTO>) re.get("currentMonth");
         List<OperDefectRatioDTO> severalMonths = (List<OperDefectRatioDTO>) re.get("severalMonths");
@@ -785,8 +792,25 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
      * @param month
      * @return
      */
-    private List<OperDefectRatioDTO> getCurrentMonthStatic(String month) {
+    private List<OperDefectRatioDTO> getCurrentMonthStatic(String month, String deptId) {
-        List<OperDefectStatisticsStatusDTO> statisticByMonth = this.baseMapper.getStatisticByMonth(month, AuthUtil.getDeptId());
+        List<String> createDeptList = new ArrayList<>();
+        List<String> deptList = new ArrayList<>();
+        R<List<Dept>> res = sysClient.getDeptByCurrentUser();
+        if (res.isSuccess() && CollectionUtil.isNotEmpty(res.getData())) {
+            deptList = res.getData().stream().map(Dept::getId).map(s -> s.toString()).collect(Collectors.toList());
+        } else {
+            log.error("getCurrentMonthStatic"+"用户权限问题");
+            throw new WebServiceException("该用户没有此权限");
+        }
+        if (StringUtil.isNotBlank(deptId)) {
+            if (deptList.contains(deptId)) {
+                createDeptList.add(deptId);
+            }
+        } else {
+            //拿到用户当前及其以下的机构
+            createDeptList.addAll(deptList);
+        }
+        List<OperDefectStatisticsStatusDTO> statisticByMonth = this.baseMapper.getStatisticByMonth(month, createDeptList);
         return getRatioStatic(statisticByMonth);
     }
 
@@ -796,7 +820,7 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
      * @param month "2021-01"
      * @return
      */
-    private List<OperDefectRatioDTO> getStatisticBySeveralMonth(String month) {
+    private List<OperDefectRatioDTO> getStatisticBySeveralMonth(String month, String deptId) {
         Integer intervalMonth = Integer.valueOf(month.split("-")[1]);
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date;
@@ -811,8 +835,23 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
             throw new ServiceException("日期转换失败");
         }
         log.error("firstMonth:" + firstMonth + "; end=" + dateFormat.format(date));
-
+        List<String> createDeptList = new ArrayList<>();
-        List<OperDefectStatisticsStatusDTO> statisticBySeveralMonth = this.baseMapper.getStatisticBySeveralMonth(firstMonth, dateFormat.format(date), AuthUtil.getDeptId());
+        List<String> deptList = new ArrayList<>();
+        R<List<Dept>> res = sysClient.getDeptByCurrentUser();
+        if (res.isSuccess() && CollectionUtil.isNotEmpty(res.getData())) {
+            deptList = res.getData().stream().map(Dept::getId).map(s -> s.toString()).collect(Collectors.toList());
+        } else {
+            throw new WebServiceException("该用户没有此权限");
+        }
+        if (StringUtil.isNotBlank(deptId)) {
+            if (deptList.contains(deptId)) {
+                createDeptList.add(deptId);
+            }
+        } else {
+            //拿到用户当前及其以下的机构
+            createDeptList.addAll(deptList);
+        }
+        List<OperDefectStatisticsStatusDTO> statisticBySeveralMonth = this.baseMapper.getStatisticBySeveralMonth(firstMonth, dateFormat.format(date), createDeptList);
         return getRatioStatic(statisticBySeveralMonth);
     }
 
@@ -822,9 +861,25 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
      * @param month
      * @return
      */
-    private OperDefectManageIndexDTO getManageIndexStatistic(String month) {
+    private OperDefectManageIndexDTO getManageIndexStatistic(String month, String deptId) {
         OperDefectManageIndexDTO manageIndex = new OperDefectManageIndexDTO();
-        List<Integer> list = this.baseMapper.getManageIndex(month, AuthUtil.getDeptId());
+        List<String> createDeptList = new ArrayList<>();
+        List<String> deptList = new ArrayList<>();
+        R<List<Dept>> res = sysClient.getDeptByCurrentUser();
+        if (res.isSuccess() && CollectionUtil.isNotEmpty(res.getData())) {
+            deptList = res.getData().stream().map(Dept::getId).map(s -> s.toString()).collect(Collectors.toList());
+        } else {
+            throw new WebServiceException("该用户没有此权限");
+        }
+        if (StringUtil.isNotBlank(deptId)) {
+            if (deptList.contains(deptId)) {
+                createDeptList.add(deptId);
+            }
+        } else {
+            //拿到用户当前及其以下的机构
+            createDeptList.addAll(deptList);
+        }
+        List<Integer> list = this.baseMapper.getManageIndex(month, createDeptList);
         manageIndex.setInTimeNum(list.get(0));
         if (!list.get(1).equals(0)) {
             manageIndex.setInTimeRatio(list.get(0).equals(0) ? 0.0 : Double.valueOf(list.get(0)) / list.get(1));
@@ -840,50 +895,67 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
     /**
      * 获取重复缺陷等级统计数据
      *
-     * @param month
+     * @param deptId
      * @return
      */
-    private List<OperDefectRepeatRatioDTO> getRepeatStatistic(String month) {
+    private List<OperDefectRepeatRatioDTO> getRepeatStatistic(String deptId) {
         List<OperDefectRepeatRatioDTO> re = new ArrayList<>();
-
+        List<String> createDeptList = new ArrayList<>();
-        List<OperDefectStatisticsCodeDTO> repetStatistics = this.baseMapper.getRepetStatistics(AuthUtil.getDeptId());
+        List<String> deptList ;
-        //总缺陷数
+        R<List<Dept>> res = sysClient.getDeptByCurrentUser();
-        int total = repetStatistics.stream().mapToInt(OperDefectStatisticsCodeDTO::getDefectNum).sum();
+        if (res.isSuccess() && CollectionUtil.isNotEmpty(res.getData())) {
-        //总重复缺陷数
+            deptList = res.getData().stream().map(Dept::getId).map(s -> s.toString()).collect(Collectors.toList());
-        int totalRepeat = repetStatistics.stream().filter(s -> s.getDefectNum() > 1 && s.getDefectLevel() != null).collect(Collectors.summingInt(OperDefectStatisticsCodeDTO::getDefectNum));
+        } else {
-        //等级重复统计
+            throw new WebServiceException("该用户没有此权限");
-        Map<String, IntSummaryStatistics> repeatList = repetStatistics.stream().filter(s -> s.getDefectNum() > 1 && s.getDefectLevel() != null).collect(Collectors.groupingBy(OperDefectStatisticsCodeDTO::getDefectLevel, Collectors.summarizingInt(OperDefectStatisticsCodeDTO::getDefectNum)));
-
-        OperDefectRepeatRatioDTO one = new OperDefectRepeatRatioDTO();
-        one.setDefectLevel(DefectConstant.DefectLevelEnum.ONE.getStatus());
-        if (repeatList.get(one.getDefectLevel()) != null) {
-            one.setHappenNum(repeatList.get(one.getDefectLevel()).getSum());
-            one.setHappenRatio(one.getHappenNum() / Double.valueOf(total));
-            one.setRepeatRatio(one.getHappenNum() / Double.valueOf(totalRepeat));
         }
-
+        if (StringUtil.isNotBlank(deptId)) {
-        OperDefectRepeatRatioDTO two = new OperDefectRepeatRatioDTO();
+            if (deptList.contains(deptId)) {
-        two.setDefectLevel(DefectConstant.DefectLevelEnum.TWO.getStatus());
+                createDeptList.add(deptId);
-        if (repeatList.get(two.getDefectLevel()) != null) {
+            }
-            two.setHappenNum(repeatList.get(two.getDefectLevel()).getSum());
+        } else {
-            two.setHappenRatio(two.getHappenNum() / Double.valueOf(total));
+            //拿到用户当前及其以下的机构
-            two.setRepeatRatio(two.getHappenNum() / Double.valueOf(totalRepeat));
+            createDeptList.addAll(deptList);
         }
+        if (CollectionUtil.isNotEmpty(createDeptList)) {
+            List<OperDefectStatisticsCodeDTO> repetStatistics = this.baseMapper.getRepetStatistics(createDeptList);
+            //总缺陷数
+            int total = repetStatistics.stream().mapToInt(OperDefectStatisticsCodeDTO::getDefectNum).sum();
+            //总重复缺陷数
+            int totalRepeat = repetStatistics.stream().filter(s -> s.getDefectNum() > 1 && s.getDefectLevel() != null).collect(Collectors.summingInt(OperDefectStatisticsCodeDTO::getDefectNum));
+            //等级重复统计
+            Map<String, IntSummaryStatistics> repeatList = repetStatistics.stream().filter(s -> s.getDefectNum() > 1 && s.getDefectLevel() != null).collect(Collectors.groupingBy(OperDefectStatisticsCodeDTO::getDefectLevel, Collectors.summarizingInt(OperDefectStatisticsCodeDTO::getDefectNum)));
+
+            OperDefectRepeatRatioDTO one = new OperDefectRepeatRatioDTO();
+            one.setDefectLevel(DefectConstant.DefectLevelEnum.ONE.getStatus());
+            if (repeatList.get(one.getDefectLevel()) != null) {
+                one.setHappenNum(repeatList.get(one.getDefectLevel()).getSum());
+                one.setHappenRatio(one.getHappenNum() / Double.valueOf(total));
+                one.setRepeatRatio(one.getHappenNum() / Double.valueOf(totalRepeat));
+            }
 
-        OperDefectRepeatRatioDTO three = new OperDefectRepeatRatioDTO();
+            OperDefectRepeatRatioDTO two = new OperDefectRepeatRatioDTO();
-        three.setDefectLevel(DefectConstant.DefectLevelEnum.THREE.getStatus());
+            two.setDefectLevel(DefectConstant.DefectLevelEnum.TWO.getStatus());
-        if (repeatList.get(three.getDefectLevel()) != null) {
+            if (repeatList.get(two.getDefectLevel()) != null) {
-            three.setHappenNum(repeatList.get(three.getDefectLevel()).getSum());
+                two.setHappenNum(repeatList.get(two.getDefectLevel()).getSum());
-            three.setHappenRatio(three.getHappenNum() / Double.valueOf(total));
+                two.setHappenRatio(two.getHappenNum() / Double.valueOf(total));
-            three.setRepeatRatio(three.getHappenNum() / Double.valueOf(totalRepeat));
+                two.setRepeatRatio(two.getHappenNum() / Double.valueOf(totalRepeat));
-        }
+            }
 
-        OperDefectRepeatRatioDTO addUp = OperDefectRepeatRatioDTO.builder().defectLevel("合计").happenNum(one.getHappenNum() + two.getHappenNum() + three.getHappenNum()).happenRatio(one.getHappenRatio() + two.getHappenRatio() + three.getHappenRatio()).repeatRatio(1.00).build();
+            OperDefectRepeatRatioDTO three = new OperDefectRepeatRatioDTO();
-        if (addUp.getHappenNum().equals(0L)) {
+            three.setDefectLevel(DefectConstant.DefectLevelEnum.THREE.getStatus());
-            addUp.setRepeatRatio(0.0);
+            if (repeatList.get(three.getDefectLevel()) != null) {
-        }
+                three.setHappenNum(repeatList.get(three.getDefectLevel()).getSum());
+                three.setHappenRatio(three.getHappenNum() / Double.valueOf(total));
+                three.setRepeatRatio(three.getHappenNum() / Double.valueOf(totalRepeat));
+            }
 
-        re.addAll(Arrays.asList(one, two, three, addUp));
+            OperDefectRepeatRatioDTO addUp = OperDefectRepeatRatioDTO.builder().defectLevel("合计").happenNum(one.getHappenNum() + two.getHappenNum() + three.getHappenNum()).happenRatio(one.getHappenRatio() + two.getHappenRatio() + three.getHappenRatio()).repeatRatio(1.00).build();
+            if (addUp.getHappenNum().equals(0L)) {
+                addUp.setRepeatRatio(0.0);
+            }
+
+            re.addAll(Arrays.asList(one, two, three, addUp));
+        }
         return re;
     }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/BaseController.java

@@ -0,0 +1,56 @@
+package com.hnac.hzims.safeproduct.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.safeproduct.constants.SafeProductConstant;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.api.R;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 公用业务接口类
+ *
+ * @author liwen
+ * @date 2023-12-28
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/base")
+@Api(value = "公用业务", tags = "公用业务接口")
+public class BaseController extends BladeController {
+
+    private final ISysClient sysClient;
+
+    private final IUserClient userClient;
+
+    @GetMapping("/getDeptName")
+    @ApiOperation(value = "获取所属机构名")
+    @ApiOperationSupport(order = 1)
+    public R<String> getDeptName() {
+        BladeUser bladeUser = getUser();
+        String deptId = bladeUser.getDeptId();
+        if (StringUtils.isNotBlank(deptId)) {
+            return sysClient.getDeptName(Long.valueOf(deptId));
+        }
+        return R.data(null, "所属机构为空");
+    }
+
+    @GetMapping("/getUserList")
+    @ApiOperation(value = "获取用户列表")
+    @ApiOperationSupport(order = 2)
+    public R<List<User>> getUserList(@RequestParam String name) {
+        return userClient.userListByCodeAndNameAndAccount(SafeProductConstant.TENANT_ID, null, name, null);
+    }
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ConferenceController.java

@@ -0,0 +1,133 @@
+package com.hnac.hzims.safeproduct.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.hnac.hzims.common.utils.Condition;
+import com.hnac.hzims.safeproduct.entity.ConferencePlanEntity;
+import com.hnac.hzims.safeproduct.entity.ConferenceRecordEntity;
+import com.hnac.hzims.safeproduct.service.IConferencePlanService;
+import com.hnac.hzims.safeproduct.service.IConferenceRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * 会议管理接口类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/conference")
+@Api(value = "会议管理", tags = "会议管理接口")
+public class ConferenceController extends BladeController {
+
+    private final IConferencePlanService conferencePlanService;
+
+    private final IConferenceRecordService conferenceRecordService;
+
+    @PostMapping("/savePlan")
+    @ApiOperation(value = "新增会议计划")
+    @ApiOperationSupport(order = 1)
+    public R savePlan(@Valid @RequestBody ConferencePlanEntity conferencePlan) {
+        return R.status(conferencePlanService.save(conferencePlan));
+    }
+
+    @PostMapping("/updatePlan")
+    @ApiOperation(value = "修改会议计划")
+    @ApiOperationSupport(order = 2)
+    public R updatePlan(@Valid @RequestBody ConferencePlanEntity conferencePlan) {
+        return R.status(conferencePlanService.updateById(conferencePlan));
+    }
+
+    @PostMapping("/removePlan")
+    @ApiOperation(value = "删除会议计划")
+    @ApiOperationSupport(order = 3)
+    public R removePlan(@RequestParam Long id) {
+        return R.status(conferencePlanService.removePlan(id));
+    }
+
+    @GetMapping("/planDetail")
+    @ApiOperation(value = "会议计划详情")
+    @ApiOperationSupport(order = 4)
+    public R<ConferencePlanEntity> planDetail(@RequestParam Long id) {
+        return R.data(conferencePlanService.getById(id));
+    }
+
+    @GetMapping("/planPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "unit", value = "单位", dataType = "query", paramType = "string"),
+            @ApiImplicitParam(name = "scheduledStartTime", value = "计划开始时间", dataType = "query", paramType = "string"),
+            @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
+    })
+    @ApiOperation(value = "会议计划分页")
+    @ApiOperationSupport(order = 5)
+    public R<IPage<ConferencePlanEntity>> planPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
+        IPage<ConferencePlanEntity> page = conferencePlanService.planPage(param, query);
+        return R.data(page);
+    }
+
+    @PostMapping("/saveRecord")
+    @ApiOperation(value = "新增会议记录")
+    @ApiOperationSupport(order = 6)
+    public R saveRecord(@Valid @RequestBody ConferenceRecordEntity conferenceRecord) {
+        return R.status(conferenceRecordService.saveRecord(conferenceRecord));
+    }
+
+    @PostMapping("/updateRecord")
+    @ApiOperation(value = "修改会议记录")
+    @ApiOperationSupport(order = 7)
+    public R updateRecord(@Valid @RequestBody ConferenceRecordEntity conferenceRecord) {
+        return R.status(conferenceRecordService.updateById(conferenceRecord));
+    }
+
+    @PostMapping("/removeRecord")
+    @ApiOperation(value = "删除会议记录")
+    @ApiOperationSupport(order = 8)
+    public R removeRecord(@RequestParam Long id) {
+        return R.status(conferenceRecordService.removeById(id));
+    }
+
+    @GetMapping("/recordDetail")
+    @ApiOperation(value = "会议记录详情")
+    @ApiOperationSupport(order = 9)
+    public R<ConferenceRecordEntity> recordDetail(@RequestParam Long id) {
+        return R.data(conferenceRecordService.getById(id));
+    }
+
+    @GetMapping("/recordPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "conferencePlanId", value = "会议计划id", dataType = "query", paramType = "string")
+    })
+    @ApiOperation(value = "会议记录分页")
+    @ApiOperationSupport(order = 10)
+    public R<IPage<ConferenceRecordEntity>> recordPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
+        IPage<ConferenceRecordEntity> page = conferenceRecordService.page(Condition.getPage(query),
+                Condition.getQueryWrapper(param, ConferenceRecordEntity.class));
+        return R.data(page);
+    }
+
+    @GetMapping("/exportConferenceData")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "unit", value = "单位", dataType = "query", paramType = "string"),
+            @ApiImplicitParam(name = "scheduledStartTime", value = "计划开始时间", dataType = "query", paramType = "string"),
+            @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
+    })
+    @ApiOperation(value = "会议数据导出")
+    @ApiOperationSupport(order = 11)
+    public void exportConferenceData(@ApiIgnore @RequestParam Map<String, Object> param, HttpServletResponse response) {
+        conferencePlanService.exportConferenceData(param, response);
+    }
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/RehearsalRecordController.java

@@ -3,7 +3,9 @@ package com.hnac.hzims.safeproduct.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.common.utils.Condition;
+import com.hnac.hzims.safeproduct.entity.RehearsalPlanEntity;
 import com.hnac.hzims.safeproduct.entity.RehearsalRecordEntity;
+import com.hnac.hzims.safeproduct.service.IRehearsalPlanService;
 import com.hnac.hzims.safeproduct.service.IRehearsalRecordService;
 import com.hnac.hzims.safeproduct.vo.RehearsalMonthVO;
 import com.hnac.hzims.safeproduct.vo.RehearsalYearVO;
@@ -36,32 +38,34 @@ public class RehearsalRecordController extends BladeController {
 
     private final IRehearsalRecordService rehearsalRecordService;
 
+    private final IRehearsalPlanService rehearsalPlanService;
+
     @PostMapping("/save")
-    @ApiOperation(value = "新增")
+    @ApiOperation(value = "新增演练计划")
     @ApiOperationSupport(order = 1)
-    public R save(@Valid @RequestBody RehearsalRecordEntity rehearsalRecord) {
+    public R save(@Valid @RequestBody RehearsalPlanEntity rehearsalPlan) {
-        return R.status(rehearsalRecordService.saveRehearsal(rehearsalRecord));
+        return R.status(rehearsalPlanService.save(rehearsalPlan));
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "修改")
+    @ApiOperation(value = "修改演练计划")
     @ApiOperationSupport(order = 2)
-    public R update(@Valid @RequestBody RehearsalRecordEntity rehearsalRecord) {
+    public R update(@Valid @RequestBody RehearsalPlanEntity rehearsalPlan) {
-        return R.status(rehearsalRecordService.updateRehearsal(rehearsalRecord));
+        return R.status(rehearsalPlanService.updateById(rehearsalPlan));
     }
 
     @PostMapping("/remove")
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除演练计划")
     @ApiOperationSupport(order = 3)
     public R remove(@RequestParam Long id) {
-        return R.status(rehearsalRecordService.removeById(id));
+        return R.status(rehearsalPlanService.removeRehearsalPlan(id));
     }
 
     @GetMapping("/detail")
-    @ApiOperation(value = "详情")
+    @ApiOperation(value = "演练计划详情")
     @ApiOperationSupport(order = 4)
-    public R<RehearsalRecordEntity> detail(@RequestParam Long id) {
+    public R<RehearsalPlanEntity> detail(@RequestParam Long id) {
-        return R.data(rehearsalRecordService.getById(id));
+        return R.data(rehearsalPlanService.getById(id));
     }
 
     @GetMapping("/page")
@@ -70,9 +74,48 @@ public class RehearsalRecordController extends BladeController {
             @ApiImplicitParam(name = "scheduledStartTime", value = "计划开始时间", dataType = "query", paramType = "string"),
             @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
     })
-    @ApiOperation(value = "分页")
+    @ApiOperation(value = "演练计划分页")
     @ApiOperationSupport(order = 5)
-    public R<IPage<RehearsalRecordEntity>> page(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
+    public R<IPage<RehearsalPlanEntity>> page(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
+        IPage<RehearsalPlanEntity> page = rehearsalPlanService.rehearsalPlanPage(param, query);
+        return R.data(page);
+    }
+
+    @PostMapping("/saveRehearsalRecord")
+    @ApiOperation(value = "新增演练记录")
+    @ApiOperationSupport(order = 6)
+    public R saveRehearsalRecord(@Valid @RequestBody RehearsalRecordEntity rehearsalRecord) {
+        return R.status(rehearsalRecordService.saveRehearsalRecord(rehearsalRecord));
+    }
+
+    @PostMapping("/updateRehearsalRecord")
+    @ApiOperation(value = "修改演练记录")
+    @ApiOperationSupport(order = 7)
+    public R updateRehearsalRecord(@Valid @RequestBody RehearsalRecordEntity rehearsalRecord) {
+        return R.status(rehearsalRecordService.updateRehearsalRecord(rehearsalRecord));
+    }
+
+    @PostMapping("/removeRehearsalRecord")
+    @ApiOperation(value = "删除演练记录")
+    @ApiOperationSupport(order = 8)
+    public R removeRehearsalRecord(@RequestParam Long id) {
+        return R.status(rehearsalRecordService.removeById(id));
+    }
+
+    @GetMapping("/rehearsalRecordDetail")
+    @ApiOperation(value = "演练记录详情")
+    @ApiOperationSupport(order = 9)
+    public R<RehearsalRecordEntity> rehearsalRecordDetail(@RequestParam Long id) {
+        return R.data(rehearsalRecordService.getById(id));
+    }
+
+    @GetMapping("/rehearsalRecordPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "rehearsalPlanId", value = "演练计划id", dataType = "query", paramType = "string")
+    })
+    @ApiOperation(value = "演练记录分页")
+    @ApiOperationSupport(order = 10)
+    public R<IPage<RehearsalRecordEntity>> rehearsalRecordPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
         IPage<RehearsalRecordEntity> page = rehearsalRecordService.page(Condition.getPage(query),
                 Condition.getQueryWrapper(param, RehearsalRecordEntity.class));
         return R.data(page);
@@ -80,17 +123,17 @@ public class RehearsalRecordController extends BladeController {
 
     @GetMapping("/dataByMonth")
     @ApiOperation(value = "月度统计表")
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 11)
     public R<IPage<RehearsalMonthVO>> dataByMonth(@RequestParam String month, Query query) {
-        IPage<RehearsalMonthVO> page = rehearsalRecordService.dataByMonth(month, query);
+        IPage<RehearsalMonthVO> page = rehearsalPlanService.dataByMonth(month, query);
         return R.data(page);
     }
 
     @GetMapping("/dataByYear")
     @ApiOperation(value = "年度统计表")
-    @ApiOperationSupport(order = 7)
+    @ApiOperationSupport(order = 12)
     public R<IPage<RehearsalYearVO>> dataByYear(@RequestParam String year, Query query) {
-        IPage<RehearsalYearVO> page = rehearsalRecordService.dataByYear(year, query);
+        IPage<RehearsalYearVO> page = rehearsalPlanService.dataByYear(year, query);
         return R.data(page);
     }
 
@@ -101,8 +144,8 @@ public class RehearsalRecordController extends BladeController {
             @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
     })
     @ApiOperation(value = "演练数据导出")
-    @ApiOperationSupport(order = 8)
+    @ApiOperationSupport(order = 13)
     public void exportRehearsalData(@ApiIgnore @RequestParam Map<String, Object> param, HttpServletResponse response) {
-        rehearsalRecordService.exportRehearsalData(param, response);
+        rehearsalPlanService.exportRehearsalPlanData(param, response);
     }
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/TrainController.java

@@ -21,12 +21,9 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
-import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -55,8 +52,6 @@ public class TrainController extends BladeController {
 
     private final ITestScoreService testScoreService;
 
-    private final ISysClient sysClient;
-
     @PostMapping("/saveTrainPlan")
     @ApiOperation(value = "新增培训计划")
     @ApiOperationSupport(order = 1)
@@ -94,7 +89,7 @@ public class TrainController extends BladeController {
     @ApiOperation(value = "培训计划分页")
     @ApiOperationSupport(order = 5)
     public R<IPage<TrainPlanEntity>> trainPlanPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<TrainPlanEntity> page = trainPlanService.page(Condition.getPage(query), Condition.getQueryWrapper(param, TrainPlanEntity.class));
+        IPage<TrainPlanEntity> page = trainPlanService.trainPlanPage(param, query);
         return R.data(page);
     }
 
@@ -175,6 +170,7 @@ public class TrainController extends BladeController {
 
     @GetMapping("/testPage")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "trainPlanId", value = "培训计划id", dataType = "query", paramType = "string"),
             @ApiImplicitParam(name = "trainRecordId", value = "培训记录id", dataType = "query", paramType = "string")
     })
     @ApiOperation(value = "考试记录分页")
@@ -203,7 +199,7 @@ public class TrainController extends BladeController {
     @PostMapping("/updateBatchScore")
     @ApiOperation(value = "批量填写分数")
     @ApiOperationSupport(order = 19)
-    public R updateBatchScore(TestScoreDTO testScoreDTO) {
+    public R updateBatchScore(@RequestBody TestScoreDTO testScoreDTO) {
         return R.status(testScoreService.updateBatchScore(testScoreDTO));
     }
 
@@ -223,18 +219,6 @@ public class TrainController extends BladeController {
         return R.data(page);
     }
 
-    @GetMapping("/getDeptName")
-    @ApiOperation(value = "获取所属机构名")
-    @ApiOperationSupport(order = 22)
-    public R<String> getDeptName() {
-        BladeUser bladeUser = getUser();
-        String deptId = bladeUser.getDeptId();
-        if (StringUtils.isNotBlank(deptId)) {
-            return sysClient.getDeptName(Long.valueOf(deptId));
-        }
-        return R.data(null, "所属机构为空");
-    }
-
     @GetMapping("/exportTrainPlanData")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "unit", value = "单位", dataType = "query", paramType = "string"),
@@ -242,20 +226,18 @@ public class TrainController extends BladeController {
             @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
     })
     @ApiOperation(value = "培训计划数据导出")
-    @ApiOperationSupport(order = 23)
+    @ApiOperationSupport(order = 22)
     public void exportTrainPlanData(@ApiIgnore @RequestParam Map<String, Object> param, HttpServletResponse response) {
         trainPlanService.exportTrainPlanData(param, response);
     }
 
     @GetMapping("/exportTrainRecordData")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "scheduledStartTime", value = "计划开始时间", dataType = "query", paramType = "string"),
+            @ApiImplicitParam(name = "trainPlanId", value = "培训计划id", dataType = "query", paramType = "string")
-            @ApiImplicitParam(name = "scheduledEndTime", value = "计划结束时间", dataType = "query", paramType = "string")
     })
     @ApiOperation(value = "培训记录数据导出")
-    @ApiOperationSupport(order = 24)
+    @ApiOperationSupport(order = 23)
     public void exportTrainRecordData(@ApiIgnore @RequestParam Map<String, Object> param, HttpServletResponse response) {
         trainRecordService.exportTrainRecordData(param, response);
     }
-
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/RehearsalJob.java

@@ -1,8 +1,8 @@
 package com.hnac.hzims.safeproduct.jobs;
 
-import com.hnac.hzims.safeproduct.entity.RehearsalRecordEntity;
+import com.hnac.hzims.safeproduct.entity.RehearsalPlanEntity;
 import com.hnac.hzims.safeproduct.enums.RehearsalStatusEnum;
-import com.hnac.hzims.safeproduct.service.IRehearsalRecordService;
+import com.hnac.hzims.safeproduct.service.IRehearsalPlanService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springblade.core.tool.utils.DateUtil;
@@ -22,7 +22,7 @@ import java.util.List;
 public class RehearsalJob {
 
     @Autowired
-    IRehearsalRecordService rehearsalRecordService;
+    IRehearsalPlanService rehearsalPlanService;
 
     @XxlJob("autoChangeRehearsalStatus")
     public ReturnT<String> autoChangeRehearsalStatus(String param) {
@@ -32,12 +32,12 @@ public class RehearsalJob {
         String today = DateUtil.format(current, "yyyy-mm-dd hh:MM:ss");
         String yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss");
         // 查询前一天的超时未完成演练记录
-        List<RehearsalRecordEntity> list = rehearsalRecordService.getWaitingRehearsalInTimeRange(yesterday, today);
+        List<RehearsalPlanEntity> list = rehearsalPlanService.getWaitingRehearsalInTimeRange(yesterday, today);
         list.forEach(x -> {
             x.setRehearsalStatus(RehearsalStatusEnum.UNFINISHED.getValue());
         });
         // 将状态置为未完成
-        boolean flag = rehearsalRecordService.updateBatchById(list);
+        boolean flag = rehearsalPlanService.updateBatchById(list);
         return flag ? ReturnT.SUCCESS : ReturnT.FAIL;
     }
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/jobs/TrainJob.java

@@ -0,0 +1,43 @@
+package com.hnac.hzims.safeproduct.jobs;
+
+import com.hnac.hzims.safeproduct.entity.TrainPlanEntity;
+import com.hnac.hzims.safeproduct.enums.TrainStatusEnum;
+import com.hnac.hzims.safeproduct.service.ITrainPlanService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 演练模块定时任务
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Component
+public class TrainJob {
+
+    @Autowired
+    ITrainPlanService trainPlanService;
+
+    @XxlJob("autoChangeTrainPlanStatus")
+    public ReturnT<String> autoChangeTrainPlanStatus(String param) {
+        // 获取时间范围
+        Date current = DateUtil.now();
+        Date before = DateUtil.minusDays(current, 1);
+        String today = DateUtil.format(current, "yyyy-mm-dd hh:MM:ss");
+        String yesterday = DateUtil.format(before, "yyyy-mm-dd hh:MM:ss");
+        // 查询前一天的超时未完成培训计划
+        List<TrainPlanEntity> list = trainPlanService.getWaitingTrainPlanInTimeRange(yesterday, today);
+        list.forEach(x -> {
+            x.setTrainStatus(TrainStatusEnum.UNFINISHED.getValue());
+        });
+        // 将状态置为未完成
+        boolean flag = trainPlanService.updateBatchById(list);
+        return flag ? ReturnT.SUCCESS : ReturnT.FAIL;
+    }
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.java

@@ -0,0 +1,27 @@
+package com.hnac.hzims.safeproduct.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzims.safeproduct.dto.ConferenceExportDTO;
+import com.hnac.hzims.safeproduct.entity.ConferencePlanEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 会议计划Mapper类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Mapper
+public interface ConferencePlanMapper extends BaseMapper<ConferencePlanEntity> {
+
+    /**
+     * 根据单位和计划时间查询会议记录
+     * @param unit 单位
+     * @param startTime 计划开始时间
+     * @param endTime 计划结束时间
+     * @return 会议记录列表
+     */
+    List<ConferenceExportDTO> getConferenceByUnitAndDate(String unit, String startTime, String endTime);
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml

@@ -0,0 +1,23 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.safeproduct.mapper.ConferencePlanMapper">
+
+    <select id="getConferenceByUnitAndDate" resultType="com.hnac.hzims.safeproduct.dto.ConferenceExportDTO">
+        SELECT
+            t1.unit, t1.scheduled_start_time, t1.scheduled_end_time, t1.theme, t1.location, t1.conference_method,
+            t1.host, t2.actual_start_time, t2.actual_end_time, t1.conference_status
+        FROM
+            hzims_conference_plan t1
+            LEFT JOIN hzims_conference_record t2 ON t1.id = t2.conference_plan_id
+        WHERE
+            t1.is_deleted = 0
+        <if test="unit != 'null' and unit != ''">
+            AND t1.unit like concat('%', #{unit}, '%')
+        </if>
+        <if test="startTime != 'null' and startTime != ''">
+            AND t1.scheduled_start_time >= #{startTime}
+        </if>
+        <if test="endTime != 'null' and endTime != ''">
+            AND t1.scheduled_end_time &lt; #{endTime}
+        </if>
+    </select>
+</mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferenceRecordMapper.java

@@ -0,0 +1,16 @@
+package com.hnac.hzims.safeproduct.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzims.safeproduct.entity.ConferenceRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 会议记录Mapper类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Mapper
+public interface ConferenceRecordMapper extends BaseMapper<ConferenceRecordEntity> {
+
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferenceRecordMapper.xml

@@ -0,0 +1,4 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.safeproduct.mapper.ConferenceRecordMapper">
+
+</mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.java

@@ -0,0 +1,64 @@
+package com.hnac.hzims.safeproduct.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hnac.hzims.safeproduct.dto.AnalysisYearDTO;
+import com.hnac.hzims.safeproduct.dto.RehearsalExportDTO;
+import com.hnac.hzims.safeproduct.entity.RehearsalPlanEntity;
+import com.hnac.hzims.safeproduct.vo.RehearsalMonthVO;
+import com.hnac.hzims.safeproduct.vo.RehearsalYearVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 演练计划Mapper类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Mapper
+public interface RehearsalPlanMapper extends BaseMapper<RehearsalPlanEntity> {
+
+    /**
+     * 查询当月各单位的演练总数
+     * @param page 分页类
+     * @param month 月份
+     * @return 当月的演练总数据
+     */
+    IPage<RehearsalMonthVO> selectByMonth(IPage<RehearsalMonthVO> page, String month);
+
+    /**
+     * 查询当月各单位已完成的演练数据
+     * @param page 分页类
+     * @param month 月份
+     * @return 当月的已完成数据
+     */
+    IPage<RehearsalMonthVO> selectFinishedDataByMonth(IPage<RehearsalMonthVO> page, String month);
+
+    /**
+     * 查询当年的所有单位
+     * @param page 分页类
+     * @param year 年份
+     * @return 年度单位数据
+     */
+    IPage<RehearsalYearVO> selectUnitByYear(IPage<RehearsalYearVO> page, @Param("year") String year);
+
+    /**
+     * 查询各单位全年已完成的演练数据
+     * @param unitList 单元列表
+     * @param year 年份
+     * @return 单位各月的数据列表
+     */
+    List<AnalysisYearDTO> selectFinishedDataByUnit(@Param("unitList") List<String> unitList, @Param("year") String year);
+
+    /**
+     * 根据单位和计划时间查询演练数据
+     * @param unit 单位
+     * @param startTime 计划开始时间
+     * @param endTime 计划结束时间
+     * @return 演练数据列表
+     */
+    List<RehearsalExportDTO> getRehearsalByUnitAndDate(String unit, String startTime, String endTime);
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.safeproduct.mapper.RehearsalPlanMapper">
+
+    <select id="selectByMonth" resultType="com.hnac.hzims.safeproduct.vo.RehearsalMonthVO">
+        SELECT
+            unit, count(1) as scheduled_task_num
+        FROM
+            hzims_rehearsal_plan
+        WHERE
+            is_deleted = 0
+            AND scheduled_end_time like concat('%', #{month}, '%')
+        GROUP BY
+            unit
+        ORDER BY
+            unit
+    </select>
+
+    <select id="selectFinishedDataByMonth" resultType="com.hnac.hzims.safeproduct.vo.RehearsalMonthVO">
+        SELECT
+            unit, count(1) as finished_task_num
+        FROM
+            hzims_rehearsal_plan
+        WHERE
+            is_deleted = 0
+            AND scheduled_end_time like concat('%', #{month}, '%')
+            AND rehearsal_status = 'FINISHED'
+        GROUP BY
+            unit
+        ORDER BY
+            unit
+    </select>
+
+    <select id="selectUnitByYear" resultType="com.hnac.hzims.safeproduct.vo.RehearsalYearVO">
+        SELECT
+            distinct unit
+        FROM
+            hzims_rehearsal_plan
+        WHERE
+            is_deleted = 0
+            AND scheduled_end_time like concat('%', #{year}, '%')
+        ORDER BY
+            unit
+    </select>
+
+    <select id="selectFinishedDataByUnit" resultType="com.hnac.hzims.safeproduct.dto.AnalysisYearDTO">
+        SELECT
+            unit, DATE_FORMAT(scheduled_end_time, '%m') as dateTime, count(1) as finished_num
+        FROM
+            hzims_rehearsal_plan
+        WHERE
+            is_deleted = 0
+            AND scheduled_end_time like concat('%', #{year}, '%')
+            AND rehearsal_status = 'FINISHED'
+            AND unit in
+        <foreach collection="unitList" item="unit" open="(" close=")" separator=",">
+            #{unit}
+        </foreach>
+        GROUP BY
+            unit, DATE_FORMAT(scheduled_end_time, '%m')
+        ORDER BY
+            unit
+    </select>
+
+    <select id="getRehearsalByUnitAndDate" resultType="com.hnac.hzims.safeproduct.dto.RehearsalExportDTO">
+        SELECT
+            t1.unit, t1.subject, t1.scheduled_start_time, t1.scheduled_end_time, t1.location,
+            t2.people_num, t2.actual_start_time, t2.actual_end_time, t1.rehearsal_status
+        FROM
+            hzims_rehearsal_plan t1
+            LEFT JOIN hzims_rehearsal_record t2 ON t1.id = t2.rehearsal_plan_id
+        WHERE
+            t1.is_deleted = 0
+        <if test="unit != 'null' and unit != ''">
+            AND t1.unit like concat('%', #{unit}, '%')
+        </if>
+        <if test="startTime != 'null' and startTime != ''">
+            AND t1.scheduled_start_time >= #{startTime}
+        </if>
+        <if test="endTime != 'null' and endTime != ''">
+            AND t1.scheduled_end_time &lt; #{endTime}
+        </if>
+    </select>
+</mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalRecordMapper.java

@@ -1,15 +1,8 @@
 package com.hnac.hzims.safeproduct.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hnac.hzims.safeproduct.dto.RehearsalYearDTO;
 import com.hnac.hzims.safeproduct.entity.RehearsalRecordEntity;
-import com.hnac.hzims.safeproduct.vo.RehearsalMonthVO;
-import com.hnac.hzims.safeproduct.vo.RehearsalYearVO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * 演练记录Mapper类
@@ -20,35 +13,4 @@ import java.util.List;
 @Mapper
 public interface RehearsalRecordMapper extends BaseMapper<RehearsalRecordEntity> {
 
-    /**
-     * 查询当月各单位的演练总数
-     * @param page 分页类
-     * @param month 月份
-     * @return 当月的演练总数据
-     */
-    IPage<RehearsalMonthVO> selectByMonth(IPage<RehearsalMonthVO> page, @Param("month") String month);
-
-    /**
-     * 查询当月各单位已完成的演练数据
-     * @param page 分页类
-     * @param month 月份
-     * @return 当月的已完成数据
-     */
-    IPage<RehearsalMonthVO> selectFinishedDataByMonth(IPage<RehearsalMonthVO> page, @Param("month") String month);
-
-    /**
-     * 查询当年的所有单位
-     * @param page 分页类
-     * @param year 年份
-     * @return 年度单位数据
-     */
-    IPage<RehearsalYearVO> selectUnitByYear(IPage<RehearsalYearVO> page, @Param("year") String year);
-
-    /**
-     * 查询各单位全年已完成的演练数据
-     * @param unitList 单元列表
-     * @param year 年份
-     * @return 单位各月的数据列表
-     */
-    List<RehearsalYearDTO> selectFinishedDataByUnit(@Param("unitList") List<String> unitList, @Param("year") String year);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalRecordMapper.xml

@@ -2,64 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hnac.hzims.safeproduct.mapper.RehearsalRecordMapper">
 
-    <select id="selectByMonth" resultType="com.hnac.hzims.safeproduct.vo.RehearsalMonthVO">
-        SELECT
-            unit, count(1) as scheduled_task_num
-        FROM
-            hzims_rehearsal_record
-        WHERE
-            is_deleted = 0
-            AND scheduled_end_time like concat('%', #{month}, '%')
-        GROUP BY
-            unit
-        ORDER BY
-            unit
-    </select>
-
-    <select id="selectFinishedDataByMonth" resultType="com.hnac.hzims.safeproduct.vo.RehearsalMonthVO">
-        SELECT
-            unit, count(1) as finished_task_num
-        FROM
-            hzims_rehearsal_record
-        WHERE
-            is_deleted = 0
-            AND scheduled_end_time like concat('%', #{month}, '%')
-            AND rehearsal_status = 'FINISHED'
-        GROUP BY
-            unit
-        ORDER BY
-            unit
-    </select>
-
-    <select id="selectUnitByYear" resultType="com.hnac.hzims.safeproduct.vo.RehearsalYearVO">
-        SELECT
-            distinct unit
-        FROM
-            hzims_rehearsal_record
-        WHERE
-            is_deleted = 0
-            AND actual_end_time like concat('%', #{year}, '%')
-        ORDER BY
-            unit
-    </select>
-
-    <select id="selectFinishedDataByUnit" resultType="com.hnac.hzims.safeproduct.dto.RehearsalYearDTO">
-        SELECT
-            unit, DATE_FORMAT(actual_end_time, '%m') as dateTime, count(1) as finished_num
-        FROM
-            hzims_rehearsal_record
-        WHERE
-            is_deleted = 0
-            AND actual_end_time like concat('%', #{year}, '%')
-            AND rehearsal_status = 'FINISHED'
-            AND unit in
-            <foreach collection="unitList" item="unit" open="(" close=")" separator=",">
-                #{unit}
-            </foreach>
-        GROUP BY
-            unit, DATE_FORMAT(actual_end_time, '%m')
-        ORDER BY
-            unit
-    </select>
-
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TestScoreMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="testScoreList" resultType="com.hnac.hzims.safeproduct.vo.TestScoreVO">
         SELECT
-            name, score
+            id, name, score
         FROM
             hzims_test_score
         WHERE

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.xml

@@ -9,7 +9,7 @@
             hzims_train_plan
         WHERE
             is_deleted = 0
-            AND scheduled_train_time like concat('%', #{month}, '%')
+            AND scheduled_end_time like concat('%', #{month}, '%')
         GROUP BY
             unit
         ORDER BY
@@ -23,7 +23,7 @@
             hzims_train_plan
         WHERE
             is_deleted = 0
-            AND scheduled_train_time like concat('%', #{month}, '%')
+            AND scheduled_end_time like concat('%', #{month}, '%')
             AND train_status = 'FINISHED'
         GROUP BY
             unit
@@ -38,26 +38,26 @@
             hzims_train_plan
         WHERE
             is_deleted = 0
-            AND actual_train_time like concat('%', #{year}, '%')
+            AND scheduled_end_time like concat('%', #{year}, '%')
         ORDER BY
             unit
     </select>
 
     <select id="selectFinishedDataByUnit" resultType="com.hnac.hzims.safeproduct.dto.AnalysisYearDTO">
         SELECT
-            unit, DATE_FORMAT(actual_train_time, '%m') as dateTime, count(1) as finished_num
+            unit, DATE_FORMAT(scheduled_end_time, '%m') as dateTime, count(1) as finished_num
         FROM
             hzims_train_plan
         WHERE
             is_deleted = 0
-            AND actual_train_time like concat('%', #{year}, '%')
+            AND scheduled_end_time like concat('%', #{year}, '%')
             AND train_status = 'FINISHED'
             AND unit in
         <foreach collection="unitList" item="unit" open="(" close=")" separator=",">
             #{unit}
         </foreach>
         GROUP BY
-            unit, DATE_FORMAT(actual_train_time, '%m')
+            unit, DATE_FORMAT(scheduled_end_time, '%m')
         ORDER BY
             unit
     </select>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IConferencePlanService.java

@@ -0,0 +1,40 @@
+package com.hnac.hzims.safeproduct.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.safeproduct.entity.ConferencePlanEntity;
+import org.springblade.core.mp.support.Query;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * 会议计划服务类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+public interface IConferencePlanService extends IService<ConferencePlanEntity> {
+
+    /**
+     * 删除会议计划
+     * @param id 会议计划id
+     * @return true-成功，false-失败
+     */
+    boolean removePlan(Long id);
+
+    /**
+     * 会议计划分页
+     * @param param 入参
+     * @param query 分页类
+     * @return 会议计划数据
+     */
+    IPage<ConferencePlanEntity> planPage(Map<String, Object> param, Query query);
+
+    /**
+     * 会议数据导出
+     * @param param 入参
+     * @param response 响应类
+     */
+    void exportConferenceData(Map<String, Object> param, HttpServletResponse response);
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IConferenceRecordService.java

@@ -0,0 +1,27 @@
+package com.hnac.hzims.safeproduct.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.safeproduct.entity.ConferenceRecordEntity;
+
+/**
+ * 会议记录服务类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+public interface IConferenceRecordService extends IService<ConferenceRecordEntity> {
+
+    /**
+     * 删除关联会议记录
+     * @param conferencePlanId 会议计划id
+     * @return true-成功，false-失败
+     */
+    boolean removeReferenceRecord(Long conferencePlanId);
+
+    /**
+     * 新增会议记录
+     * @param conferenceRecord 会议记录实体类
+     * @return true-成功，false-失败
+     */
+    boolean saveRecord(ConferenceRecordEntity conferenceRecord);
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IRehearsalPlanService.java

@@ -0,0 +1,67 @@
+package com.hnac.hzims.safeproduct.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hnac.hzims.safeproduct.entity.RehearsalPlanEntity;
+import com.hnac.hzims.safeproduct.vo.RehearsalMonthVO;
+import com.hnac.hzims.safeproduct.vo.RehearsalYearVO;
+import org.springblade.core.mp.support.Query;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 演练计划服务类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+public interface IRehearsalPlanService extends IService<RehearsalPlanEntity> {
+
+    /**
+     * 删除演练计划
+     * @param id 演练计划id
+     * @return true-成功，false-失败
+     */
+    boolean removeRehearsalPlan(Long id);
+
+    /**
+     * 演练月度数据
+     * @param month 月份
+     * @param query 分页类
+     * @return 月度统计分页
+     */
+    IPage<RehearsalMonthVO> dataByMonth(String month, Query query);
+
+    /**
+     * 演练年度数据
+     * @param year 年份
+     * @param query 分页类
+     * @return 年度统计分页
+     */
+    IPage<RehearsalYearVO> dataByYear(String year, Query query);
+
+    /**
+     * 演练计划数据导出
+     * @param param 入参
+     * @param response 响应类
+     */
+    void exportRehearsalPlanData(Map<String, Object> param, HttpServletResponse response);
+
+    /**
+     * 查询时间范围内未开始的演练数据
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 演练数据
+     */
+    List<RehearsalPlanEntity> getWaitingRehearsalInTimeRange(String startTime, String endTime);
+
+    /**
+     * 演练计划分页
+     * @param param 入参
+     * @param query 分页类
+     * @return 演练计划数据
+     */
+    IPage<RehearsalPlanEntity> rehearsalPlanPage(Map<String, Object> param, Query query);
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IRehearsalRecordService.java

@@ -1,15 +1,7 @@
 package com.hnac.hzims.safeproduct.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.entity.RehearsalRecordEntity;
-import com.hnac.hzims.safeproduct.vo.RehearsalMonthVO;
-import com.hnac.hzims.safeproduct.vo.RehearsalYearVO;
-import org.springblade.core.mp.support.Query;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 演练记录服务类
@@ -20,47 +12,23 @@ import java.util.Map;
 public interface IRehearsalRecordService extends IService<RehearsalRecordEntity> {
 
     /**
-     * 演练月度数据
+     * 新增演练记录
-     * @param month 月份
+     * @param rehearsalRecord 演练记录实体类
-     * @param query 分页类
+     * @return true-成功，false-失败
-     * @return 月度统计分页
-     */
-    IPage<RehearsalMonthVO> dataByMonth(String month, Query query);
-
-    /**
-     * 演练年度数据
-     * @param year 年份
-     * @param query 分页类
-     * @return 年度统计分页
-     */
-    IPage<RehearsalYearVO> dataByYear(String year, Query query);
-
-    /**
-     * 新增演练
-     * @param rehearsalRecord 演练记录DTO类
-     * @return 新增是否成功
-     */
-    boolean saveRehearsal(RehearsalRecordEntity rehearsalRecord);
-
-    /**
-     * 修改演练
-     * @param rehearsalRecord 演练记录DTO类
-     * @return 更新是否成功
      */
-    boolean updateRehearsal(RehearsalRecordEntity rehearsalRecord);
+    boolean saveRehearsalRecord(RehearsalRecordEntity rehearsalRecord);
 
     /**
-     * 演练数据导出
+     * 修改演练记录
-     * @param param 入参
+     * @param rehearsalRecord 演练记录实体类
-     * @param response 响应类
+     * @return true-成功，false-失败
      */
-    void exportRehearsalData(Map<String, Object> param, HttpServletResponse response);
+    boolean updateRehearsalRecord(RehearsalRecordEntity rehearsalRecord);
 
     /**
-     * 查询时间范围内未开始的演练数据
+     * 删除关联演练记录
-     * @param startTime 开始时间
+     * @param rehearsalPlanId 演练计划id
-     * @param endTime 结束时间
+     * @return true-成功，false-失败
-     * @return 演练数据
      */
-    List<RehearsalRecordEntity> getWaitingRehearsalInTimeRange(String startTime, String endTime);
+    boolean removeRelativeRehearsalRecord(Long rehearsalPlanId);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ITrainPlanService.java

@@ -8,6 +8,7 @@ import com.hnac.hzims.safeproduct.vo.TrainYearVO;
 import org.springblade.core.mp.support.Query;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -47,4 +48,20 @@ public interface ITrainPlanService extends IService<TrainPlanEntity> {
      * @param response 响应类
      */
     void exportTrainPlanData(Map<String, Object> param, HttpServletResponse response);
+
+    /**
+     * 查询时间范围内未开始的培训计划数据
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 培训计划数据
+     */
+    List<TrainPlanEntity> getWaitingTrainPlanInTimeRange(String startTime, String endTime);
+
+    /**
+     * 培训计划分页
+     * @param param 入参
+     * @param query 分页类
+     * @return 培训计划数据
+     */
+    IPage<TrainPlanEntity> trainPlanPage(Map<String, Object> param, Query query);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferencePlanServiceImpl.java

@@ -0,0 +1,158 @@
+package com.hnac.hzims.safeproduct.service.impl;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.converters.longconverter.LongStringConverter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.common.utils.Condition;
+import com.hnac.hzims.safeproduct.dto.ConferenceExportDTO;
+import com.hnac.hzims.safeproduct.entity.ConferencePlanEntity;
+import com.hnac.hzims.safeproduct.enums.ConferenceMethodEnum;
+import com.hnac.hzims.safeproduct.enums.ConferenceStatusEnum;
+import com.hnac.hzims.safeproduct.mapper.ConferencePlanMapper;
+import com.hnac.hzims.safeproduct.service.IConferencePlanService;
+import com.hnac.hzims.safeproduct.service.IConferenceRecordService;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 会议计划服务实现类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Service
+public class ConferencePlanServiceImpl extends ServiceImpl<ConferencePlanMapper, ConferencePlanEntity> implements IConferencePlanService {
+
+    @Autowired
+    IConferenceRecordService conferenceRecordService;
+
+    /**
+     * 删除会议计划
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean removePlan(Long id) {
+        boolean remove = this.removeById(id);
+        // 若成功删除会议计划，删除关联的会议记录
+        if (remove) {
+            return conferenceRecordService.removeReferenceRecord(id);
+        }
+        return false;
+    }
+
+    /**
+     * 会议计划分页
+     */
+    @Override
+    public IPage<ConferencePlanEntity> planPage(Map<String, Object> param, Query query) {
+        QueryWrapper<ConferencePlanEntity> queryWrapper = new QueryWrapper<>();
+        String unit = String.valueOf(param.get("unit"));
+        String startTime = String.valueOf(param.get("startTime"));
+        String endTime = String.valueOf((param.get("endTime")));
+        if (!unit.equals("null") && !unit.equals("")) {
+            queryWrapper.lambda().like(ConferencePlanEntity::getUnit, unit);
+        }
+        if (!startTime.equals("null") && !startTime.equals("")) {
+            queryWrapper.lambda().ge(ConferencePlanEntity::getScheduledStartTime, startTime);
+        }
+        if (!endTime.equals("null") && !endTime.equals("")) {
+            queryWrapper.lambda().le(ConferencePlanEntity::getScheduledEndTime, endTime);
+        }
+        return this.page(Condition.getPage(query), queryWrapper);
+    }
+
+    /**
+     * 会议数据导出
+     */
+    @Override
+    public void exportConferenceData(Map<String, Object> param, HttpServletResponse response) {
+        ServletOutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+            String unit = String.valueOf(param.get("unit"));
+            String startTime = String.valueOf(param.get("scheduledStartTime"));
+            String endTime = String.valueOf(param.get("scheduledEndTime"));
+            List<ConferenceExportDTO> conferenceList = getConferenceByUnitAndDate(unit, startTime, endTime);
+            // 处理会议数据信息
+            conferenceList.forEach(conference -> {
+                // 会议方式
+                String method;
+                if (conference.getConferenceMethod().equals(ConferenceMethodEnum.ONLINE.getValue())) {
+                    method = ConferenceMethodEnum.ONLINE.getDesc();
+                } else if (conference.getConferenceMethod().equals(ConferenceMethodEnum.OFFLINE.getValue())) {
+                    method = ConferenceMethodEnum.OFFLINE.getDesc();
+                } else {
+                    method = ConferenceMethodEnum.MIXED.getDesc();
+                }
+                conference.setConferenceMethod(method);
+                // 会议状态
+                String status;
+                if (conference.getConferenceStatus().equals(ConferenceStatusEnum.WAITING.getValue())) {
+                    status = ConferenceStatusEnum.WAITING.getDesc();
+                } else if (conference.getConferenceStatus().equals(ConferenceStatusEnum.UNFINISHED.getValue())) {
+                    status = ConferenceStatusEnum.UNFINISHED.getDesc();
+                } else {
+                    status = ConferenceStatusEnum.FINISHED.getDesc();
+                }
+                conference.setConferenceStatus(status);
+            });
+            // 设置响应头
+            // URLEncoder.encode防止中文乱码
+            String fileName = URLEncoder.encode("会议数据表", "UTF-8");
+            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+            response.setContentType("application/vnd.ms-excel");
+            response.setCharacterEncoding("UTF-8");
+            // ExcelWriter初始化
+            ExcelWriter excelWriter = EasyExcel
+                    .write(response.getOutputStream())
+                    .autoCloseStream(Boolean.TRUE)
+                    .registerConverter(new LongStringConverter())
+                    .registerWriteHandler(new SimpleColumnWidthStyleStrategy(25))
+                    .build();
+            WriteSheet writeSheet = EasyExcel.writerSheet(1, "会议数据表").head(ConferenceExportDTO.class)
+                    .build();
+            excelWriter.write(conferenceList, writeSheet);
+            excelWriter.finish();
+        } catch (Exception e) {
+            // 重置response
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            throw new ServiceException("会议数据导出异常: " + e.getMessage());
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    log.error("会议导出响应头输出流关闭异常: " + e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * 根据单位和计划时间查询会议记录
+     * @param unit 单位
+     * @param startTime 计划开始时间
+     * @param endTime 计划结束时间
+     * @return 会议记录列表
+     */
+    public List<ConferenceExportDTO> getConferenceByUnitAndDate(String unit, String startTime, String endTime) {
+        return baseMapper.getConferenceByUnitAndDate(unit, startTime, endTime);
+    }
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferenceRecordServiceImpl.java

@@ -0,0 +1,113 @@
+package com.hnac.hzims.safeproduct.service.impl;
+
+import cn.hutool.core.date.DatePattern;
+import com.alibaba.excel.util.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.common.logs.utils.StringUtils;
+import com.hnac.hzims.safeproduct.constants.SafeProductConstant;
+import com.hnac.hzims.safeproduct.entity.ConferencePlanEntity;
+import com.hnac.hzims.safeproduct.entity.ConferenceRecordEntity;
+import com.hnac.hzims.safeproduct.enums.RehearsalStatusEnum;
+import com.hnac.hzims.safeproduct.mapper.ConferencePlanMapper;
+import com.hnac.hzims.safeproduct.mapper.ConferenceRecordMapper;
+import com.hnac.hzims.safeproduct.service.IConferenceRecordService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 会议记录服务实现类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Service
+public class ConferenceRecordServiceImpl extends ServiceImpl<ConferenceRecordMapper, ConferenceRecordEntity> implements IConferenceRecordService {
+
+    @Resource
+    ConferencePlanMapper conferencePlanMapper;
+
+    /**
+     * 删除关联会议记录
+     */
+    @Override
+    public boolean removeReferenceRecord(Long conferencePlanId) {
+        // 查询关联会议记录
+        QueryWrapper<ConferenceRecordEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ConferenceRecordEntity::getConferencePlanId, conferencePlanId);
+        List<ConferenceRecordEntity> rehearsalRecordList = this.list(queryWrapper);
+        // 若无关联会议记录，直接返回true
+        if (CollectionUtils.isEmpty(rehearsalRecordList)) {
+            return true;
+        }
+        // 删除关联会议记录
+        List<Long> ids = rehearsalRecordList.stream().map(ConferenceRecordEntity::getId).collect(Collectors.toList());
+        return this.removeByIds(ids);
+    }
+
+    /**
+     * 新增会议记录
+     */
+    @Override
+    public boolean saveRecord(ConferenceRecordEntity conferenceRecord) {
+        // 获取当月时间（yyyymm）
+        String currentMonth = DatePattern.SIMPLE_MONTH_FORMAT.format(new Date());
+        // 查询是否存在同月编号
+        String lastCode = getLastCode(currentMonth);
+        // 若不存在，新增编号
+        String code;
+        if (StringUtils.isNull(lastCode)) {
+            code = "HYJL" + currentMonth + "001";
+        } else { // 若存在，编号递增
+            String oldNum = lastCode.substring(lastCode.length() - 3);
+            int value = Integer.parseInt(oldNum) + 1;
+            // 根据数位拼接编号
+            if (value < 10) {
+                code = "HYJL" + currentMonth + "00" + value;
+            } else if (value < 100) {
+                code = "HYJL" + currentMonth + "0" + value;
+            } else {
+                code = "HYJL" + currentMonth + value;
+            }
+        }
+        conferenceRecord.setCode(code);
+        boolean save = this.save(conferenceRecord);
+        // 若会议记录新增成功，修改会议计划状态为已完成
+        if (save) {
+            ConferencePlanEntity conferencePlanEntity = conferencePlanMapper.selectById(conferenceRecord.getConferencePlanId());
+            conferencePlanEntity.setConferenceStatus(RehearsalStatusEnum.FINISHED.getValue());
+            return conferencePlanMapper.updateById(conferencePlanEntity) == SafeProductConstant.SUCCESS;
+        }
+        return false;
+    }
+
+    /**
+     * 查询是否存在同月编号
+     * @param currentMonth 当月
+     * @return 存在则返回上一编号，否则返回null
+     */
+    private String getLastCode(String currentMonth) {
+        String month = currentMonth.substring(currentMonth.length() - 2);
+        List<ConferenceRecordEntity> list = getConferenceByMonth(month);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        return list.get(0).getCode();
+    }
+
+    /**
+     * 查询当月会议记录
+     * @param month 当月
+     * @return 当月会议数据表
+     */
+    public List<ConferenceRecordEntity> getConferenceByMonth(String month) {
+        QueryWrapper<ConferenceRecordEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().like(ConferenceRecordEntity::getCreateTime, month)
+                .orderByDesc(ConferenceRecordEntity::getCode);
+        return this.list(queryWrapper);
+    }
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalPlanServiceImpl.java

@@ -0,0 +1,259 @@
+package com.hnac.hzims.safeproduct.service.impl;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.converters.longconverter.LongStringConverter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.common.utils.Condition;
+import com.hnac.hzims.safeproduct.dto.AnalysisYearDTO;
+import com.hnac.hzims.safeproduct.dto.RehearsalExportDTO;
+import com.hnac.hzims.safeproduct.entity.RehearsalPlanEntity;
+import com.hnac.hzims.safeproduct.enums.RehearsalStatusEnum;
+import com.hnac.hzims.safeproduct.mapper.RehearsalPlanMapper;
+import com.hnac.hzims.safeproduct.service.IRehearsalPlanService;
+import com.hnac.hzims.safeproduct.service.IRehearsalRecordService;
+import com.hnac.hzims.safeproduct.vo.RehearsalMonthVO;
+import com.hnac.hzims.safeproduct.vo.RehearsalYearVO;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 演练计划服务实现类
+ *
+ * @author liwen
+ * @date 2023-12-27
+ */
+@Service
+public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, RehearsalPlanEntity>
+        implements IRehearsalPlanService {
+
+    @Autowired
+    IRehearsalRecordService rehearsalRecordService;
+
+    /**
+     * 删除演练计划
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean removeRehearsalPlan(Long id) {
+        boolean remove = this.removeById(id);
+        // 若演练计划删除成功，删除关联演练记录
+        if (remove) {
+            return rehearsalRecordService.removeRelativeRehearsalRecord(id);
+        }
+        return false;
+    }
+
+    /**
+     * 演练月度数据
+     */
+    @Override
+    public IPage<RehearsalMonthVO> dataByMonth(String month, Query query) {
+        // 查询当月各单位的演练总数
+        IPage<RehearsalMonthVO> page = new Page<>(query.getCurrent(), query.getSize());
+        IPage<RehearsalMonthVO> unitPage = baseMapper.selectByMonth(page, month);
+        List<RehearsalMonthVO> unitList = unitPage.getRecords();
+        // 查询当月各单位已完成的演练数据
+        IPage<RehearsalMonthVO> page1 = new Page<>(query.getCurrent(), query.getSize());
+        IPage<RehearsalMonthVO> finishedPage = baseMapper.selectFinishedDataByMonth(page1, month);
+        List<RehearsalMonthVO> finishedList = finishedPage.getRecords();
+        // 处理统计数据
+        for (RehearsalMonthVO unit : unitList) {
+            Long taskNum = unit.getScheduledTaskNum();
+            Optional<RehearsalMonthVO> finishedRehearsal = finishedList.stream().filter(x -> x.getUnit().equals(unit.getUnit())).findFirst();
+            Long finishedTaskNum = finishedRehearsal.isPresent() ? finishedRehearsal.get().getFinishedTaskNum() : 0L;
+            unit.setFinishedTaskNum(finishedTaskNum);
+            unit.setUnfinishedTaskNum(taskNum - finishedTaskNum);
+            BigDecimal taskDecimal = new BigDecimal(taskNum);
+            BigDecimal finishedDecimal = new BigDecimal(finishedTaskNum);
+            unit.setTaskCompletionRate(finishedDecimal.divide(taskDecimal, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+                    .setScale(2, RoundingMode.HALF_UP));
+        }
+        unitPage.setRecords(unitList);
+        return unitPage;
+    }
+
+    /**
+     * 演练年度数据
+     */
+    @Override
+    public IPage<RehearsalYearVO> dataByYear(String year, Query query) {
+        IPage<RehearsalYearVO> page = new Page<>(query.getCurrent(), query.getSize());
+        // 查询当年的所有单位
+        IPage<RehearsalYearVO> unitPage = baseMapper.selectUnitByYear(page, year);
+        List<RehearsalYearVO> records = unitPage.getRecords();
+        // 若无数据，返回空页面
+        if (org.springframework.util.CollectionUtils.isEmpty(records)) {
+            return unitPage;
+        }
+        List<String> unitList = records.stream().map(RehearsalYearVO::getUnit).collect(Collectors.toList());
+        // 查询各单位全年已完成的演练数据
+        List<AnalysisYearDTO> unitMonthDataList = baseMapper.selectFinishedDataByUnit(unitList, year);
+        // 将各单位每个月的演练数据写入统计列表
+        unitMonthDataList.forEach(data -> {
+            RehearsalYearVO rehearsalYearVO = records.stream().filter(x -> x.getUnit().equals(data.getUnit()))
+                    .collect(Collectors.toList()).get(0);
+            // 根据月份匹配写入对应字段
+            switch (data.getDateTime()) {
+                case "01":
+                    rehearsalYearVO.setJanuaryNum(data.getFinishedNum());
+                    break;
+                case "02":
+                    rehearsalYearVO.setFebruaryNum(data.getFinishedNum());
+                    break;
+                case "03":
+                    rehearsalYearVO.setMarchNum(data.getFinishedNum());
+                    break;
+                case "04":
+                    rehearsalYearVO.setAprilNum(data.getFinishedNum());
+                    break;
+                case "05":
+                    rehearsalYearVO.setMayNum(data.getFinishedNum());
+                    break;
+                case "06":
+                    rehearsalYearVO.setJuneNum(data.getFinishedNum());
+                    break;
+                case "07":
+                    rehearsalYearVO.setJulyNum(data.getFinishedNum());
+                    break;
+                case "08":
+                    rehearsalYearVO.setAugustNum(data.getFinishedNum());
+                    break;
+                case "09":
+                    rehearsalYearVO.setSeptemberNum(data.getFinishedNum());
+                    break;
+                case "10":
+                    rehearsalYearVO.setOctoberNum(data.getFinishedNum());
+                    break;
+                case "11":
+                    rehearsalYearVO.setNovemberNum(data.getFinishedNum());
+                    break;
+                case "12":
+                    rehearsalYearVO.setDecemberNum(data.getFinishedNum());
+            }
+        });
+        unitPage.setRecords(records);
+        return unitPage;
+    }
+
+    /**
+     * 演练计划数据导出
+     */
+    @Override
+    public void exportRehearsalPlanData(Map<String, Object> param, HttpServletResponse response) {
+        ServletOutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+            String unit = String.valueOf(param.get("unit"));
+            String startTime = String.valueOf(param.get("scheduledStartTime"));
+            String endTime = String.valueOf(param.get("scheduledEndTime"));
+            List<RehearsalExportDTO> rehearsalList = getRehearsalByUnitAndDate(unit, startTime, endTime);
+            // 处理演练状态信息
+            rehearsalList.forEach(record -> {
+               String status;
+               if (record.getRehearsalStatus().equals(RehearsalStatusEnum.WAITING.getValue())) {
+                   status = RehearsalStatusEnum.WAITING.getDesc();
+               } else if (record.getRehearsalStatus().equals(RehearsalStatusEnum.UNFINISHED.getValue())) {
+                   status = RehearsalStatusEnum.UNFINISHED.getDesc();
+               } else {
+                   status = RehearsalStatusEnum.FINISHED.getDesc();
+               }
+               record.setRehearsalStatus(status);
+            });
+            // 设置响应头
+            // URLEncoder.encode防止中文乱码
+            String fileName = URLEncoder.encode("演练数据表", "UTF-8");
+            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+            response.setContentType("application/vnd.ms-excel");
+            response.setCharacterEncoding("UTF-8");
+            // ExcelWriter初始化
+            ExcelWriter excelWriter = EasyExcel
+                    .write(response.getOutputStream())
+                    .autoCloseStream(Boolean.TRUE)
+                    .registerConverter(new LongStringConverter())
+                    .registerWriteHandler(new SimpleColumnWidthStyleStrategy(25))
+                    .build();
+            WriteSheet writeSheet = EasyExcel.writerSheet(1, "演练数据表").head(RehearsalExportDTO.class)
+                    .build();
+            excelWriter.write(rehearsalList, writeSheet);
+            excelWriter.finish();
+        } catch (Exception e) {
+            // 重置response
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            throw new ServiceException("演练数据导出异常: " + e.getMessage());
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    log.error("演练导出响应头输出流关闭异常: " + e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * 根据单位和计划时间查询演练记录
+     * @param unit 单位
+     * @param startTime 计划开始时间
+     * @param endTime 计划结束时间
+     * @return 演练记录列表
+     */
+    public List<RehearsalExportDTO> getRehearsalByUnitAndDate(String unit, String startTime, String endTime) {
+        return baseMapper.getRehearsalByUnitAndDate(unit, startTime, endTime);
+    }
+
+    /**
+     * 查询时间范围内未开始的演练数据
+     */
+    @Override
+    public List<RehearsalPlanEntity> getWaitingRehearsalInTimeRange(String startTime, String endTime) {
+        QueryWrapper<RehearsalPlanEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(RehearsalPlanEntity::getRehearsalStatus, RehearsalStatusEnum.WAITING.getValue())
+                .ge(RehearsalPlanEntity::getScheduledEndTime, startTime)
+                .lt(RehearsalPlanEntity::getScheduledEndTime, endTime);
+        return this.list(queryWrapper);
+    }
+
+    /**
+     * 演练计划分页
+     */
+    @Override
+    public IPage<RehearsalPlanEntity> rehearsalPlanPage(Map<String, Object> param, Query query) {
+        QueryWrapper<RehearsalPlanEntity> queryWrapper = new QueryWrapper<>();
+        String unit = String.valueOf(param.get("unit"));
+        String startTime = String.valueOf(param.get("scheduledStartTime"));
+        String endTime = String.valueOf((param.get("scheduledEndTime")));
+        if (!unit.equals("null") && !unit.equals("")) {
+            queryWrapper.lambda().like(RehearsalPlanEntity::getUnit, unit);
+        }
+        if (!startTime.equals("null") && !startTime.equals("")) {
+            queryWrapper.lambda().ge(RehearsalPlanEntity::getScheduledStartTime, startTime);
+        }
+        if (!endTime.equals("null") && !endTime.equals("")) {
+            queryWrapper.lambda().le(RehearsalPlanEntity::getScheduledEndTime, endTime);
+        }
+        return this.page(Condition.getPage(query), queryWrapper);
+    }
+}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalRecordServiceImpl.java

@@ -1,37 +1,21 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
 import cn.hutool.core.date.DatePattern;
-import com.alibaba.druid.support.json.JSONUtils;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.converters.longconverter.LongStringConverter;
 import com.alibaba.excel.util.CollectionUtils;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.common.logs.utils.StringUtils;
-import com.hnac.hzims.safeproduct.dto.RehearsalYearDTO;
+import com.hnac.hzims.safeproduct.constants.SafeProductConstant;
+import com.hnac.hzims.safeproduct.entity.RehearsalPlanEntity;
 import com.hnac.hzims.safeproduct.entity.RehearsalRecordEntity;
 import com.hnac.hzims.safeproduct.enums.RehearsalStatusEnum;
+import com.hnac.hzims.safeproduct.mapper.RehearsalPlanMapper;
 import com.hnac.hzims.safeproduct.mapper.RehearsalRecordMapper;
 import com.hnac.hzims.safeproduct.service.IRehearsalRecordService;
-import com.hnac.hzims.safeproduct.vo.RehearsalMonthVO;
-import com.hnac.hzims.safeproduct.vo.RehearsalYearVO;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.support.Query;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.ServletOutputStream;
+import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -45,99 +29,14 @@ import java.util.stream.Collectors;
 @Slf4j
 public class RehearsalRecordServiceImpl extends ServiceImpl<RehearsalRecordMapper, RehearsalRecordEntity> implements IRehearsalRecordService {
 
-    /**
+    @Resource
-     * 演练月度数据
+    RehearsalPlanMapper rehearsalPlanMapper;
-     */
-    @Override
-    public IPage<RehearsalMonthVO> dataByMonth(String month, Query query) {
-        // 查询当月各单位的演练总数
-        IPage<RehearsalMonthVO> page = new Page<>(query.getCurrent(), query.getSize());
-        IPage<RehearsalMonthVO> unitPage = baseMapper.selectByMonth(page, month);
-        List<RehearsalMonthVO> unitList = unitPage.getRecords();
-        // 查询当月各单位已完成的演练数据
-        IPage<RehearsalMonthVO> page1 = new Page<>(query.getCurrent(), query.getSize());
-        IPage<RehearsalMonthVO> finishedPage = baseMapper.selectFinishedDataByMonth(page1, month);
-        List<RehearsalMonthVO> finishedList = finishedPage.getRecords();
-        // 处理统计数据
-        for (RehearsalMonthVO unit : unitList) {
-            Long taskNum = unit.getScheduledTaskNum();
-            Optional<RehearsalMonthVO> finishedRehearsal = finishedList.stream().filter(x -> x.getUnit().equals(unit.getUnit())).findFirst();
-            Long finishedTaskNum = finishedRehearsal.isPresent() ? finishedRehearsal.get().getFinishedTaskNum() : 0L;
-            unit.setFinishedTaskNum(finishedTaskNum);
-            unit.setUnfinishedTaskNum(taskNum - finishedTaskNum);
-            BigDecimal taskDecimal = new BigDecimal(taskNum);
-            BigDecimal finishedDecimal = new BigDecimal(finishedTaskNum);
-            unit.setTaskCompletionRate(finishedDecimal.divide(taskDecimal, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
-                    .setScale(2, RoundingMode.HALF_UP));
-        }
-        unitPage.setRecords(unitList);
-        return unitPage;
-    }
-
-    /**
-     * 演练年度数据
-     */
-    @Override
-    public IPage<RehearsalYearVO> dataByYear(String year, Query query) {
-        IPage<RehearsalYearVO> page = new Page<>(query.getCurrent(), query.getSize());
-        // 查询当年的所有单位
-        IPage<RehearsalYearVO> unitPage = baseMapper.selectUnitByYear(page, year);
-        List<RehearsalYearVO> records = unitPage.getRecords();
-        List<String> unitList = records.stream().map(RehearsalYearVO::getUnit).collect(Collectors.toList());
-        // 查询各单位全年已完成的演练数据
-        List<RehearsalYearDTO> unitMonthDataList = baseMapper.selectFinishedDataByUnit(unitList, year);
-        // 将各单位每个月的演练数据写入统计列表
-        unitMonthDataList.forEach(data -> {
-            RehearsalYearVO rehearsalYearVO = records.stream().filter(x -> x.getUnit().equals(data.getUnit()))
-                    .collect(Collectors.toList()).get(0);
-            // 根据月份匹配写入对应字段
-            switch (data.getDateTime()) {
-                case "01":
-                    rehearsalYearVO.setJanuaryNum(data.getFinishedNum());
-                    break;
-                case "02":
-                    rehearsalYearVO.setFebruaryNum(data.getFinishedNum());
-                    break;
-                case "03":
-                    rehearsalYearVO.setMarchNum(data.getFinishedNum());
-                    break;
-                case "04":
-                    rehearsalYearVO.setAprilNum(data.getFinishedNum());
-                    break;
-                case "05":
-                    rehearsalYearVO.setMayNum(data.getFinishedNum());
-                    break;
-                case "06":
-                    rehearsalYearVO.setJuneNum(data.getFinishedNum());
-                    break;
-                case "07":
-                    rehearsalYearVO.setJulyNum(data.getFinishedNum());
-                    break;
-                case "08":
-                    rehearsalYearVO.setAugustNum(data.getFinishedNum());
-                    break;
-                case "09":
-                    rehearsalYearVO.setSeptemberNum(data.getFinishedNum());
-                    break;
-                case "10":
-                    rehearsalYearVO.setOctoberNum(data.getFinishedNum());
-                    break;
-                case "11":
-                    rehearsalYearVO.setNovemberNum(data.getFinishedNum());
-                    break;
-                case "12":
-                    rehearsalYearVO.setDecemberNum(data.getFinishedNum());
-            }
-        });
-        unitPage.setRecords(records);
-        return unitPage;
-    }
 
     /**
      * 新增演练
      */
     @Override
-    public boolean saveRehearsal(RehearsalRecordEntity rehearsalRecord) {
+    public boolean saveRehearsalRecord(RehearsalRecordEntity rehearsalRecord) {
         // 获取当月时间（yyyymm）
         String currentMonth = DatePattern.SIMPLE_MONTH_FORMAT.format(new Date());
         // 查询是否存在同月编号
@@ -165,14 +64,21 @@ public class RehearsalRecordServiceImpl extends ServiceImpl<RehearsalRecordMappe
             int peopleNum = peopleName.split(",").length;
             rehearsalRecord.setPeopleNum(peopleNum);
         }
-        return this.save(rehearsalRecord);
+        boolean save = this.save(rehearsalRecord);
+        // 若演练记录新增成功，修改演练计划状态为已完成
+        if (save) {
+            RehearsalPlanEntity rehearsalPlanEntity = rehearsalPlanMapper.selectById(rehearsalRecord.getRehearsalPlanId());
+            rehearsalPlanEntity.setRehearsalStatus(RehearsalStatusEnum.FINISHED.getValue());
+            return rehearsalPlanMapper.updateById(rehearsalPlanEntity) == SafeProductConstant.SUCCESS;
+        }
+        return false;
     }
 
     /**
      * 修改演练
      */
     @Override
-    public boolean updateRehearsal(RehearsalRecordEntity rehearsalRecord) {
+    public boolean updateRehearsalRecord(RehearsalRecordEntity rehearsalRecord) {
         // 参演人数
         String peopleName = rehearsalRecord.getPeopleName();
         if (StringUtils.isNotEmpty(peopleName)) {
@@ -183,52 +89,6 @@ public class RehearsalRecordServiceImpl extends ServiceImpl<RehearsalRecordMappe
     }
 
     /**
-     * 演练数据导出
-     */
-    @Override
-    public void exportRehearsalData(Map<String, Object> param, HttpServletResponse response) {
-        ServletOutputStream outputStream = null;
-        try {
-            outputStream = response.getOutputStream();
-            String unit = String.valueOf(param.get("unit"));
-            String startTime = String.valueOf(param.get("scheduledStartTime"));
-            String endTime = String.valueOf(param.get("scheduledEndTime"));
-            List<RehearsalRecordEntity> rehearsalRecordList = getRehearsalByUnitAndDate(unit, startTime, endTime);
-            // 设置响应头
-            // URLEncoder.encode防止中文乱码
-            String fileName = URLEncoder.encode("演练记录表", "UTF-8");
-            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
-            response.setContentType("application/vnd.ms-excel");
-            response.setCharacterEncoding("UTF-8");
-            // ExcelWriter初始化
-            ExcelWriter excelWriter = EasyExcel
-                    .write(response.getOutputStream())
-                    .autoCloseStream(Boolean.TRUE)
-                    .registerConverter(new LongStringConverter())
-                    .registerWriteHandler(new SimpleColumnWidthStyleStrategy(25))
-                    .build();
-            WriteSheet writeSheet = EasyExcel.writerSheet(1, "演练记录表").head(RehearsalRecordEntity.class)
-                    .build();
-            excelWriter.write(rehearsalRecordList, writeSheet);
-            excelWriter.finish();
-        } catch (Exception e) {
-            // 重置response
-            response.reset();
-            response.setContentType("application/json");
-            response.setCharacterEncoding("utf-8");
-            throw new ServiceException("演练数据导出异常: " + e.getMessage());
-        } finally {
-            if (outputStream != null) {
-                try {
-                    outputStream.close();
-                } catch (IOException e) {
-                    log.error("演练导出响应头输出流关闭异常: " + e.getMessage());
-                }
-            }
-        }
-    }
-
-    /**
      * 查询是否存在同月编号
      * @param currentMonth 当月
      * @return 存在则返回上一编号，否则返回null
@@ -255,37 +115,20 @@ public class RehearsalRecordServiceImpl extends ServiceImpl<RehearsalRecordMappe
     }
 
     /**
-     * 根据单位和计划时间查询演练记录
+     * 删除关联演练记录
-     * @param unit 单位
-     * @param startTime 计划开始时间
-     * @param endTime 计划结束时间
-     * @return 演练记录列表
-     */
-    public List<RehearsalRecordEntity> getRehearsalByUnitAndDate(String unit, String startTime, String endTime) {
-        LambdaQueryWrapper<RehearsalRecordEntity> queryWrapper = new LambdaQueryWrapper<>();
-        if (!unit.equals("null")) {
-            queryWrapper.eq(RehearsalRecordEntity::getUnit, unit);
-        }
-        if (!startTime.equals("null")) {
-            queryWrapper.ge(RehearsalRecordEntity::getScheduledStartTime, startTime);
-        }
-        if (!endTime.equals("null")) {
-            queryWrapper.le(RehearsalRecordEntity::getScheduledEndTime, endTime);
-        }
-        queryWrapper.orderByDesc(RehearsalRecordEntity::getScheduledEndTime);
-        return this.list(queryWrapper);
-    }
-
-    /**
-     * 查询时间范围内未开始的演练数据
      */
     @Override
-    public List<RehearsalRecordEntity> getWaitingRehearsalInTimeRange(String startTime, String endTime) {
+    public boolean removeRelativeRehearsalRecord(Long rehearsalPlanId) {
+        // 查询关联演练记录
         QueryWrapper<RehearsalRecordEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(RehearsalRecordEntity::getRehearsalStatus, RehearsalStatusEnum.WAITING.getValue())
+        queryWrapper.lambda().eq(RehearsalRecordEntity::getRehearsalPlanId, rehearsalPlanId);
-                .ge(RehearsalRecordEntity::getScheduledEndTime, startTime)
+        List<RehearsalRecordEntity> rehearsalRecordList = this.list(queryWrapper);
-                .lt(RehearsalRecordEntity::getScheduledEndTime, endTime);
+        // 若无关联演练记录，直接返回true
-        return this.list(queryWrapper);
+        if (CollectionUtils.isEmpty(rehearsalRecordList)) {
+            return true;
+        }
+        // 删除关联演练记录
+        List<Long> ids = rehearsalRecordList.stream().map(RehearsalRecordEntity::getId).collect(Collectors.toList());
+        return this.removeByIds(ids);
     }
-
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 考试成绩服务实现类
@@ -41,6 +42,7 @@ public class TestScoreServiceImpl extends ServiceImpl<TestScoreMapper, TestScore
         scoreList.forEach(score -> {
             TestScoreEntity testScoreEntity = new TestScoreEntity();
             BeanUtils.copyProperties(score, testScoreEntity);
+            testScoreEntity.setTestId(testScoreDTO.getTestId());
             testScoreEntities.add(testScoreEntity);
         });
         return this.updateBatchById(testScoreEntities);
@@ -60,7 +62,8 @@ public class TestScoreServiceImpl extends ServiceImpl<TestScoreMapper, TestScore
             return true;
         }
         // 删除关联考试成绩
-        return this.removeByIds(testScoreList);
+        List<Long> ids = testScoreList.stream().map(TestScoreEntity::getId).collect(Collectors.toList());
+        return this.removeByIds(ids);
     }
 
     /**

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestServiceImpl.java

@@ -14,7 +14,6 @@ import com.hnac.hzims.safeproduct.mapper.TestMapper;
 import com.hnac.hzims.safeproduct.mapper.TrainPlanMapper;
 import com.hnac.hzims.safeproduct.service.ITestScoreService;
 import com.hnac.hzims.safeproduct.service.ITestService;
-import com.hnac.hzims.safeproduct.vo.TestScoreVO;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +23,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 考试记录服务实现类
@@ -115,7 +115,8 @@ public class TestServiceImpl extends ServiceImpl<TestMapper, TestEntity> impleme
             return true;
         }
         // 删除关联考试记录
-        boolean remove = this.removeByIds(testList);
+        List<Long> ids = testList.stream().map(TestEntity::getId).collect(Collectors.toList());
+        boolean remove = this.removeByIds(ids);
         // 若删除考试记录成功，删除关联考试成绩
         if (remove) {
             for (TestEntity test : testList) {
@@ -169,25 +170,30 @@ public class TestServiceImpl extends ServiceImpl<TestMapper, TestEntity> impleme
     public boolean updateTest(TestEntity testEntity) {
         // 判断考试人员是否有变化
         TestEntity oldTest = getTestByCode(testEntity.getCode());
-        // 若不存在变化，更新考试记录
+        // 更新考试记录
-        if (oldTest.getPeopleName().equals(testEntity.getPeopleName())) {
+        boolean update = this.updateById(testEntity);
-            return this.updateById(testEntity);
+        if (update) {
-        }
+            // 若不存在人员变化，返回true
-        // 若存在变化，查询并删除关联考试成绩
+            if (oldTest.getPeopleName().equals(testEntity.getPeopleName())) {
-        List<TestScoreEntity> testScoreList = testScoreService.getRelativeTestScore(testEntity.getId());
+                return true;
-        boolean removeByIds = testScoreService.removeByIds(testScoreList);
+            }
-        // 若删除成功，新增新的考试成绩数据
+            // 若存在变化，查询并删除关联考试成绩
-        if (removeByIds) {
+            List<TestScoreEntity> testScoreList = testScoreService.getRelativeTestScore(testEntity.getId());
-            String[] person = testEntity.getPeopleName().split(",|，");
+            List<Long> scoreIds = testScoreList.stream().map(TestScoreEntity::getId).collect(Collectors.toList());
-            // 新增参考人员成绩数据
+            boolean removeByIds = testScoreService.removeByIds(scoreIds);
-            List<TestScoreEntity> res = new ArrayList<>();
+            // 若删除成功，新增新的考试成绩数据
-            for (String name : person) {
+            if (removeByIds) {
-                TestScoreEntity testScoreEntity = new TestScoreEntity();
+                String[] person = testEntity.getPeopleName().split(",|，");
-                testScoreEntity.setTestId(testEntity.getId());
+                // 新增参考人员成绩数据
-                testScoreEntity.setName(name);
+                List<TestScoreEntity> res = new ArrayList<>();
-                res.add(testScoreEntity);
+                for (String name : person) {
+                    TestScoreEntity testScoreEntity = new TestScoreEntity();
+                    testScoreEntity.setTestId(testEntity.getId());
+                    testScoreEntity.setName(name);
+                    res.add(testScoreEntity);
+                }
+                return testScoreService.saveBatch(res);
             }
-            return testScoreService.saveBatch(res);
         }
         return false;
     }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java

@@ -6,13 +6,15 @@ import com.alibaba.excel.converters.longconverter.LongStringConverter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hnac.hzims.common.utils.Condition;
+import com.hnac.hzims.safeproduct.constants.SafeProductConstant;
 import com.hnac.hzims.safeproduct.dto.AnalysisYearDTO;
-import com.hnac.hzims.safeproduct.entity.RehearsalRecordEntity;
 import com.hnac.hzims.safeproduct.entity.TrainPlanEntity;
-import com.hnac.hzims.safeproduct.entity.TrainRecordEntity;
+import com.hnac.hzims.safeproduct.enums.TrainStatusEnum;
 import com.hnac.hzims.safeproduct.mapper.TrainPlanMapper;
 import com.hnac.hzims.safeproduct.service.ITestService;
 import com.hnac.hzims.safeproduct.service.ITrainPlanService;
@@ -169,7 +171,23 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
             String unit = String.valueOf(param.get("unit"));
             String startTime = String.valueOf(param.get("scheduledStartTime"));
             String endTime = String.valueOf(param.get("scheduledEndTime"));
-            List<TrainPlanEntity> rehearsalRecordList = getTrainPlanByUnitAndDate(unit, startTime, endTime);
+            List<TrainPlanEntity> trainPlanList = getTrainPlanByUnitAndDate(unit, startTime, endTime);
+            // 处理字段信息
+            trainPlanList.forEach(train -> {
+                // 培训状态
+                String status;
+                if (train.getTrainStatus().equals(TrainStatusEnum.WAITING.getValue())) {
+                    status = TrainStatusEnum.WAITING.getDesc();
+                } else if (train.getTrainStatus().equals(TrainStatusEnum.UNFINISHED.getValue())) {
+                    status = TrainStatusEnum.UNFINISHED.getDesc();
+                } else {
+                    status = TrainStatusEnum.FINISHED.getDesc();
+                }
+                train.setTrainStatus(status);
+                // 是否考试
+                String isTest = train.getIsTest().equals(SafeProductConstant.TRAIN_PLAN_HAS_TEST) ? "是" : "否";
+                train.setHasTest(isTest);
+            });
             // 设置响应头
             // URLEncoder.encode防止中文乱码
             String fileName = URLEncoder.encode("培训计划表", "UTF-8");
@@ -185,7 +203,7 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
                     .build();
             WriteSheet writeSheet = EasyExcel.writerSheet(1, "培训计划表").head(TrainPlanEntity.class)
                     .build();
-            excelWriter.write(rehearsalRecordList, writeSheet);
+            excelWriter.write(trainPlanList, writeSheet);
             excelWriter.finish();
         } catch (Exception e) {
             // 重置response
@@ -205,6 +223,39 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
     }
 
     /**
+     * 查询时间范围内未开始的培训计划数据
+     */
+    @Override
+    public List<TrainPlanEntity> getWaitingTrainPlanInTimeRange(String startTime, String endTime) {
+        QueryWrapper<TrainPlanEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(TrainPlanEntity::getTrainStatus, TrainStatusEnum.WAITING.getValue())
+                .ge(TrainPlanEntity::getScheduledEndTime, startTime)
+                .lt(TrainPlanEntity::getScheduledEndTime, endTime);
+        return this.list(queryWrapper);
+    }
+
+    /**
+     * 培训计划分页
+     */
+    @Override
+    public IPage<TrainPlanEntity> trainPlanPage(Map<String, Object> param, Query query) {
+        QueryWrapper<TrainPlanEntity> queryWrapper = new QueryWrapper<>();
+        String unit = String.valueOf(param.get("unit"));
+        String startTime = String.valueOf(param.get("scheduledStartTime"));
+        String endTime = String.valueOf((param.get("scheduledEndTime")));
+        if (!unit.equals("null") && !unit.equals("")) {
+            queryWrapper.lambda().like(TrainPlanEntity::getUnit, unit);
+        }
+        if (!startTime.equals("null") && !startTime.equals("")) {
+            queryWrapper.lambda().ge(TrainPlanEntity::getScheduledStartTime, startTime);
+        }
+        if (!endTime.equals("null") && !endTime.equals("")) {
+            queryWrapper.lambda().le(TrainPlanEntity::getScheduledEndTime, endTime);
+        }
+        return this.page(Condition.getPage(query), queryWrapper);
+    }
+
+    /**
      * 根据单位和计划时间查询培训计划数据
      * @param unit 单位
      * @param startTime 计划开始时间

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java

@@ -11,10 +11,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hnac.hzims.common.logs.utils.StringUtils;
+import com.hnac.hzims.safeproduct.constants.SafeProductConstant;
 import com.hnac.hzims.safeproduct.dto.TrainRecordDTO;
-import com.hnac.hzims.safeproduct.entity.RehearsalRecordEntity;
 import com.hnac.hzims.safeproduct.entity.TrainPlanEntity;
 import com.hnac.hzims.safeproduct.entity.TrainRecordEntity;
+import com.hnac.hzims.safeproduct.enums.TrainStatusEnum;
+import com.hnac.hzims.safeproduct.mapper.TrainPlanMapper;
 import com.hnac.hzims.safeproduct.mapper.TrainRecordMapper;
 import com.hnac.hzims.safeproduct.service.ITestService;
 import com.hnac.hzims.safeproduct.service.ITrainRecordService;
@@ -23,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -30,6 +33,7 @@ import java.net.URLEncoder;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 培训记录服务实现类
@@ -43,9 +47,13 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
     @Autowired
     ITestService testService;
 
+    @Resource
+    TrainPlanMapper trainPlanMapper;
+
     /**
      * 新增培训记录
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean saveTrainRecord(TrainRecordEntity trainRecordEntity) {
         // 获取当月时间（yyyymm）
@@ -69,7 +77,14 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
             }
         }
         trainRecordEntity.setCode(code);
-        return this.save(trainRecordEntity);
+        boolean save = this.save(trainRecordEntity);
+        // 若培训记录新增成功，修改培训计划状态为已完成
+        if (save) {
+            TrainPlanEntity trainPlanEntity = trainPlanMapper.selectById(trainRecordEntity.getTrainPlanId());
+            trainPlanEntity.setTrainStatus(TrainStatusEnum.FINISHED.getValue());
+            return trainPlanMapper.updateById(trainPlanEntity) == SafeProductConstant.SUCCESS;
+        }
+        return false;
     }
 
     /**
@@ -85,7 +100,8 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
             return true;
         }
         // 删除关联培训记录
-        boolean remove = this.removeByIds(trainRecordList);
+        List<Long> ids = trainRecordList.stream().map(TrainRecordEntity::getId).collect(Collectors.toList());
+        boolean remove = this.removeByIds(ids);
         // 若删除培训记录成功，则删除关联考试记录
         if (remove) {
             for (TrainRecordEntity trainRecord : trainRecordList) {
@@ -140,7 +156,7 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
         try {
             outputStream = response.getOutputStream();
             String trainPlanId = String.valueOf(param.get("trainPlanId"));
-            List<TrainRecordEntity> rehearsalRecordList = getTrainRecordByTrainPlanId(trainPlanId);
+            List<TrainRecordEntity> trainRecordList = getTrainRecordByTrainPlanId(trainPlanId);
             // 设置响应头
             // URLEncoder.encode防止中文乱码
             String fileName = URLEncoder.encode("培训记录表", "UTF-8");
@@ -156,7 +172,7 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
                     .build();
             WriteSheet writeSheet = EasyExcel.writerSheet(1, "培训记录表").head(TrainRecordEntity.class)
                     .build();
-            excelWriter.write(rehearsalRecordList, writeSheet);
+            excelWriter.write(trainRecordList, writeSheet);
             excelWriter.finish();
         } catch (Exception e) {
             // 重置response

hzims-service/safeproduct/src/main/resources/db/1.0.1.sql

@@ -13,23 +13,14 @@ create table document_management
 
 CREATE TABLE `hzims_rehearsal_plan` (
     `id` bigint(20) NOT NULL COMMENT '主键id',
-    `code` varchar(50) NOT NULL COMMENT '编号',
     `unit` varchar(50) NOT NULL COMMENT '单位',
     `subject` varchar(50) NOT NULL COMMENT '演练科目',
     `scheduled_start_time` datetime NOT NULL COMMENT '演练计划开始时间',
     `scheduled_end_time` datetime NOT NULL COMMENT '演练计划结束时间',
     `location` varchar(255) NOT NULL COMMENT '演练地点',
-    `people_num` int(10) NOT NULL DEFAULT '0' COMMENT '参演人数',
-    `people_name` varchar(5000) DEFAULT '' COMMENT '参演人员',
     `commander` varchar(10) NOT NULL COMMENT '总指挥',
-    `actual_start_time` datetime DEFAULT NULL COMMENT '演练实际开始时间',
-    `actual_end_time` datetime DEFAULT NULL COMMENT '演练实际结束时间',
-    `record` varchar(250) DEFAULT '' COMMENT '演练记录',
-    `comment` varchar(250) DEFAULT '' DEFAULT '' COMMENT '演练评价',
     `rehearsal_method` varchar(20) DEFAULT '' COMMENT '演练方式',
     `rehearsal_status` varchar(20) NOT NULL DEFAULT 'WAITING' COMMENT '演练状态',
-    `img_path` varchar(1000) NOT NULL DEFAULT '' COMMENT '演练图片',
-    `file_path` varchar(1000) NOT NULL DEFAULT '' COMMENT '演练附件',
     `create_user` bigint(20) NOT NULL DEFAULT '-1' COMMENT '创建人',
     `create_dept` bigint(20) NOT NULL DEFAULT '-1' COMMENT '创建部门',
     `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -42,21 +33,14 @@ CREATE TABLE `hzims_rehearsal_plan` (
 
 CREATE TABLE `hzims_rehearsal_record` (
     `id` bigint(20) NOT NULL COMMENT '主键id',
+    `rehearsal_plan_id` bigint(20) NOT NULL COMMENT '演练计划id',
     `code` varchar(50) NOT NULL COMMENT '编号',
-    `unit` varchar(50) NOT NULL COMMENT '单位',
-    `subject` varchar(50) NOT NULL COMMENT '演练科目',
-    `scheduled_start_time` datetime NOT NULL COMMENT '演练计划开始时间',
-    `scheduled_end_time` datetime NOT NULL COMMENT '演练计划结束时间',
-    `location` varchar(255) NOT NULL COMMENT '演练地点',
     `people_num` int(10) NOT NULL DEFAULT '0' COMMENT '参演人数',
     `people_name` varchar(5000) DEFAULT '' COMMENT '参演人员',
-    `commander` varchar(10) NOT NULL COMMENT '总指挥',
     `actual_start_time` datetime DEFAULT NULL COMMENT '演练实际开始时间',
     `actual_end_time` datetime DEFAULT NULL COMMENT '演练实际结束时间',
     `record` varchar(250) DEFAULT '' COMMENT '演练记录',
     `comment` varchar(250) DEFAULT '' DEFAULT '' COMMENT '演练评价',
-    `rehearsal_method` varchar(20) DEFAULT '' COMMENT '演练方式',
-    `rehearsal_status` varchar(20) NOT NULL DEFAULT 'WAITING' COMMENT '演练状态',
     `img_path` varchar(1000) NOT NULL DEFAULT '' COMMENT '演练图片',
     `file_path` varchar(1000) NOT NULL DEFAULT '' COMMENT '演练附件',
     `create_user` bigint(20) NOT NULL DEFAULT '-1' COMMENT '创建人',