市政工程新增名称字段和工程分类

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringIndustry.java

@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 工业工程|市政工程对象 z_engineering_industry
  *
@@ -71,6 +75,17 @@ public class ZEngineeringIndustry extends BaseEntity {
      */
     private String type;
     /**
+     * 工程名称
+     */
+    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    @NotBlank(message = "工程分类不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginClassification;
+    /**
      * 乐观锁
      */
     @Version
@@ -85,4 +100,6 @@ public class ZEngineeringIndustry extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+
+
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringIndustryBo.java

@@ -86,6 +86,20 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     private String supervisionPhone;
 
     /**
+     * 工程名称
+     */
+    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    @NotBlank(message = "工程分类不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginClassification;
+
+
+
+    /**
      * 类型(工业工程|市政工程)
      */
     @NotBlank(message = "类型(工业工程|市政工程)不能为空", groups = { AddGroup.class, EditGroup.class })

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -89,6 +89,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
         lqw.like(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
         lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());