Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/entity/TBDingApply.java

@@ -33,9 +33,18 @@ public class TBDingApply implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty(value = "sop编号")
+    @NotNull(message = "sop号不能为空")
+    @NotBlank(message = "sop号不能为空")
+    private String sopNo;
+
+    @ApiModelProperty(value = "派单号")
+    @NotNull(message = "crm派单号不能为空")
+    @NotBlank(message = "crm派单号不能为空")
+    private String crmNo;
+
     @ApiModelProperty(value = "考勤id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "考勤id不能为空")
     private Long dingId;
 
     @ApiModelProperty(value = "类型，IN：签到，OUT：签退")
@@ -91,6 +100,22 @@ public class TBDingApply implements Serializable {
         this.attachmentIds = StringUtils.join(attachmentIdList, SystemConstant.LIST_JOIN_SPLIT);
     }
 
+    public String getSopNo() {
+        return sopNo;
+    }
+
+    public void setSopNo(String sopNo) {
+        this.sopNo = sopNo;
+    }
+
+    public String getCrmNo() {
+        return crmNo;
+    }
+
+    public void setCrmNo(String crmNo) {
+        this.crmNo = crmNo;
+    }
+
     public DingExceptionApproveEnum getApprove() {
         return approve;
     }

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -311,3 +311,8 @@ INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, re
 -- 2023-09-22
 INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2050', '考勤提交-同意撤回', '/api/admin/tb/ding/submit/agree_withdraw', 'URL', '28', '7', 'AUTH', '1', '1', '0');
 UPDATE sys_privilege SET related = '2050' WHERE (id = '152');
+
+-- 2023-09-25
+ALTER TABLE t_b_ding_apply
+    ADD COLUMN sop_no VARCHAR(100) NOT NULL COMMENT 'sop编号' AFTER id,
+    ADD COLUMN crm_no VARCHAR(100) NOT NULL COMMENT '派单编号' AFTER sop_no;