增加状态
This commit is contained in:
parent
b824368435
commit
15167e0adc
|
|
@ -478,7 +478,11 @@ public class PlantuserApi {
|
||||||
if (!("").equals(documentsStatus) && documentsStatus != null) {
|
if (!("").equals(documentsStatus) && documentsStatus != null) {
|
||||||
params.put("documentsStatus", documentsStatus);
|
params.put("documentsStatus", documentsStatus);
|
||||||
}
|
}
|
||||||
params.put("status", status);
|
if (StringUtil.isNotEmpty(status) && status.contains(",")) {
|
||||||
|
params.put("statusArr", status);
|
||||||
|
} else {
|
||||||
|
params.put("status", status);
|
||||||
|
}
|
||||||
params.put("keyWords", keyWords);
|
params.put("keyWords", keyWords);
|
||||||
params.put("plantNo", plantNo);
|
params.put("plantNo", plantNo);
|
||||||
params.put("plantName", plantName);
|
params.put("plantName", plantName);
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,13 @@
|
||||||
<if test="status !=null and status !=''">
|
<if test="status !=null and status !=''">
|
||||||
and a.status = #{status}
|
and a.status = #{status}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="statusArr !=null and statusArr !=''">
|
||||||
|
and a.status in
|
||||||
|
<foreach collection="statusArr" item="item" open="(" close=")"
|
||||||
|
separator=",">
|
||||||
|
#{item}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
<if test="phone !=null and phone !=''">
|
<if test="phone !=null and phone !=''">
|
||||||
and a.phone = #{phone}
|
and a.phone = #{phone}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||||
<component name="FacetManager">
|
|
||||||
<facet type="web" name="Web">
|
|
||||||
<configuration>
|
|
||||||
<webroots>
|
|
||||||
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
|
|
||||||
</webroots>
|
|
||||||
<sourceRoots>
|
|
||||||
<root url="file://$MODULE_DIR$/src/main/java" />
|
|
||||||
<root url="file://$MODULE_DIR$/src/main/resources" />
|
|
||||||
</sourceRoots>
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
<facet type="Spring" name="Spring">
|
|
||||||
<configuration />
|
|
||||||
</facet>
|
|
||||||
</component>
|
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||||
<output url="file://$MODULE_DIR$/target/classes" />
|
<output url="file://$MODULE_DIR$/target/classes" />
|
||||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
|
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue