shuzhan hace 1 año
padre
commit
16994afbd2

+ 2 - 0
src/main/java/com/jpsoft/ipcps/controller/MonthPlanController.java

@@ -431,6 +431,8 @@ public class MonthPlanController {
                 if(isZNBM){
                     searchParms2.put("isZNBM",roleIdEx);
                 }
+
+                searchParms2.put("notStatus","8");
                 Page<Project> page2 = projectService.pageSearch2(searchParms2,1,1000,sortList);
                 int t0 = 0;
                 int t1 = 0;

+ 5 - 1
src/main/java/com/jpsoft/ipcps/entity/Project.java

@@ -386,7 +386,11 @@ public class Project {
 		//ProjectCompletedAndPutIntoOperation 项目建成投产
 		if("ProjectPerformanceTransfer".equals(procDefKey) ||
 				"ProjectStartUpConstruction".equals(procDefKey)){
-			str = "拟建";
+			if("8".equals(this.status)) {
+				str = "停止";
+			}else{
+				str = "拟建";
+			}
 		}else if("ProjectCompletedAndPutIntoOperation".equals(procDefKey)){
 			if("3".equals(this.status)){
 				str = "投产";

+ 3 - 0
src/main/resources/mapper/Project.xml

@@ -462,6 +462,9 @@
 			<if test="searchParams.statusNull != null">
 				and status_ is null
 			</if>
+			<if test="searchParams.notStatus != null">
+				and status_ != #{searchParams.notStatus}
+			</if>
 			<if test="searchParams.ready != null">
 				and (status_ is null or status_ = #{searchParams.ready})
 			</if>