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

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -59,11 +60,11 @@ public class SysCustom extends BaseEntity implements Serializable {
     private Integer peoperDay;
 
     @ApiModelProperty(value = "是否crm同步，0：否，1：是")
-    @NotBlank(message = "是否crm同步不能为空")
+    @NotNull(message = "是否crm同步不能为空")
     private Boolean sync;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    @NotBlank(message = "是否启用不能为空")
+    @NotNull(message = "是否启用不能为空")
     private Boolean enable;
 
     public String getName() {

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 客户角色配置表 模型.
@@ -31,15 +32,15 @@ public class SysCustomRole implements Serializable {
 
   	@ApiModelProperty(value = "客户id")
 	@JsonSerialize(using = ToStringSerializer.class)
-	@NotBlank(message = "客户id不能为空")
+	@NotNull(message = "客户id不能为空")
   	private long customId;
   	@ApiModelProperty(value = "角色id")
 	@JsonSerialize(using = ToStringSerializer.class)
-	@NotBlank(message = "角色id不能为空")
+	@NotNull(message = "角色id不能为空")
   	private long roleId;
   	@ApiModelProperty(value = "配额")
 	@JsonSerialize(using = ToStringSerializer.class)
-	@NotBlank(message = "配额不能为空")
+	@NotNull(message = "配额不能为空")
   	private long quota;
 
 	public Long getId() {

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

@@ -7,6 +7,7 @@ import com.qmth.sop.common.enums.DeviceStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -24,15 +25,15 @@ public class SysDevice extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "名称")
-    @NotNull(message = "名称不能为空")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     @ApiModelProperty(value = "序列号")
-    @NotNull(message = "序列号不能为空")
+    @NotBlank(message = "序列号不能为空")
     private String serialNo;
 
     @ApiModelProperty(value = "品牌")
-    @NotNull(message = "品牌不能为空")
+    @NotBlank(message = "品牌不能为空")
     private String brand;
 
     @ApiModelProperty(value = "购买时间")

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

@@ -6,6 +6,7 @@ import com.qmth.sop.common.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -24,11 +25,11 @@ public class SysDingGroup extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "服务单元id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "服务单元id不能为空")
+    @NotBlank(message = "服务单元id不能为空")
     private Long serviceId;
 
     @ApiModelProperty(value = "名称")
-    @NotNull(message = "名称不能为空")
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     @ApiModelProperty(value = "供应商id")
@@ -37,11 +38,11 @@ public class SysDingGroup extends BaseEntity implements Serializable {
     private Long supplierId;
 
     @ApiModelProperty(value = "签到时段")
-    @NotNull(message = "签到时段不能为空")
+    @NotBlank(message = "签到时段不能为空")
     private String signInTime;
 
     @ApiModelProperty(value = "签退时段")
-    @NotNull(message = "签退时段不能为空")
+    @NotBlank(message = "签退时段不能为空")
     private String signOutTime;
 
     @ApiModelProperty(value = "是否开启人脸，0：不开启，1：开启")

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -28,16 +29,16 @@ public class SysDingObj implements Serializable {
 
     @ApiModelProperty(value = "考勤组id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "考勤组id不能为空")
+    @NotNull(message = "考勤组id不能为空")
     private Long dingGroupId;
 
     @ApiModelProperty(value = "角色id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "角色id不能为空")
+    @NotNull(message = "角色id不能为空")
     private Long roleId;
 
     @ApiModelProperty(value = "类型，DING：考勤，APPROVE：审核")
-    @NotBlank(message = "类型不能为空")
+    @NotNull(message = "类型不能为空")
     private DingObjTypeEnum type;
 
     public Long getId() {

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -35,7 +36,7 @@ public class SysLevel implements Serializable {
     private ProductTypeEnum type;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    @NotBlank(message = "是否启用不能为空")
+    @NotNull(message = "是否启用不能为空")
     private Boolean enable;
 
     @ApiModelProperty(value = "创建人id")

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -27,17 +28,17 @@ public class SysLevelRole implements Serializable {
 
     @ApiModelProperty(value = "服务档位id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "服务档位id不能为空")
+    @NotNull(message = "服务档位id不能为空")
     private Long levelId;
 
     @ApiModelProperty(value = "角色id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "角色id不能为空")
+    @NotNull(message = "角色id不能为空")
     private Long roleId;
 
     @ApiModelProperty(value = "配额")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "配额不能为空")
+    @NotNull(message = "配额不能为空")
     private Long quota;
 
     public Long getId() {

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -47,7 +48,7 @@ public class SysNotice extends BaseEntity implements Serializable {
     private NoticeStatusEnum status;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    @NotBlank(message = "是否启用不能为空")
+    @NotNull(message = "是否启用不能为空")
     private Boolean enable;
 
     @ApiModelProperty(value = "发布日期")

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -34,14 +35,14 @@ public class SysSupplier extends BaseEntity implements Serializable {
     private SupplierTypeEnum type;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    @NotBlank(message = "s是否启用不能为空")
+    @NotNull(message = "s是否启用不能为空")
     private Boolean enable;
 
     @ApiModelProperty(value = "备注")
     private String remark;
 
     @ApiModelProperty(value = "是否crm同步，0：否，1：是")
-    @NotBlank(message = "是否crm同步不能为空")
+    @NotNull(message = "是否crm同步不能为空")
     private Boolean sync;
 
     public String getName() {

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -31,7 +32,7 @@ public class TBCrm extends BaseEntity implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "派单时间")
-    @NotBlank(message = "派单时间不能为空")
+    @NotNull(message = "派单时间不能为空")
     private Long beginTime;
 
     @ApiModelProperty(value = "服务单元id")
@@ -40,12 +41,12 @@ public class TBCrm extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "派单人id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "派单人id不能为空")
+    @NotNull(message = "派单人id不能为空")
     private Long crmUserId;
 
     @ApiModelProperty(value = "客户id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "客户id不能为空")
+    @NotNull(message = "客户id不能为空")
     private Long customId;
 
     @ApiModelProperty(value = "考试开始时间")
@@ -56,7 +57,7 @@ public class TBCrm extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "产品id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "产品id不能为空")
+    @NotNull(message = "产品id不能为空")
     private Long productId;
 
     @ApiModelProperty(value = "区域经理id")
@@ -64,11 +65,11 @@ public class TBCrm extends BaseEntity implements Serializable {
     private Long leadId;
 
     @ApiModelProperty(value = "是否crm同步，false：否，true：是")
-    @NotBlank(message = "是否crm同步不能为空")
+    @NotNull(message = "是否crm同步不能为空")
     private Boolean sync;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    @NotBlank(message = "是否启用不能为空")
+    @NotNull(message = "是否启用不能为空")
     private Boolean enable;
 
     public String getCrmNo() {

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -27,7 +28,7 @@ public class TBDelayWarnDetail implements Serializable {
 
     @ApiModelProperty(value = "延期预警id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "延期预警id不能为空")
+    @NotNull(message = "延期预警id不能为空")
     private Long delayWarnId;
 
     @ApiModelProperty(value = "跟进说明")

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -36,7 +37,7 @@ public class TBViolation extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "负责人id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "负责人id不能为空")
+    @NotNull(message = "负责人id不能为空")
     private Long userId;
 
     @ApiModelProperty(value = "类型，CONTENT_ERROR：内容错误虚假，LOGIC_ERROR：逻辑不合理，OTHER：其它")

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -27,11 +28,11 @@ public class TBViolationDetail implements Serializable {
 
     @ApiModelProperty(value = "违规id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotBlank(message = "违规id不能为空")
+    @NotNull(message = "违规id不能为空")
     private Long violationId;
 
     @ApiModelProperty(value = "跟进说明")
-    @NotBlank(message = "跟进说明不能为空")
+    @NotNull(message = "跟进说明不能为空")
     private String remark;
 
     @ApiModelProperty(value = "附件ids")

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBCrmServiceImpl.java

@@ -147,6 +147,8 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
 	@Transactional
 	public Boolean saveTBCrm(TBCrm tBCrm) {
 		try {
+            tBCrm.setSync(false);
+            tBCrm.setEnable(true);
 			SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 			if (Objects.isNull(tBCrm.getId())) {// 新增
 				tBCrm.insertInfo(sysUser.getId());