Просмотр исходного кода

新增公出详情查看审核和完成的数据

anderx 1 год назад
Родитель
Сommit
b7f337dda8

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

@@ -593,6 +593,9 @@
         <if test="status != null">
             and b.status = #{status}
         </if>
+        <if test="statusType == 1">
+            and b.status in (1,2)
+        </if>
         <if test="clockIn !=null">
             and a.clock_in= #{clockIn}
         </if>
@@ -640,6 +643,9 @@
         <if test="status != null">
             and b.status = #{status}
         </if>
+        <if test="statusType == 1">
+            and b.status in (1,2)
+        </if>
         <if test="clockIn !=null">
             and a.clock_in= #{clockIn}
         </if>

+ 14 - 0
src/main/java/com/goafanti/weChat/bo/InputPublicDtails.java

@@ -10,6 +10,12 @@ public class InputPublicDtails {
 	private String aid;
 	private String uid;
 	private Integer status;
+
+
+	/**
+	 *  审核状态 0=无 1=审核中,完成
+	 */
+	private Integer statusType;
 	private Integer clockIn;
 	/**
 	 * type 0个人 1部门 2全部
@@ -24,6 +30,14 @@ public class InputPublicDtails {
 	private Integer pageSize;
 	private Integer pageNo;
 
+	public Integer getStatusType() {
+		return statusType;
+	}
+
+	public void setStatusType(Integer statusType) {
+		this.statusType = statusType;
+	}
+
 	public String getContractNo() {
 		return contractNo;
 	}

+ 1 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1358,6 +1358,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 		}
 		map.put("type", in.getType());
+		if(in.getStatusType()!=null) map.put("statusType", in.getStatusType());
 	}
 
 	@SuppressWarnings("unchecked")