Browse Source

新增获取当前用户打卡数据

anderx 3 years ago
parent
commit
32a0b6b5a3

+ 15 - 3
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -493,8 +493,14 @@ a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_na
     and a.assist = #{assist}
     </if>
 	<if test="type==0">
-    and a.assist in(0,1)
-	and a.aid= #{aid}
+      and a.assist
+        <if test="assist == 2">
+          =2
+        </if>
+        <if test="assist !=2">
+          in(0,1)
+        </if>
+    and a.aid= #{aid}
 	</if>
 	<if test="type==1">
       and a.assist in(0,1)
@@ -542,7 +548,13 @@ a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_na
       and a.assist = #{assist}
     </if>
     <if test="type==0">
-      and a.assist in(0,1)
+      and a.assist
+      <if test="assist == 2">
+        =2
+      </if>
+      <if test="assist !=2">
+        in(0,1)
+      </if>
       and a.aid= #{aid}
     </if>
     <if test="type==1">

+ 4 - 1
src/main/java/com/goafanti/weChat/bo/InputPublicReleaseList.java

@@ -4,9 +4,12 @@ public class InputPublicReleaseList {
 
 	private Integer pageSize;
 	private Integer pageNo;
-//	查看类型 0我的 1审核 2管理员 3协单
+//	查看类型 0我的公出 1公出审核 2管理员 3协单(技术财税总监看全部)
 	private Integer type;
 	private String clockTime;
+	/**
+	 * 0非协单 1主协单 2子协单
+	 */
 	private Integer assist;
 //	公出时间搜索,按公出名称搜索,按审核状态搜索(审核中、已撤销、已审核),按打卡状态搜索(已打卡、未打卡)
 	private String releaseStarts;

+ 3 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -211,15 +211,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public Pagination<OutPublicReleaseList> listPublicRelease(InputPublicReleaseList in) {
 		Map<String,Object> map =new HashMap<String, Object>();
 		map.put("type", in.getType()==null?0:in.getType());
-//		if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
+		if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
 			map.put("aid", TokenManager.getAdminId());
-//		}
+		}
 		if (StringUtils.isNotEmpty(in.getClockTime()))	map.put("clockTime", in.getClockTime());
 		if(StringUtils.isNotEmpty(in.getReleaseStarts()))	map.put("releaseStarts", in.getReleaseStarts());
 		if(StringUtils.isNotEmpty(in.getReleaseEnds()))	map.put("publicEnd", in.getReleaseEnds()+" 23:59:59");
 		if(StringUtils.isNotEmpty(in.getUserName()))	map.put("userName", in.getUserName());
 		if(in.getStatus()!=null)	map.put("status", in.getStatus());
 		if(in.getClockIn()!=null)	map.put("clockIn", in.getClockIn());
+		if(in.getAssist()!=null)map.put("assist",in.getAssist());
 		Pagination<OutPublicReleaseList> p=(Pagination<OutPublicReleaseList>) findPage("listPublicRelease", "countPublicRelease", map, in.getPageNo(), in.getPageSize());
 		return p;
 	}