Sfoglia il codice sorgente

项目编号,通过空格分割,多个查询

lem 3 anni fa
parent
commit
4c00906b14

+ 13 - 2
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/modules/sys/entity/CompletionInformation.java

@@ -4,6 +4,8 @@
 package com.jeeplus.modules.sys.entity;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import javax.validation.constraints.NotNull;
 
@@ -36,7 +38,9 @@ public class CompletionInformation extends DataEntity<CompletionInformation> {
 	private String endCompletionDate;		// 结束 完工日期
 	private String beginRemainingDate;		// 开始 剩余日期
 	private String endRemainingDate;		// 结束 剩余日期
-	
+	//记录查询项目定义号数组
+	private List<String> attrs;
+
 	public CompletionInformation() {
 		super();
 	}
@@ -208,5 +212,12 @@ public class CompletionInformation extends DataEntity<CompletionInformation> {
 	public void setEndRemainingDate(String endRemainingDate) {
 		this.endRemainingDate = endRemainingDate;
 	}
-		
+
+	public List<String> getAttrs() {
+		return attrs;
+	}
+
+	public void setAttrs(List<String> attrs) {
+		this.attrs = attrs;
+	}
 }

+ 6 - 7
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/modules/sys/mapper/xml/CompletionInformationMapper.xml

@@ -53,16 +53,15 @@
 		<where>
 			a.del_flag = '0'
 			${dataScope}
+			<if test="attrs != null and attrs.size()>0 ">
+				and a.itemCode in
+				<foreach collection="attrs" item="item" index="index" open="(" separator="," close=")">
+					${item}
+				</foreach>
+			</if>
 			<if test="projectYear != null and projectYear != '' ">
 				AND a.projectYear = #{projectYear}
 			</if>
-			<if test="itemCode != null and itemCode != ''">
-				AND a.itemcode LIKE
-				    <if test="_databaseId == 'postgre'">'%'||#{itemCode}||'%'</if>
-					<if test="_databaseId == 'oracle'">'%'||#{itemCode}||'%'</if>
-					<if test="_databaseId == 'mssql'">'%'+#{itemCode}+'%'</if>
-					<if test="_databaseId == 'mysql'">concat('%',#{itemCode},'%')</if>
-			</if>
 			<if test="projectType != null and projectType != ''">
 				AND a.projecttype LIKE
 				    <if test="_databaseId == 'postgre'">'%'||#{projectType}||'%'</if>

+ 11 - 0
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/modules/sys/web/CompletionInformationController.java

@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
+import javax.validation.constraints.NotNull;
 
 import com.jeeplus.modules.sys.entity.CompletionInformationExport;
 import org.apache.shiro.authz.annotation.Logical;
@@ -66,6 +67,16 @@ public class CompletionInformationController extends BaseController {
     @RequiresPermissions("sys:completionInformation:list")
     @GetMapping("list")
     public AjaxJson list(CompletionInformation completionInformation, HttpServletRequest request, HttpServletResponse response) {
+        String itemCode = completionInformation.getItemCode();
+        List<String> attrs = new ArrayList<>();
+        if (StringUtils.isNotBlank(itemCode)) {
+            String[] strArr = itemCode.split("\\s+");
+            for (String a :
+                    strArr) {
+                attrs.add(a);
+            }
+            completionInformation.setAttrs(attrs);
+        }
         Page<CompletionInformation> page = completionInformationService.findPage(new Page<CompletionInformation>(request, response), completionInformation);
         return AjaxJson.success().put("page", page);
     }