0604 ljc

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerCreateReq.java

@@ -16,11 +16,6 @@ public class TargetManagerCreateReq {
      */
     private String targetName;
 
-    /**
-     * 目标图标
-     */
-    private String targetIcon;
-
     /**
      * 组织ID
      */

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerUpdateReq.java

@@ -21,11 +21,6 @@ public class TargetManagerUpdateReq {
      */
     private String targetName;
 
-    /**
-     * 目标图标
-     */
-    private String targetIcon;
-
     /**
      * 组织ID
      */

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetQueryReq.java

@@ -29,6 +29,11 @@ public class TargetQueryReq extends PageParam {
     @TableField("target_name")
     private String targetName;
 
+    /**
+     * 目标类型
+     */
+    private String targetType;
+
     /**
      * 创建人用户id
      */

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetManagerResp.java

@@ -21,9 +21,9 @@ public class TargetManagerResp{
     private String targetName;
 
     /**
-     * 目标图标
+     * 目标类型
      */
-    private String targetIcon;
+    private String targetType;
 
     /**
      * 组织ID

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetManager.java

@@ -23,9 +23,9 @@ public class TargetManager extends PipBaseElement {
     private String targetName;
 
     /**
-     * 目标图标
+     * 目标类型
      */
-    private String targetIcon;
+    private String targetType;
 
     /**
      * 组织ID

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java

@@ -22,11 +22,6 @@ public class TargetVersion extends PipBaseElement {
      */
     private String targetId;
 
-    /**
-     * 目标类型
-     */
-    private String targetType;
-
     /**
      * 版本号
      */

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java

@@ -143,6 +143,9 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
         if (!ObjectUtils.isEmpty(query.getTargetName())){
             wrapper.like("target_name",query.getTargetName());
         }
+        if (!ObjectUtils.isEmpty(query.getTargetType())){
+            wrapper.like("target_type",query.getTargetType());
+        }
         if (!ObjectUtils.isEmpty(query.getCreator())){
             wrapper.eq("creator",query.getCreator());
         }
@@ -192,6 +195,9 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
         if (!ObjectUtils.isEmpty(query.getTargetName())){
             wrapper.like("target_name",query.getTargetName());
         }
+        if (!ObjectUtils.isEmpty(query.getTargetType())){
+            wrapper.like("target_type",query.getTargetType());
+        }
         if (!ObjectUtils.isEmpty(query.getCreator())){
             wrapper.eq("creator",query.getCreator());
         }