Browse Source

修改列表参数

anderx 3 years ago
parent
commit
25839c684c

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1342,6 +1342,9 @@
     <if test="projectStatus !=null">
       and bp.cid= #{projectStatus}
     </if>
+    <if test="taskProjectStatus !=null">
+      and a.project_status= #{taskProjectStatus}
+    </if>
     <if test="projectType !=null">
       and bp.type= #{projectType}
     </if>
@@ -1456,6 +1459,9 @@
     <if test="projectStatus !=null">
       and bp.cid= #{projectStatus}
     </if>
+    <if test="taskProjectStatus !=null">
+      and a.project_status= #{taskProjectStatus}
+    </if>
     <if test="projectType !=null">
       and bp.type= #{projectType}
     </if>

+ 9 - 0
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -33,6 +33,15 @@ public class InputProjectStatistics {
 	 */
 	private Integer screen;
 
+	private Integer taskProjectStatus;
+
+	public Integer getTaskProjectStatus() {
+		return taskProjectStatus;
+	}
+
+	public void setTaskProjectStatus(Integer taskProjectStatus) {
+		this.taskProjectStatus = taskProjectStatus;
+	}
 
 	public String getThchId() {
 		return thchId;

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -62,6 +62,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		if(ps.getDeps()!=null)params.put("deps", departmentService.parseArray(ps.getDeps()));
 		if(ps.getThchDeps()!=null)params.put("thchDeps", departmentService.parseArray(ps.getThchDeps()));
 		if(ps.getProjectStatus()!=null)params.put("projectStatus", ps.getProjectStatus());
+		if(ps.getTaskProjectStatus()!=null)params.put("taskProjectStatus", ps.getTaskProjectStatus());
 		if(ps.getProjectType()!=null)params.put("projectType", ps.getProjectType());
 		if(ps.getOrderNo()!=null)params.put("orderNo", ps.getOrderNo());
 		if(ps.getContractNo()!=null)params.put("contractNo", ps.getContractNo());