From 611ba10fe1678dca8f78ad5c01e1193339a445a4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 06 三月 2024 14:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java | 47
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java | 43
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 99 +
ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPointQuery.java | 24
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java | 19
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java | 23
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java | 42
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderYwConditionRecordServiceImpl.java | 105 +
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 83 +
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java | 1
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java | 16
ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java | 4
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java | 65 +
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultRuleQuery.java | 44
ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java | 82 +
ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleSetForm.java | 22
ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleForm.java | 47
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 19
ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java | 75 +
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java | 180 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderYwConditionRecord.java | 38
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 61 +
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 93 +
ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java | 65 +
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 69 +
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java | 47
ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java | 56 +
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderAuditingRecordService.java | 51
ycl-server/src/main/resources/mapper/zgyw/YwPeopleMapper.xml | 16
ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java | 19
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java | 1
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderYwConditionRecordService.java | 50
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 72 +
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/Rule.java | 18
ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml | 4
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderCheckResultForm.java | 25
ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java | 16
ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java | 145 ++
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 28
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java | 41
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderAuditingRecordVO.java | 44
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 21
ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java | 22
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderAuditingRecordQuery.java | 23
ycl-server/src/main/java/com/ycl/platform/service/DefaultRuleService.java | 73 +
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderAuditingRecordMapper.java | 16
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderYwConditionRecordQuery.java | 23
ycl-server/src/main/java/com/ycl/utils/DateUtils.java | 42
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 16
ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java | 7
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 19
ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 222 ++++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWResultForm.java | 25
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 157 ++
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml | 16
ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml | 15
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java | 52
ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwUnitQuery.java | 27
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 18
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 64 +
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java | 51
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 45
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultRuleVO.java | 44
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderAuditingRecordServiceImpl.java | 110 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java | 25
ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java | 27
69 files changed, 3,145 insertions(+), 20 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
index cb599c4..69eb752 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
@@ -13,7 +13,7 @@
public class AbsQuery {
@ApiModelProperty(value = "褰撳墠椤�", required = true)
- private Long currentPage = 1L;
+ private Long pageNum = 1L;
@ApiModelProperty(value = "姣忛〉鏉℃暟", required = true)
private Long pageSize = 10L;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java
index 5c2eca0..dada523 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java
@@ -17,9 +17,9 @@
private Integer id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date gmtCreate;
+ private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date gmtUpdate;
+ private Date updateTime;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java b/ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java
new file mode 100644
index 0000000..94c3200
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java
@@ -0,0 +1,22 @@
+package com.ycl.platform.base;
+
+import lombok.Data;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/3/5 15:11
+ */
+@Data
+public class BaseSelect {
+
+ /**
+ * 涓婚敭
+ */
+ private Integer id;
+
+ /**
+ * 鍊�
+ */
+ private String value;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
new file mode 100644
index 0000000..f6add46
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultAuditing.java
@@ -0,0 +1,47 @@
+package com.ycl.platform.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import com.ycl.platform.base.AbsEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩濊瀹℃牳
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@TableName("t_default_auditing")
+@ApiModel(value = "DefaultAuditing瀵硅薄", description = "杩濊瀹℃牳")
+public class DefaultAuditing extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("杩濊")
+ @TableField("default_id")
+ private Integer defaultId;
+
+ @ApiModelProperty("瀹℃牳鐘舵��")
+ @TableField("auditing_status")
+ private String auditingStatus;
+
+ @ApiModelProperty("瀹℃牳璇存槑")
+ @TableField("remark")
+ private String remark;
+
+ @ApiModelProperty("瀹℃牳鏃堕棿")
+ @TableField("auditing_time")
+ private LocalDateTime auditingTime;
+
+ @ApiModelProperty("瀹℃牳浜�")
+ @TableField("auditing_user")
+ private Integer auditingUser;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java
new file mode 100644
index 0000000..21b392b
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DefaultRule.java
@@ -0,0 +1,43 @@
+package com.ycl.platform.domain.entity;
+
+import com.ycl.platform.base.AbsEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ycl.platform.base.AbsEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩濈害瑙勫垯
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@TableName("t_default_rule")
+@ApiModel(value = "DefaultRule瀵硅薄", description = "杩濈害瑙勫垯")
+public class DefaultRule extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("瑙勫垯鍚嶇О")
+ @TableField("rule_name")
+ private String ruleName;
+
+ @ApiModelProperty("瑙勫垯璇︽儏JSON")
+ @TableField("rule_detail")
+ private String ruleDetail;
+
+ @ApiModelProperty("瑙勫垯鎻忚堪")
+ @TableField("rule_desc")
+ private String ruleDesc;
+
+ @ApiModelProperty("瑙勫垯鐘舵�侊細鍚敤銆佹湭鍚敤")
+ @TableField("rule_status")
+ private String ruleStatus;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
new file mode 100644
index 0000000..0fd9dd9
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
@@ -0,0 +1,69 @@
+package com.ycl.platform.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.ycl.platform.base.AbsEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@TableName("t_work_order")
+@ApiModel(value = "WorkOrder瀵硅薄", description = "宸ュ崟")
+public class WorkOrder extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ @TableField("work_order_no")
+ private String workOrderNo;
+
+ /** 鏁呴殰绫诲瀷 */
+ @TableField("error_type")
+ private String errorType;
+
+ @ApiModelProperty("宸ュ崟鏉ユ簮")
+ @TableField("source")
+ private String source;
+
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ @TableField("unit_id")
+ private Integer unitId;
+
+ @ApiModelProperty("杩愮淮浜哄憳")
+ @TableField("yw_people_id")
+ private Integer ywPeopleId;
+
+ @ApiModelProperty("鐘舵��")
+ @TableField("status")
+ private String status;
+
+ @ApiModelProperty("杩愮淮澶勭悊鏃堕棿")
+ @TableField("yw_handle_time")
+ private LocalDateTime ywHandleTime;
+
+ @ApiModelProperty("杩愮淮缁撴灉")
+ @TableField("yw_result")
+ private String ywResult;
+
+ @ApiModelProperty("杩愮淮鎯呭喌")
+ @TableField("yw_condition")
+ private String ywCondition;
+
+ @ApiModelProperty("杩愮淮妫�娴嬬粨鏋�")
+ @TableField("yw_check_result")
+ private String ywCheckResult;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java
new file mode 100644
index 0000000..ad21639
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderAuditingRecord.java
@@ -0,0 +1,42 @@
+package com.ycl.platform.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.platform.base.AbsEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟瀹℃牳璁板綍
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Data
+@Accessors(chain = true)
+@TableName("t_work_order_auditing_record")
+@ApiModel(value = "WorkOrderAuditingRecord瀵硅薄", description = "宸ュ崟瀹℃牳璁板綍")
+public class WorkOrderAuditingRecord extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("宸ュ崟ID")
+ @TableField("work_order_id")
+ private Integer workOrderId;
+
+ @ApiModelProperty("瀹℃牳浜�")
+ @TableField("auditing_user")
+ private Integer auditingUser;
+
+ @ApiModelProperty("瀹℃牳缁撴灉")
+ @TableField("result")
+ private String result;
+
+ @ApiModelProperty("瀹℃牳澶囨敞")
+ @TableField("remark")
+ private String remark;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderYwConditionRecord.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderYwConditionRecord.java
new file mode 100644
index 0000000..583e845
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrderYwConditionRecord.java
@@ -0,0 +1,38 @@
+package com.ycl.platform.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ycl.platform.base.AbsEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟杩愮淮鎯呭喌璁板綍
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Data
+@Accessors(chain = true)
+@TableName("t_work_order_yw_condition_record")
+@ApiModel(value = "WorkOrderYwConditionRecord瀵硅薄", description = "宸ュ崟杩愮淮鎯呭喌璁板綍")
+public class WorkOrderYwConditionRecord extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("宸ュ崟ID")
+ @TableField("work_order_id")
+ private Integer workOrderId;
+
+ @ApiModelProperty("鎻愪氦浜�")
+ @TableField("commit_user")
+ private Integer commitUser;
+
+ @ApiModelProperty("杩愮淮鎯呭喌")
+ @TableField("yw_condition")
+ private String ywCondition;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
new file mode 100644
index 0000000..1e33e8d
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -0,0 +1,52 @@
+package com.ycl.platform.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+
+import com.ycl.platform.base.AbsEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩愮淮鐐逛綅
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@TableName("t_yw_point")
+@ApiModel(value = "YwPoint瀵硅薄", description = "杩愮淮鐐逛綅")
+public class YwPoint extends AbsEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("鐐逛綅鍚嶇О")
+ @TableField("point_name")
+ private String pointName;
+
+ @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
+ @TableField("start_time")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
+ @TableField("end_time")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ @TableField("unit_id")
+ private Integer unitId;
+
+ @ApiModelProperty("杩愮淮鐘舵��")
+ @TableField("status")
+ private String status;
+
+ @ApiModelProperty("澶囨敞")
+ @TableField("remark")
+ private String remark;
+
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java
new file mode 100644
index 0000000..9ccf2ae
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultAuditingForm.java
@@ -0,0 +1,56 @@
+package com.ycl.platform.domain.form;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import com.ycl.platform.base.AbsForm;
+import com.ycl.platform.domain.entity.DefaultAuditing;
+import java.time.LocalDateTime;
+import org.springframework.beans.BeanUtils;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩濊瀹℃牳琛ㄥ崟
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "DefaultAuditing琛ㄥ崟", description = "杩濊瀹℃牳琛ㄥ崟")
+public class DefaultAuditingForm extends AbsForm {
+
+ @NotNull(message = "杩濊涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩濊")
+ private Integer defaultId;
+
+ @NotBlank(message = "瀹℃牳鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("瀹℃牳鐘舵��")
+ private String auditingStatus;
+
+ @NotBlank(message = "瀹℃牳璇存槑涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瀹℃牳璇存槑")
+ private String remark;
+
+ @NotNull(message = "瀹℃牳鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瀹℃牳鏃堕棿")
+ private LocalDateTime auditingTime;
+
+ @NotNull(message = "瀹℃牳浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("瀹℃牳浜�")
+ private Integer auditingUser;
+
+ public static DefaultAuditing getEntityByForm(@NonNull DefaultAuditingForm form, DefaultAuditing entity) {
+ if(entity == null) {
+ entity = new DefaultAuditing();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleForm.java
new file mode 100644
index 0000000..52c5b19
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleForm.java
@@ -0,0 +1,47 @@
+package com.ycl.platform.domain.form;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import com.ycl.platform.base.AbsForm;
+import com.ycl.platform.domain.entity.DefaultRule;
+import java.time.LocalDateTime;
+import org.springframework.beans.BeanUtils;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩濈害瑙勫垯琛ㄥ崟
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "DefaultRule琛ㄥ崟", description = "杩濈害瑙勫垯琛ㄥ崟")
+public class DefaultRuleForm extends AbsForm {
+
+ @NotBlank(message = "瑙勫垯鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瑙勫垯鍚嶇О")
+ private String ruleName;
+
+ @NotBlank(message = "瑙勫垯璁剧疆涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瑙勫垯璇︽儏JSON")
+ private String ruleDetail;
+
+ @ApiModelProperty("瑙勫垯鎻忚堪")
+ private String ruleDesc;
+
+ public static DefaultRule getEntityByForm(@NonNull DefaultRuleForm form, DefaultRule entity) {
+ if(entity == null) {
+ entity = new DefaultRule();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleSetForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleSetForm.java
new file mode 100644
index 0000000..9b43579
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/DefaultRuleSetForm.java
@@ -0,0 +1,22 @@
+package com.ycl.platform.domain.form;
+
+import lombok.Data;
+
+/**
+ * 鍚敤鍋滅敤-杩濈害瑙勫垯
+ *
+ * @author锛歺p
+ * @date锛�2024/3/6 11:16
+ */
+@Data
+public class DefaultRuleSetForm {
+
+ private Integer id;
+
+ /**
+ * true 鍚敤
+ * false 鍋滅敤
+ */
+ private Boolean flag;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java
new file mode 100644
index 0000000..b7fc6e6
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java
@@ -0,0 +1,27 @@
+package com.ycl.platform.domain.form;
+
+import com.ycl.platform.base.AbsForm;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 宸ュ崟瀹℃牳琛ㄥ崟
+ *
+ * @author锛歺p
+ * @date锛�2024/3/6 8:59
+ */
+@Data
+public class WorkOrderAuditingForm extends AbsForm {
+
+ /**
+ * 瀹℃牳缁撴灉
+ */
+ @NotBlank(message = "瀹℃牳缁撴灉涓嶈兘涓虹┖")
+ private String auditingResult;
+
+ /**
+ * 瀹℃牳璇存槑
+ */
+ private String auditingRemark;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderCheckResultForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderCheckResultForm.java
new file mode 100644
index 0000000..71766ef
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderCheckResultForm.java
@@ -0,0 +1,25 @@
+package com.ycl.platform.domain.form;
+
+import lombok.Data;
+
+/**
+ * 妫�娴嬬粨鏋滆〃鍗�
+ *
+ * @author锛歺p
+ * @date锛�2024/3/6 8:59
+ */
+@Data
+public class WorkOrderCheckResultForm {
+
+ /**
+ * 宸ュ崟ID
+ */
+ private Integer id;
+
+
+ /**
+ * 妫�娴嬬粨鏋�
+ */
+ private String ywCheckResult;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
new file mode 100644
index 0000000..95a5a34
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -0,0 +1,65 @@
+package com.ycl.platform.domain.form;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import com.ycl.platform.base.AbsForm;
+import com.ycl.platform.domain.entity.WorkOrder;
+import org.springframework.beans.BeanUtils;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 宸ュ崟琛ㄥ崟
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "WorkOrder琛ㄥ崟", description = "宸ュ崟琛ㄥ崟")
+public class WorkOrderForm extends AbsForm {
+
+ @NotBlank(message = "宸ュ崟鍙蜂笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String workOrderNo;
+
+ @NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ private Integer unitId;
+
+ @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮浜哄憳")
+ private Integer ywPeopleId;
+
+ @NotNull(message = "杩愮淮澶勭悊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮澶勭悊鏃堕棿")
+ private LocalDateTime ywHandleTime;
+
+ @NotBlank(message = "杩愮淮缁撴灉涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮缁撴灉")
+ private String ywResult;
+
+ @NotBlank(message = "杩愮淮鎯呭喌涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮鎯呭喌")
+ private String ywCondition;
+
+ @NotBlank(message = "杩愮淮妫�娴嬬粨鏋滀笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮妫�娴嬬粨鏋�")
+ private String ywCheckResult;
+
+ public static WorkOrder getEntityByForm(@NonNull WorkOrderForm form, WorkOrder entity) {
+ if(entity == null) {
+ entity = new WorkOrder();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java
new file mode 100644
index 0000000..7f834a8
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWConditionForm.java
@@ -0,0 +1,25 @@
+package com.ycl.platform.domain.form;
+
+import lombok.Data;
+
+/**
+ * 杩愮淮鎯呭喌琛ㄥ崟
+ *
+ * @author锛歺p
+ * @date锛�2024/3/6 8:59
+ */
+@Data
+public class WorkOrderYWConditionForm {
+
+ /**
+ * 宸ュ崟ID
+ */
+ private Integer id;
+
+
+ /**
+ * 杩愮淮鎯呭喌
+ */
+ private String ywCondition;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWResultForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWResultForm.java
new file mode 100644
index 0000000..b5deebc
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderYWResultForm.java
@@ -0,0 +1,25 @@
+package com.ycl.platform.domain.form;
+
+import lombok.Data;
+
+/**
+ * 杩愮淮缁撴灉琛ㄥ崟
+ *
+ * @author锛歺p
+ * @date锛�2024/3/6 8:59
+ */
+@Data
+public class WorkOrderYWResultForm {
+
+ /**
+ * 宸ュ崟ID
+ */
+ private Integer id;
+
+
+ /**
+ * 杩愮淮缁撴灉
+ */
+ private String ywResult;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java
index 29525e5..6c3578f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java
@@ -40,7 +40,6 @@
@ApiModelProperty("鎵�灞炶繍缁村崟浣�")
private Integer belongUnit;
- @NotBlank(message = "娣诲姞鏁版嵁鐨勬柟寮忥細鎵嬪姩銆佸鍏ヤ笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("娣诲姞鏁版嵁鐨勬柟寮忥細鎵嬪姩銆佸鍏�")
private String addWay;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
new file mode 100644
index 0000000..e5fd435
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -0,0 +1,61 @@
+package com.ycl.platform.domain.form;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import com.ycl.platform.base.AbsForm;
+import com.ycl.platform.domain.entity.YwPoint;
+import org.springframework.beans.BeanUtils;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.lang.NonNull;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 杩愮淮鐐逛綅琛ㄥ崟
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "YwPoint琛ㄥ崟", description = "杩愮淮鐐逛綅琛ㄥ崟")
+public class YwPointForm extends AbsForm {
+
+ @NotBlank(message = "鐐逛綅鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐐逛綅鍚嶇О")
+ private String pointName;
+
+ @NotNull(message = "鐐逛綅寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
+ private LocalDateTime startTime;
+
+ @NotNull(message = "鐐逛綅缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
+ private LocalDateTime endTime;
+
+ @NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ private Integer unitId;
+
+// @NotBlank(message = "杩愮淮鐘舵�佷笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("杩愮淮鐘舵��")
+ private String status;
+
+// @NotBlank(message = "澶囨敞涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+// @ApiModelProperty("澶囨敞")
+// private String remark;
+
+ public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
+ if(entity == null) {
+ entity = new YwPoint();
+ }
+ BeanUtils.copyProperties(form, entity);
+ return entity;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java
new file mode 100644
index 0000000..85b4f21
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultAuditingQuery.java
@@ -0,0 +1,23 @@
+package com.ycl.platform.domain.query;
+
+import com.ycl.platform.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import jakarta.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩濊瀹℃牳鏌ヨ
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "DefaultAuditing鏌ヨ", description = "杩濊瀹℃牳鏌ヨ")
+public class DefaultAuditingQuery extends AbsQuery {
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultRuleQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultRuleQuery.java
new file mode 100644
index 0000000..306e0d8
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DefaultRuleQuery.java
@@ -0,0 +1,44 @@
+package com.ycl.platform.domain.query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.platform.base.AbsQuery;
+
+import java.util.Date;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import jakarta.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩濈害瑙勫垯鏌ヨ
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "DefaultRule鏌ヨ", description = "杩濈害瑙勫垯鏌ヨ")
+public class DefaultRuleQuery extends AbsQuery {
+
+ /**
+ * 瑙勫垯鍚嶇О
+ */
+ private String ruleName;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date start;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date end;
+
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderAuditingRecordQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderAuditingRecordQuery.java
new file mode 100644
index 0000000..1c660ec
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderAuditingRecordQuery.java
@@ -0,0 +1,23 @@
+package com.ycl.platform.domain.query;
+
+import com.ycl.platform.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import jakarta.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟瀹℃牳璁板綍鏌ヨ
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "WorkOrderAuditingRecord鏌ヨ", description = "宸ュ崟瀹℃牳璁板綍鏌ヨ")
+public class WorkOrderAuditingRecordQuery extends AbsQuery {
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
new file mode 100644
index 0000000..e01442a
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -0,0 +1,45 @@
+package com.ycl.platform.domain.query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.platform.base.AbsQuery;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import jakarta.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟鏌ヨ
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "WorkOrder鏌ヨ", description = "宸ュ崟鏌ヨ")
+public class WorkOrderQuery extends AbsQuery {
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ private String workOrderNo;
+
+ /**
+ * 杩愮淮澶勭悊鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date start;
+
+ /**
+ * 杩愮淮澶勭悊鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date end;
+
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderYwConditionRecordQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderYwConditionRecordQuery.java
new file mode 100644
index 0000000..7b867c5
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderYwConditionRecordQuery.java
@@ -0,0 +1,23 @@
+package com.ycl.platform.domain.query;
+
+import com.ycl.platform.base.AbsQuery;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import jakarta.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟杩愮淮鎯呭喌璁板綍鏌ヨ
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "WorkOrderYwConditionRecord鏌ヨ", description = "宸ュ崟杩愮淮鎯呭喌璁板綍鏌ヨ")
+public class WorkOrderYwConditionRecordQuery extends AbsQuery {
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java
index 0040873..98063c5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java
@@ -15,5 +15,21 @@
@Accessors(chain = true)
@ApiModel(value = "YwPeople鏌ヨ", description = "杩愮淮浜哄憳鏌ヨ")
public class YwPeopleQuery extends AbsQuery {
+
+ /**
+ * 杩愮淮浜哄憳缂栫爜
+ */
+ private String ywPersonCode;
+
+ /**
+ * 杩愮淮浜哄憳濮撳悕
+ */
+ private String ywPersonName;
+
+ /**
+ * 鎵�灞炶繍缁村崟浣�
+ */
+ private Integer belongUnit;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPointQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPointQuery.java
new file mode 100644
index 0000000..ca880b0
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPointQuery.java
@@ -0,0 +1,24 @@
+package com.ycl.platform.domain.query;
+
+import java.util.List;
+
+import com.ycl.platform.base.AbsQuery;
+import org.springframework.lang.NonNull;
+import jakarta.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩愮淮鐐逛綅鏌ヨ
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "YwPoint鏌ヨ", description = "杩愮淮鐐逛綅鏌ヨ")
+public class YwPointQuery extends AbsQuery {
+}
+
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwUnitQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwUnitQuery.java
index a7c1a7c..ea8edad 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwUnitQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwUnitQuery.java
@@ -1,9 +1,13 @@
package com.ycl.platform.domain.query;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* 杩愮淮鍗曚綅鏌ヨ
@@ -15,5 +19,28 @@
@Accessors(chain = true)
@ApiModel(value = "YwUnit鏌ヨ", description = "杩愮淮鍗曚綅鏌ヨ")
public class YwUnitQuery extends AbsQuery {
+
+ /**
+ * 鍗曚綅缂栫爜
+ */
+ private String unitCode;
+
+ /**
+ * 鍗曚綅鍚嶇О
+ */
+ private String unitName;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date start;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date end;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
new file mode 100644
index 0000000..3a5fde8
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultAuditingVO.java
@@ -0,0 +1,47 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.DefaultAuditing;
+import java.util.List;
+import java.time.LocalDateTime;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩濊瀹℃牳灞曠ず
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+public class DefaultAuditingVO extends AbsVo {
+
+ /** 杩濊 */
+ private Integer defaultId;
+
+ /** 瀹℃牳鐘舵�� */
+ private String auditingStatus;
+
+ /** 瀹℃牳璇存槑 */
+ private String remark;
+
+ /** 瀹℃牳鏃堕棿 */
+ private LocalDateTime auditingTime;
+
+ /** 瀹℃牳浜� */
+ private Integer auditingUser;
+
+ public static DefaultAuditingVO getVoByEntity(@NonNull DefaultAuditing entity, DefaultAuditingVO vo) {
+ if(vo == null) {
+ vo = new DefaultAuditingVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultRuleVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultRuleVO.java
new file mode 100644
index 0000000..927f0f3
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DefaultRuleVO.java
@@ -0,0 +1,44 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.DefaultRule;
+import java.util.List;
+import java.time.LocalDateTime;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩濈害瑙勫垯灞曠ず
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+public class DefaultRuleVO extends AbsVo {
+
+ /** 瑙勫垯鍚嶇О */
+ private String ruleName;
+
+ /** 瑙勫垯璇︽儏JSON */
+ private String ruleDetail;
+
+ /** 瑙勫垯鎻忚堪 */
+ private String ruleDesc;
+
+ /** 瑙勫垯鐘舵�侊細鍚敤銆佹湭鍚敤 */
+ private String ruleStatus;
+
+ public static DefaultRuleVO getVoByEntity(@NonNull DefaultRule entity, DefaultRuleVO vo) {
+ if(vo == null) {
+ vo = new DefaultRuleVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/Rule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/Rule.java
new file mode 100644
index 0000000..7ada223
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/Rule.java
@@ -0,0 +1,18 @@
+package com.ycl.platform.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/3/6 10:49
+ */
+@Data
+public class Rule {
+
+ /** 瓒呮椂鏈鐞嗗伐鍗曟暟 */
+ private Integer overTime;
+
+ /** 宸ュ崟澶勭悊澶辫触鏁� */
+ private Integer failNum;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderAuditingRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderAuditingRecordVO.java
new file mode 100644
index 0000000..1c912c0
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderAuditingRecordVO.java
@@ -0,0 +1,44 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
+import java.util.List;
+import java.time.LocalDateTime;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟瀹℃牳璁板綍灞曠ず
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Data
+@Accessors(chain = true)
+public class WorkOrderAuditingRecordVO extends AbsVo {
+
+ /** 宸ュ崟ID */
+ private Integer workOrderId;
+
+ /** 瀹℃牳浜� */
+ private Integer auditingUser;
+
+ /** 瀹℃牳缁撴灉 */
+ private String result;
+
+ /** 瀹℃牳澶囨敞 */
+ private String remark;
+
+ public static WorkOrderAuditingRecordVO getVoByEntity(@NonNull WorkOrderAuditingRecord entity, WorkOrderAuditingRecordVO vo) {
+ if(vo == null) {
+ vo = new WorkOrderAuditingRecordVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
new file mode 100644
index 0000000..07ca702
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -0,0 +1,64 @@
+package com.ycl.platform.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.WorkOrder;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟灞曠ず
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+public class WorkOrderVO extends AbsVo {
+
+ /** 宸ュ崟鍙� */
+ private String workOrderNo;
+
+ /** 杩愮淮鍗曚綅 */
+ private Integer unitId;
+ private String unitName;
+
+ /** 宸ュ崟鏉ユ簮 */
+ private String source;
+
+ /** 鏁呴殰绫诲瀷 */
+ private String errorType;
+
+ /** 杩愮淮浜哄憳 */
+ private Integer ywPeopleId;
+ private String ywPeopleName;
+
+ /** 杩愮淮澶勭悊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime ywHandleTime;
+
+ /** 杩愮淮缁撴灉 */
+ private String ywResult;
+
+ /** 杩愮淮鎯呭喌 */
+ private String ywCondition;
+
+ /** 杩愮淮妫�娴嬬粨鏋� */
+ private String ywCheckResult;
+
+ public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
+ if(vo == null) {
+ vo = new WorkOrderVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
new file mode 100644
index 0000000..ac11354
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
@@ -0,0 +1,41 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
+import java.util.List;
+import java.time.LocalDateTime;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 宸ュ崟杩愮淮鎯呭喌璁板綍灞曠ず
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Data
+@Accessors(chain = true)
+public class WorkOrderYwConditionRecordVO extends AbsVo {
+
+ /** 宸ュ崟ID */
+ private Integer workOrderId;
+
+ /** 鎻愪氦浜� */
+ private Integer commitUser;
+
+ /** 杩愮淮鎯呭喌 */
+ private String ywCondition;
+
+ public static WorkOrderYwConditionRecordVO getVoByEntity(@NonNull WorkOrderYwConditionRecord entity, WorkOrderYwConditionRecordVO vo) {
+ if(vo == null) {
+ vo = new WorkOrderYwConditionRecordVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java
index 0d7a735..e58ddcd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java
@@ -28,6 +28,7 @@
/** 鎵�灞炶繍缁村崟浣� */
private Integer belongUnit;
+ private String belongUnitName;
/** 娣诲姞鏁版嵁鐨勬柟寮忥細鎵嬪姩銆佸鍏� */
private String addWay;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
new file mode 100644
index 0000000..9b41fcf
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
@@ -0,0 +1,51 @@
+package com.ycl.platform.domain.vo;
+
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.YwPoint;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import org.springframework.lang.NonNull;
+import org.springframework.beans.BeanUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 杩愮淮鐐逛綅灞曠ず
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Data
+@Accessors(chain = true)
+public class YwPointVO extends AbsVo {
+
+ /** 鐐逛綅鍚嶇О */
+ private String pointName;
+
+ /** 鐐逛綅寮�濮嬫椂闂� */
+ private LocalDateTime startTime;
+
+ /** 鐐逛綅缁撴潫鏃堕棿 */
+ private LocalDateTime endTime;
+
+ /** 杩愮淮鍗曚綅 */
+ private Integer unitId;
+
+ /** 杩愮淮鐘舵�� */
+ private String status;
+
+ /** 澶囨敞 */
+ private String remark;
+
+ public static YwPointVO getVoByEntity(@NonNull YwPoint entity, YwPointVO vo) {
+ if(vo == null) {
+ vo = new YwPointVO();
+ }
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ }
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java b/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
index 35eebc3..7f1defe 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
@@ -21,7 +21,7 @@
*/
public static <T extends AbsEntity, Q extends AbsQuery> IPage<T> getPage(Q q, Class<T> c) {
Page<T> page = new Page<T>()
- .setCurrent(q.getCurrentPage())
+ .setCurrent(q.getPageNum())
.setSize(q.getPageSize());
return page;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java
new file mode 100644
index 0000000..cb99f29
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultAuditingController.java
@@ -0,0 +1,75 @@
+package com.ycl.platform.controller;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import org.springframework.validation.annotation.Validated;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import jakarta.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.platform.service.DefaultAuditingService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.DefaultAuditingForm;
+import com.ycl.platform.domain.query.DefaultAuditingQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 杩濊瀹℃牳 鍓嶇鎺у埗鍣�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "杩濊瀹℃牳", tags = "杩濊瀹℃牳绠＄悊")
+@RestController
+@RequestMapping("/default-auditing")
+public class DefaultAuditingController {
+
+ private final DefaultAuditingService defaultAuditingService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody @Validated(Add.class) DefaultAuditingForm form) {
+ return defaultAuditingService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ public Result update(@RequestBody @Validated(Update.class) DefaultAuditingForm form) {
+ return defaultAuditingService.update(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ public Result removeById(@PathVariable("id") String id) {
+ return defaultAuditingService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return defaultAuditingService.remove(ids);
+ }
+
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(DefaultAuditingQuery query) {
+ return defaultAuditingService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") String id) {
+ return defaultAuditingService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return defaultAuditingService.all();
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java
new file mode 100644
index 0000000..6fac87c
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DefaultRuleController.java
@@ -0,0 +1,82 @@
+package com.ycl.platform.controller;
+
+import com.ycl.platform.domain.form.DefaultRuleSetForm;
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import org.springframework.validation.annotation.Validated;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import jakarta.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.platform.service.DefaultRuleService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.DefaultRuleForm;
+import com.ycl.platform.domain.query.DefaultRuleQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 杩濈害瑙勫垯 鍓嶇鎺у埗鍣�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "杩濈害瑙勫垯", tags = "杩濈害瑙勫垯绠＄悊")
+@RestController
+@RequestMapping("/default-rule")
+public class DefaultRuleController {
+
+ private final DefaultRuleService defaultRuleService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody @Validated(Add.class) DefaultRuleForm form) {
+ return defaultRuleService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ public Result update(@RequestBody @Validated(Update.class) DefaultRuleForm form) {
+ return defaultRuleService.update(form);
+ }
+
+ @PostMapping("/set")
+ @ApiOperation(value = "鍚敤/鍋滅敤", notes = "鍚敤/鍋滅敤")
+ public Result set(@RequestBody DefaultRuleSetForm form) {
+ return defaultRuleService.set(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ public Result removeById(@PathVariable("id") String id) {
+ return defaultRuleService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return defaultRuleService.remove(ids);
+ }
+
+ @PostMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(@RequestBody DefaultRuleQuery query) {
+ return defaultRuleService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") String id) {
+ return defaultRuleService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return defaultRuleService.all();
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
new file mode 100644
index 0000000..55eca29
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -0,0 +1,99 @@
+package com.ycl.platform.controller;
+
+import com.ycl.platform.domain.form.*;
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import org.springframework.validation.annotation.Validated;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import jakarta.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.platform.service.WorkOrderService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.query.WorkOrderQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 宸ュ崟 鍓嶇鎺у埗鍣�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "宸ュ崟", tags = "宸ュ崟绠＄悊")
+@RestController
+@RequestMapping("/work-order")
+public class WorkOrderController {
+
+ private final WorkOrderService workOrderService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody @Validated(Add.class) WorkOrderForm form) {
+ return workOrderService.add(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ public Result update(@RequestBody @Validated(Update.class) WorkOrderForm form) {
+ return workOrderService.update(form);
+ }
+
+ @PutMapping("/auditing")
+ @ApiOperation(value = "瀹℃牳", notes = "宸ュ崟瀹℃牳")
+ public Result auditing(@RequestBody @Validated(Update.class) WorkOrderAuditingForm form) {
+ return workOrderService.auditing(form);
+ }
+
+ @PutMapping("/yw-condition")
+ @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
+ public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWConditionForm form) {
+ return workOrderService.ywCondition(form);
+ }
+
+ @PutMapping("/yw-result")
+ @ApiOperation(value = "杩愮淮缁撴灉", notes = "杩愮淮缁撴灉")
+ public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWResultForm form) {
+ return workOrderService.ywResult(form);
+ }
+
+ @PutMapping("/check-result")
+ @ApiOperation(value = "妫�娴嬬粨鏋�", notes = "妫�娴嬬粨鏋�")
+ public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderCheckResultForm form) {
+ return workOrderService.checkResult(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ public Result removeById(@PathVariable("id") String id) {
+ return workOrderService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return workOrderService.remove(ids);
+ }
+
+ @PostMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(@RequestBody WorkOrderQuery query) {
+ return workOrderService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") String id) {
+ return workOrderService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return workOrderService.all();
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
index 0c07df2..afd09f3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPeopleController.java
@@ -2,6 +2,7 @@
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -53,6 +54,7 @@
return ywPeopleService.remove(ids);
}
+ @PreAuthorize("@ss.hasPermi('unit:people:page')")
@GetMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
public Result page(YwPeopleQuery query) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
new file mode 100644
index 0000000..dfb341f
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -0,0 +1,83 @@
+package com.ycl.platform.controller;
+
+import com.ycl.system.domain.group.Update;
+import com.ycl.system.domain.group.Add;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import jakarta.validation.constraints.NotEmpty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.ycl.platform.service.YwPointService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.YwPointForm;
+import com.ycl.platform.domain.query.YwPointQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 杩愮淮鐐逛綅 鍓嶇鎺у埗鍣�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Validated
+@RequiredArgsConstructor
+@Api(value = "杩愮淮鐐逛綅", tags = "杩愮淮鐐逛綅绠＄悊")
+@RestController
+@RequestMapping("/yw-point")
+public class YwPointController {
+
+ private final YwPointService ywPointService;
+
+ @PostMapping
+ @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
+ public Result add(@RequestBody @Validated(Add.class) YwPointForm form) {
+ return ywPointService.add(form);
+ }
+
+ @PostMapping("/batch")
+ @ApiOperation(value = "鎵归噺娣诲姞", notes = "鎵归噺娣诲姞")
+ public Result batchAdd(@RequestBody @NotEmpty(message = "鏁版嵁涓嶈兘涓虹┖") List<YwPointForm> form) {
+ return ywPointService.batchAdd(form);
+ }
+
+ @PutMapping
+ @ApiOperation(value = "淇敼", notes = "淇敼")
+ public Result update(@RequestBody @Validated(Update.class) YwPointForm form) {
+ return ywPointService.update(form);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
+ public Result removeById(@PathVariable("id") String id) {
+ return ywPointService.removeById(id);
+ }
+
+ @DeleteMapping("/batch")
+ @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
+ public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
+ return ywPointService.remove(ids);
+ }
+
+ @PreAuthorize("@ss.hasPermi('point:page')")
+ @GetMapping("/page")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+ public Result page(YwPointQuery query) {
+ return ywPointService.page(query);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
+ public Result detail(@PathVariable("id") String id) {
+ return ywPointService.detail(id);
+ }
+
+ @GetMapping("/list")
+ @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
+ public Result list() {
+ return ywPointService.all();
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
index bc5a1ab..951773b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -6,6 +6,7 @@
import com.ycl.system.domain.group.Add;
import com.ycl.platform.domain.query.YwUnitQuery;
import com.ycl.platform.service.YwUnitService;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -54,10 +55,10 @@
return ywUnitService.remove(ids);
}
-// @PreAuthorize("@ss.hasPermi('unit:list')")
- @GetMapping("/page")
+ @PreAuthorize("@ss.hasPermi('unit:list')")
+ @PostMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- public Result page(YwUnitQuery query) {
+ public Result page(@RequestBody YwUnitQuery query) {
return ywUnitService.page(query);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java
new file mode 100644
index 0000000..3877306
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultAuditingMapper.java
@@ -0,0 +1,19 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.DefaultAuditing;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.vo.DefaultAuditingVO;
+import com.ycl.platform.domain.form.DefaultAuditingForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 杩濊瀹℃牳 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Mapper
+public interface DefaultAuditingMapper extends BaseMapper<DefaultAuditing> {
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java
new file mode 100644
index 0000000..a3e18e3
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/DefaultRuleMapper.java
@@ -0,0 +1,19 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.DefaultRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.vo.DefaultRuleVO;
+import com.ycl.platform.domain.form.DefaultRuleForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 杩濈害瑙勫垯 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Mapper
+public interface DefaultRuleMapper extends BaseMapper<DefaultRule> {
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderAuditingRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderAuditingRecordMapper.java
new file mode 100644
index 0000000..ae6c9bc
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderAuditingRecordMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 宸ュ崟瀹℃牳璁板綍 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Mapper
+public interface WorkOrderAuditingRecordMapper extends BaseMapper<WorkOrderAuditingRecord> {
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
new file mode 100644
index 0000000..b9a996c
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -0,0 +1,19 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.WorkOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.vo.WorkOrderVO;
+import com.ycl.platform.domain.form.WorkOrderForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 宸ュ崟 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Mapper
+public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
new file mode 100644
index 0000000..887fff5
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 宸ュ崟杩愮淮鎯呭喌璁板綍 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Mapper
+public interface WorkOrderYwConditionRecordMapper extends BaseMapper<WorkOrderYwConditionRecord> {
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
new file mode 100644
index 0000000..2260119
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -0,0 +1,19 @@
+package com.ycl.platform.mapper;
+
+import com.ycl.platform.domain.entity.YwPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.vo.YwPointVO;
+import com.ycl.platform.domain.form.YwPointForm;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 杩愮淮鐐逛綅 Mapper 鎺ュ彛
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Mapper
+public interface YwPointMapper extends BaseMapper<YwPoint> {
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java b/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java
new file mode 100644
index 0000000..16f1a18
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/DefaultAuditingService.java
@@ -0,0 +1,65 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.DefaultAuditing;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.DefaultAuditingForm;
+import com.ycl.platform.domain.query.DefaultAuditingQuery;
+import java.util.List;
+
+/**
+ * 杩濊瀹℃牳 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+public interface DefaultAuditingService extends IService<DefaultAuditing> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(DefaultAuditingForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(DefaultAuditingForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(DefaultAuditingQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(String id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DefaultRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/DefaultRuleService.java
new file mode 100644
index 0000000..b6fc9f7
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/DefaultRuleService.java
@@ -0,0 +1,73 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.DefaultRule;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.form.DefaultRuleSetForm;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.DefaultRuleForm;
+import com.ycl.platform.domain.query.DefaultRuleQuery;
+import java.util.List;
+
+/**
+ * 杩濈害瑙勫垯 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+public interface DefaultRuleService extends IService<DefaultRule> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(DefaultRuleForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(DefaultRuleForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(DefaultRuleQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(String id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+
+ /**
+ * 鍚敤/鍋滅敤
+ * @param form
+ * @return
+ */
+ Result set(DefaultRuleSetForm form);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderAuditingRecordService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderAuditingRecordService.java
new file mode 100644
index 0000000..7363ecd
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderAuditingRecordService.java
@@ -0,0 +1,51 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.query.WorkOrderAuditingRecordQuery;
+import java.util.List;
+
+/**
+ * 宸ュ崟瀹℃牳璁板綍 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+public interface WorkOrderAuditingRecordService extends IService<WorkOrderAuditingRecord> {
+
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(WorkOrderAuditingRecordQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(String id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
new file mode 100644
index 0000000..def92e3
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -0,0 +1,93 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.WorkOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.form.*;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.query.WorkOrderQuery;
+import java.util.List;
+
+/**
+ * 宸ュ崟 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+public interface WorkOrderService extends IService<WorkOrder> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(WorkOrderForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(WorkOrderForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(WorkOrderQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(String id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+
+ /**
+ * 宸ュ崟瀹℃牳
+ * @param form
+ * @return
+ */
+ Result auditing(WorkOrderAuditingForm form);
+
+ /**
+ * 杩愮淮鎯呭喌
+ * @param form
+ * @return
+ */
+ Result ywCondition(WorkOrderYWConditionForm form);
+
+ /**
+ * 杩愮淮缁撴灉
+ * @param form
+ * @return
+ */
+ Result ywResult(WorkOrderYWResultForm form);
+
+ /**
+ * 妫�娴嬬粨鏋�
+ * @param form
+ * @return
+ */
+ Result checkResult(WorkOrderCheckResultForm form);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderYwConditionRecordService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderYwConditionRecordService.java
new file mode 100644
index 0000000..00d49b7
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderYwConditionRecordService.java
@@ -0,0 +1,50 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.query.WorkOrderYwConditionRecordQuery;
+import java.util.List;
+
+/**
+ * 宸ュ崟杩愮淮鎯呭喌璁板綍 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+public interface WorkOrderYwConditionRecordService extends IService<WorkOrderYwConditionRecord> {
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(WorkOrderYwConditionRecordQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(String id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
new file mode 100644
index 0000000..fec069e
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -0,0 +1,72 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.entity.YwPoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.system.Result;
+import com.ycl.platform.domain.form.YwPointForm;
+import com.ycl.platform.domain.query.YwPointQuery;
+import java.util.List;
+
+/**
+ * 杩愮淮鐐逛綅 鏈嶅姟绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+public interface YwPointService extends IService<YwPoint> {
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ Result add(YwPointForm form);
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ Result update(YwPointForm form);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ Result remove(List<String> ids);
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ Result removeById(String id);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ Result page(YwPointQuery query);
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ Result detail(String id);
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ Result all();
+
+ /**
+ * 鎵归噺娣诲姞
+ * @param form
+ * @return
+ */
+ Result batchAdd(List<YwPointForm> form);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java
new file mode 100644
index 0000000..0e4dda4
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultAuditingServiceImpl.java
@@ -0,0 +1,145 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.DefaultAuditing;
+import com.ycl.platform.mapper.DefaultAuditingMapper;
+import com.ycl.platform.service.DefaultAuditingService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.form.DefaultAuditingForm;
+import com.ycl.platform.domain.vo.DefaultAuditingVO;
+import com.ycl.platform.domain.query.DefaultAuditingQuery;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 杩濊瀹℃牳 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Service
+@RequiredArgsConstructor
+public class DefaultAuditingServiceImpl extends ServiceImpl<DefaultAuditingMapper, DefaultAuditing> implements DefaultAuditingService {
+
+ private final DefaultAuditingMapper defaultAuditingMapper;
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(DefaultAuditingForm form) {
+ DefaultAuditing entity = DefaultAuditingForm.getEntityByForm(form, null);
+ if(baseMapper.insert(entity) > 0) {
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(DefaultAuditingForm form) {
+
+ DefaultAuditing entity = baseMapper.selectById(form.getId());
+
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ if (baseMapper.updateById(entity) > 0) {
+ return Result.ok("淇敼鎴愬姛");
+ }
+ return Result.error("淇敼澶辫触");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ if(baseMapper.deleteBatchIds(ids) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ if(baseMapper.deleteById(id) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(DefaultAuditingQuery query) {
+
+ IPage<DefaultAuditing> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .orderByDesc(DefaultAuditing::getCreateTime)
+ .page(PageUtil.getPage(query, DefaultAuditing.class));
+
+ List<DefaultAuditingVO> vos = page.getRecords().stream()
+ .map(
+ entity -> DefaultAuditingVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+
+ DefaultAuditing entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ DefaultAuditingVO vo = DefaultAuditingVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<DefaultAuditing> entities = baseMapper.selectList(null);
+ List<DefaultAuditingVO> vos = entities.stream()
+ .map(
+ entity -> DefaultAuditingVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java
new file mode 100644
index 0000000..3b297fc
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DefaultRuleServiceImpl.java
@@ -0,0 +1,180 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.exception.ServiceException;
+import com.ycl.platform.domain.entity.DefaultRule;
+import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.form.DefaultRuleSetForm;
+import com.ycl.platform.mapper.DefaultRuleMapper;
+import com.ycl.platform.service.DefaultRuleService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.form.DefaultRuleForm;
+import com.ycl.platform.domain.vo.DefaultRuleVO;
+import com.ycl.platform.domain.query.DefaultRuleQuery;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import com.ycl.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * 杩濈害瑙勫垯 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Service
+@RequiredArgsConstructor
+public class DefaultRuleServiceImpl extends ServiceImpl<DefaultRuleMapper, DefaultRule> implements DefaultRuleService {
+
+ private final DefaultRuleMapper defaultRuleMapper;
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(DefaultRuleForm form) {
+ DefaultRule entity = DefaultRuleForm.getEntityByForm(form, null);
+ entity.setRuleStatus("鏈惎鐢�");
+ if(baseMapper.insert(entity) > 0) {
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(DefaultRuleForm form) {
+
+ DefaultRule entity = baseMapper.selectById(form.getId());
+
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ if (baseMapper.updateById(entity) > 0) {
+ return Result.ok("淇敼鎴愬姛");
+ }
+ return Result.error("淇敼澶辫触");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ if(baseMapper.deleteBatchIds(ids) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ if(baseMapper.deleteById(id) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(DefaultRuleQuery query) {
+
+ IPage<DefaultRule> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .like(StringUtils.hasText(query.getRuleName()), DefaultRule::getRuleName, query.getRuleName())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
+ DefaultRule::getCreateTime,
+ DateUtils.getDayStart(query.getStart()),
+ DateUtils.getDayEnd(query.getEnd()))
+ .orderByDesc(DefaultRule::getCreateTime)
+ .page(PageUtil.getPage(query, DefaultRule.class));
+
+ List<DefaultRuleVO> vos = page.getRecords().stream()
+ .map(
+ entity -> DefaultRuleVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+
+ DefaultRule entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ DefaultRuleVO vo = DefaultRuleVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<DefaultRule> entities = baseMapper.selectList(null);
+ List<DefaultRuleVO> vos = entities.stream()
+ .map(
+ entity -> DefaultRuleVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+
+ @Override
+ public Result set(DefaultRuleSetForm form) {
+ DefaultRule defaultRule = baseMapper.selectById(form.getId());
+ if (Objects.isNull(defaultRule)) {
+ throw new ServiceException("杩濈害瑙勫垯涓嶅瓨鍦�");
+ }
+ if (form.getFlag()) {
+ // 鍚敤涔嬪墠妫�鏌ユ槸鍚﹀凡缁忔湁鍚敤鐨勮鍒欎簡锛屼繚鎸佷竴涓紑鍚�
+ List<DefaultRule> useList = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(DefaultRule::getRuleStatus, "鍚敤")
+ .list();
+ if (! CollectionUtils.isEmpty(useList)) {
+ throw new ServiceException("宸茬粡鏈夎鍒欒鍚敤浜嗭紝鍙兘鍚屾椂鍚敤涓�涓鍒�");
+ }
+ defaultRule.setRuleStatus("鍚敤");
+ } else {
+ defaultRule.setRuleStatus("鏈惎鐢�");
+ }
+ baseMapper.updateById(defaultRule);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderAuditingRecordServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderAuditingRecordServiceImpl.java
new file mode 100644
index 0000000..051675c
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderAuditingRecordServiceImpl.java
@@ -0,0 +1,110 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
+import com.ycl.platform.mapper.WorkOrderAuditingRecordMapper;
+import com.ycl.platform.service.WorkOrderAuditingRecordService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.vo.WorkOrderAuditingRecordVO;
+import com.ycl.platform.domain.query.WorkOrderAuditingRecordQuery;
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 宸ュ崟瀹℃牳璁板綍 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Service
+@RequiredArgsConstructor
+public class WorkOrderAuditingRecordServiceImpl extends ServiceImpl<WorkOrderAuditingRecordMapper, WorkOrderAuditingRecord> implements WorkOrderAuditingRecordService {
+
+ private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
+
+
+
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ if(baseMapper.deleteBatchIds(ids) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ if(baseMapper.deleteById(id) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(WorkOrderAuditingRecordQuery query) {
+
+ IPage<WorkOrderAuditingRecord> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .orderByDesc(WorkOrderAuditingRecord::getCreateTime)
+ .page(PageUtil.getPage(query, WorkOrderAuditingRecord.class));
+
+ List<WorkOrderAuditingRecordVO> vos = page.getRecords().stream()
+ .map(
+ entity -> WorkOrderAuditingRecordVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+
+ WorkOrderAuditingRecord entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ WorkOrderAuditingRecordVO vo = WorkOrderAuditingRecordVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<WorkOrderAuditingRecord> entities = baseMapper.selectList(null);
+ List<WorkOrderAuditingRecordVO> vos = entities.stream()
+ .map(
+ entity -> WorkOrderAuditingRecordVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
new file mode 100644
index 0000000..607e09a
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -0,0 +1,222 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.exception.ServiceException;
+import com.ycl.platform.domain.entity.*;
+import com.ycl.platform.domain.form.*;
+import com.ycl.platform.mapper.*;
+import com.ycl.platform.service.WorkOrderService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.vo.WorkOrderVO;
+import com.ycl.platform.domain.query.WorkOrderQuery;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import com.ycl.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
+
+/**
+ * 宸ュ崟 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Service
+@RequiredArgsConstructor
+public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
+
+ private final WorkOrderMapper workOrderMapper;
+ private final YwUnitMapper ywUnitMapper;
+ private final YwPeopleMapper ywPeopleMapper;
+ private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
+ private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
+
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(WorkOrderForm form) {
+ WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
+ if(baseMapper.insert(entity) > 0) {
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(WorkOrderForm form) {
+
+ WorkOrder entity = baseMapper.selectById(form.getId());
+
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ if (baseMapper.updateById(entity) > 0) {
+ return Result.ok("淇敼鎴愬姛");
+ }
+ return Result.error("淇敼澶辫触");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result auditing(WorkOrderAuditingForm form) {
+ WorkOrder workOrder = baseMapper.selectById(form.getId());
+ if (Objects.isNull(workOrder)) {
+ throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
+ }
+ // 宸ュ崟鐘舵��
+ if ("pass".equals(form.getAuditingResult())) {
+ workOrder.setStatus("finish");
+ } else {
+ workOrder.setStatus("auditing");
+ }
+ baseMapper.updateById(workOrder);
+ // 娣诲姞涓�鏉″鏍歌褰�
+ WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
+ workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
+ workOrderAuditingRecord.setAuditingUser(1);
+ workOrderAuditingRecord.setResult(form.getAuditingResult());
+ workOrderAuditingRecord.setRemark(form.getAuditingRemark());
+ workOrderAuditingRecordMapper.insert(workOrderAuditingRecord);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result ywCondition(WorkOrderYWConditionForm form) {
+ WorkOrder workOrder = baseMapper.selectById(form.getId());
+ if (Objects.isNull(workOrder)) {
+ throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
+ }
+ // 宸ュ崟鐘舵��
+ workOrder.setStatus("commit-condition");
+ baseMapper.updateById(workOrder);
+ // 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
+ WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
+ workOrderYwConditionRecord.setWorkOrderId(workOrder.getId());
+ workOrderYwConditionRecord.setCommitUser(1);
+ workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
+ workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Override
+ public Result ywResult(WorkOrderYWResultForm form) {
+ return null;
+ }
+
+ @Override
+ public Result checkResult(WorkOrderCheckResultForm form) {
+ return null;
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ if(baseMapper.deleteBatchIds(ids) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ if(baseMapper.deleteById(id) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(WorkOrderQuery query) {
+ IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getWorkOrderNo()), WorkOrder::getWorkOrderNo, query.getWorkOrderNo())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
+ WorkOrder::getYwHandleTime,
+ DateUtils.getDayStart(query.getStart()),
+ DateUtils.getDayEnd(query.getEnd()))
+ .orderByDesc(WorkOrder::getCreateTime)
+ .page(PageUtil.getPage(query, WorkOrder.class));
+
+ List<WorkOrderVO> vos = page.getRecords().stream()
+ .map(
+ entity -> {
+ WorkOrderVO vo = WorkOrderVO.getVoByEntity(entity, null);
+ YwUnit unit = ywUnitMapper.selectById(vo.getUnitId());
+ if (Objects.nonNull(unit)) {
+ vo.setUnitName(unit.getUnitName());
+ }
+ YwPeople ywPeople = ywPeopleMapper.selectById(vo.getYwPeopleId());
+ if (Objects.nonNull(ywPeople)) {
+ vo.setYwPeopleName(ywPeople.getYwPersonName());
+ }
+ return vo;
+ }
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+
+ WorkOrder entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ WorkOrderVO vo = WorkOrderVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<WorkOrder> entities = baseMapper.selectList(null);
+ List<WorkOrderVO> vos = entities.stream()
+ .map(
+ entity -> WorkOrderVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderYwConditionRecordServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderYwConditionRecordServiceImpl.java
new file mode 100644
index 0000000..4e64a13
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderYwConditionRecordServiceImpl.java
@@ -0,0 +1,105 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.WorkOrderYwConditionRecord;
+import com.ycl.platform.mapper.WorkOrderYwConditionRecordMapper;
+import com.ycl.platform.service.WorkOrderYwConditionRecordService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
+import com.ycl.platform.domain.query.WorkOrderYwConditionRecordQuery;
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 宸ュ崟杩愮淮鎯呭喌璁板綍 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-03-06
+ */
+@Service
+@RequiredArgsConstructor
+public class WorkOrderYwConditionRecordServiceImpl extends ServiceImpl<WorkOrderYwConditionRecordMapper, WorkOrderYwConditionRecord> implements WorkOrderYwConditionRecordService {
+
+ private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ if(baseMapper.deleteBatchIds(ids) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ if(baseMapper.deleteById(id) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(WorkOrderYwConditionRecordQuery query) {
+
+ IPage<WorkOrderYwConditionRecord> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .orderByDesc(WorkOrderYwConditionRecord::getCreateTime)
+ .page(PageUtil.getPage(query, WorkOrderYwConditionRecord.class));
+
+ List<WorkOrderYwConditionRecordVO> vos = page.getRecords().stream()
+ .map(
+ entity -> WorkOrderYwConditionRecordVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+
+ WorkOrderYwConditionRecord entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ WorkOrderYwConditionRecordVO vo = WorkOrderYwConditionRecordVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<WorkOrderYwConditionRecord> entities = baseMapper.selectList(null);
+ List<WorkOrderYwConditionRecordVO> vos = entities.stream()
+ .map(
+ entity -> WorkOrderYwConditionRecordVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index 576185f..485bc30 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -1,7 +1,9 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.YwPeople;
+import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.YwPeopleMapper;
+import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPeopleService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,10 +18,12 @@
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
+import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
/**
* 杩愮淮浜哄憳 鏈嶅姟瀹炵幇绫�
@@ -32,6 +36,7 @@
public class YwPeopleServiceImpl extends ServiceImpl<YwPeopleMapper, YwPeople> implements YwPeopleService {
private final YwPeopleMapper ywPeopleMapper;
+ private final YwUnitMapper ywUnitMapper;
/**
* 娣诲姞
@@ -41,6 +46,7 @@
@Override
public Result add(YwPeopleForm form) {
YwPeople entity = YwPeopleForm.getEntityByForm(form, null);
+ entity.setAddWay("manual");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -101,12 +107,25 @@
public Result page(YwPeopleQuery query) {
IPage<YwPeople> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getYwPersonCode()), YwPeople::getYwPersonCode, query.getYwPersonCode())
+ .like(StringUtils.hasText(query.getYwPersonName()), YwPeople::getYwPersonName, query.getYwPersonName())
+ .eq(Objects.nonNull(query.getBelongUnit()), YwPeople::getBelongUnit, query.getBelongUnit())
.orderByDesc(YwPeople::getCreateTime)
.page(PageUtil.getPage(query, YwPeople.class));
List<YwPeopleVO> vos = page.getRecords().stream()
.map(
- entity -> YwPeopleVO.getVoByEntity(entity, null)
+ entity -> {
+ YwPeopleVO vo = YwPeopleVO.getVoByEntity(entity, null);
+ YwUnit unit = new LambdaQueryChainWrapper<>(ywUnitMapper)
+ .eq(YwUnit::getId, vo.getBelongUnit())
+ .select(YwUnit::getUnitName)
+ .one();
+ if (Objects.nonNull(unit)) {
+ vo.setBelongUnitName(unit.getUnitName());
+ }
+ return vo;
+ }
)
.collect(Collectors.toList());
return Result.ok().data(vos).total(page.getTotal());
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
new file mode 100644
index 0000000..1941582
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -0,0 +1,157 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.mapper.YwPointMapper;
+import com.ycl.platform.service.YwPointService;
+import com.ycl.system.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.form.YwPointForm;
+import com.ycl.platform.domain.vo.YwPointVO;
+import com.ycl.platform.domain.query.YwPointQuery;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.system.page.PageUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 杩愮淮鐐逛綅 鏈嶅姟瀹炵幇绫�
+ *
+ * @author xp
+ * @since 2024-03-05
+ */
+@Service
+@RequiredArgsConstructor
+public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
+
+ private final YwPointMapper ywPointMapper;
+
+ /**
+ * 娣诲姞
+ * @param form
+ * @return
+ */
+ @Override
+ public Result add(YwPointForm form) {
+ YwPoint entity = YwPointForm.getEntityByForm(form, null);
+ if(baseMapper.insert(entity) > 0) {
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result batchAdd(List<YwPointForm> formList) {
+ formList.stream()
+ .forEach(form -> {
+ YwPoint entity = YwPointForm.getEntityByForm(form, null);
+ entity.setStatus("鏈紑濮�");
+ baseMapper.insert(entity);
+ });
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+
+ /**
+ * 淇敼
+ * @param form
+ * @return
+ */
+ @Override
+ public Result update(YwPointForm form) {
+
+ YwPoint entity = baseMapper.selectById(form.getId());
+
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ BeanUtils.copyProperties(form, entity);
+ if (baseMapper.updateById(entity) > 0) {
+ return Result.ok("淇敼鎴愬姛");
+ }
+ return Result.error("淇敼澶辫触");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public Result remove(List<String> ids) {
+ if(baseMapper.deleteBatchIds(ids) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * id鍒犻櫎
+ * @param id
+ * @return
+ */
+ @Override
+ public Result removeById(String id) {
+ if(baseMapper.deleteById(id) > 0) {
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+ return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param query
+ * @return
+ */
+ @Override
+ public Result page(YwPointQuery query) {
+
+ IPage<YwPoint> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .orderByDesc(YwPoint::getCreateTime)
+ .page(PageUtil.getPage(query, YwPoint.class));
+
+ List<YwPointVO> vos = page.getRecords().stream()
+ .map(
+ entity -> YwPointVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ /**
+ * 鏍规嵁id鏌ユ壘
+ * @param id
+ * @return
+ */
+ @Override
+ public Result detail(String id) {
+
+ YwPoint entity = baseMapper.selectById(id);
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
+ return Result.ok().data(vo);
+ }
+
+ /**
+ * 鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all() {
+ List<YwPoint> entities = baseMapper.selectList(null);
+ List<YwPointVO> vos = entities.stream()
+ .map(
+ entity -> YwPointVO.getVoByEntity(entity, null)
+ )
+ .collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index ac43dd6..0e50ba3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -1,8 +1,11 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
import java.util.List;
+import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.YwUnitForm;
import com.ycl.platform.domain.query.YwUnitQuery;
@@ -12,12 +15,16 @@
import com.ycl.system.page.PageUtil;
import com.ycl.platform.service.YwUnitService;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.utils.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
+
+import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
/**
* 杩愮淮鍗曚綅 鏈嶅姟瀹炵幇绫�
@@ -38,6 +45,7 @@
*/
@Override
public Result add(YwUnitForm form) {
+ // todo 澧炲姞瀵瑰簲璐﹀彿
YwUnit entity = YwUnitForm.getEntityByForm(form, null);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
@@ -52,7 +60,7 @@
*/
@Override
public Result update(YwUnitForm form) {
-
+ // todo 淇敼瀵瑰簲璐﹀彿
YwUnit entity = baseMapper.selectById(form.getId());
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
@@ -97,8 +105,14 @@
*/
@Override
public Result page(YwUnitQuery query) {
-
+ // 鍒嗛〉鏉′欢鏌ヨ浣�
IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getUnitCode()), YwUnit::getUnitCode, query.getUnitCode())
+ .like(StringUtils.hasText(query.getUnitName()), YwUnit::getUnitName, query.getUnitName())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
+ YwUnit::getCreateTime,
+ DateUtils.getDayStart(query.getStart()),
+ DateUtils.getDayEnd(query.getEnd()))
.orderByDesc(YwUnit::getCreateTime)
.page(PageUtil.getPage(query, YwUnit.class));
@@ -131,9 +145,15 @@
@Override
public Result all() {
List<YwUnit> entities = baseMapper.selectList(null);
- List<YwUnitVO> vos = entities.stream()
+
+ List<BaseSelect> vos = entities.stream()
.map(
- entity -> YwUnitVO.getVoByEntity(entity, null)
+ entity -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(entity.getId());
+ baseSelect.setValue(entity.getUnitName());
+ return baseSelect;
+ }
)
.collect(Collectors.toList());
return Result.ok().data(vos);
diff --git a/ycl-server/src/main/java/com/ycl/utils/DateUtils.java b/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
index 8c4baf0..4ab7585 100644
--- a/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
@@ -2,15 +2,18 @@
import org.apache.commons.lang3.time.DateFormatUtils;
+import javax.annotation.Nullable;
import java.lang.management.ManagementFactory;
+import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.util.Date;
+import java.util.Objects;
/**
* 鏃堕棿宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
@@ -26,13 +29,13 @@
public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
private static String[] parsePatterns = {
- "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+ "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
/**
* 鑾峰彇褰撳墠Date鍨嬫棩鏈�
- *
+ *
* @return Date() 褰撳墠鏃ユ湡
*/
public static Date getNowDate()
@@ -42,7 +45,7 @@
/**
* 鑾峰彇褰撳墠鏃ユ湡, 榛樿鏍煎紡涓簓yyy-MM-dd
- *
+ *
* @return String
*/
public static String getDate()
@@ -185,4 +188,35 @@
ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
return Date.from(zdt.toInstant());
}
+
+
+ /**
+ * 鑾峰彇鏌愬ぉ鐨勫紑濮嬫椂闂�
+ *
+ * @param date
+ * @return 2023-01-01 00:00:00
+ */
+ public static Date getDayStart(@Nullable Date date) {
+ if (Objects.isNull(date)) {
+ date = new Date();
+ }
+ LocalDateTime localDateTime = LocalDateTime.ofInstant(date.toInstant(), ZoneId.of("GMT+8"));
+ LocalDateTime of = LocalDateTime.of(localDateTime.getYear(), localDateTime.getMonth(), localDateTime.getDayOfMonth(), 0, 0, 0);
+ return Timestamp.valueOf(of);
+ }
+
+ /**
+ * 鑾峰彇鏌愬ぉ鐨勭粨鏉熸椂闂�
+ *
+ * @param date
+ * @return 2023-01-01 23:59:59
+ */
+ public static Date getDayEnd(@Nullable Date date) {
+ if (Objects.isNull(date)) {
+ date = new Date();
+ }
+ LocalDateTime localDateTime = LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
+ LocalDateTime of = LocalDateTime.of(localDateTime.getYear(), localDateTime.getMonth(), localDateTime.getDayOfMonth(), 23, 59, 59);
+ return Timestamp.valueOf(of);
+ }
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
new file mode 100644
index 0000000..bf1ba09
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
@@ -0,0 +1,16 @@
+<?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.ycl.platform.mapper.DefaultAuditingMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultAuditingVO">
+ <result column="id" property="id" />
+ <result column="create_time" property="createTime" />
+ <result column="default_id" property="defaultId" />
+ <result column="auditing_status" property="auditingStatus" />
+ <result column="remark" property="remark" />
+ <result column="auditing_time" property="auditingTime" />
+ <result column="auditing_user" property="auditingUser" />
+ </resultMap>
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml
new file mode 100644
index 0000000..afff39f
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultRuleMapper.xml
@@ -0,0 +1,15 @@
+<?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.ycl.platform.mapper.DefaultRuleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultRuleVO">
+ <result column="id" property="id" />
+ <result column="create_time" property="createTime" />
+ <result column="rule_name" property="ruleName" />
+ <result column="rule_detail" property="ruleDetail" />
+ <result column="rule_desc" property="ruleDesc" />
+ <result column="rule_status" property="ruleStatus" />
+ </resultMap>
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
new file mode 100644
index 0000000..2c73866
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -0,0 +1,18 @@
+<?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.ycl.platform.mapper.WorkOrderMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.WorkOrderVO">
+ <result column="id" property="id" />
+ <result column="create_time" property="createTime" />
+ <result column="work_order_no" property="workOrderNo" />
+ <result column="unit_id" property="unitId" />
+ <result column="yw_people_id" property="ywPeopleId" />
+ <result column="yw_handle_time" property="ywHandleTime" />
+ <result column="yw_result" property="ywResult" />
+ <result column="yw_condition" property="ywCondition" />
+ <result column="yw_check_result" property="ywCheckResult" />
+ </resultMap>
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPeopleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPeopleMapper.xml
new file mode 100644
index 0000000..018ead6
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPeopleMapper.xml
@@ -0,0 +1,16 @@
+<?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.ycl.platform.mapper.YwPeopleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="YwPeopleVO">
+ <result column="id" property="id" />
+ <result column="yw_person_code" property="ywPersonCode" />
+ <result column="yw_person_name" property="ywPersonName" />
+ <result column="yw_person_account" property="ywPersonAccount" />
+ <result column="belong_unit" property="belongUnit" />
+ <result column="add_way" property="addWay" />
+ <result column="phone" property="phone" />
+ </resultMap>
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
new file mode 100644
index 0000000..c77e645
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -0,0 +1,16 @@
+<?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.ycl.platform.mapper.YwPointMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.YwPointVO">
+ <result column="id" property="id" />
+ <result column="point_name" property="pointName" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="unit_id" property="unitId" />
+ <result column="status" property="status" />
+ <result column="remark" property="remark" />
+ </resultMap>
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
index 6af2bf0..5c7434a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.YwUnitMapper">
- <resultMap type="YwUnit" id="YwUnitResult">
+ <resultMap type="YwUnitVo" id="YwUnitResult">
<result property="id" column="id" />
<result property="unitCode" column="unit_code" />
<result property="unitName" column="unit_name" />
@@ -13,8 +13,6 @@
<result property="unitAdminAccount" column="unit_admin_account" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
- <result property="updateTime" column="update_time" />
- <result property="deleted" column="deleted" />
</resultMap>
<sql id="selectYwUnitVo">
--
Gitblit v1.8.0