anderx недель назад: 3
Родитель
Сommit
67784b1a4b

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

@@ -964,6 +964,7 @@
         left join `user` d on a.uid =d.id  left join admin e on d.aid=e.id
         left join user_archives_interview uai on a.id=uai.prdid
         left join public_assist_details pad on b.id=pad.prid
+
         where 1=1
         <if test="publicType != null">
             and b.type= #{publicType}
@@ -1333,12 +1334,9 @@
             and b.uid = #{uid}
         </if>
         <if test="assistType !=null">
-            and a.id in (select DISTINCT prid from public_release_type
-            where `type` in
-            <foreach item="item" collection="assistType" separator="," open="(" close=")">
-                #{item}
+            <foreach item="item" collection="assistType" >
+                and find_in_set(#{item},c.type) &gt;  0
             </foreach>
-            )
         </if>
         <if test="startTime !=null and endTime !=null">
             and a.release_start  between #{startTime} and #{endTime}

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

@@ -31,15 +31,15 @@ public class InputPublicDtails {
 	/**
 	 * 协单项目 分类 0=其他,1=高企认定,2=会员服务,3=科技项目,4=研动力系统,5=知识产权,6=军工,7=涉密,8=技术合同登记,9=第三方认证项目
 	 */
-	private Integer assistType;
+	private String assistType;
 	private Integer pageSize;
 	private Integer pageNo;
 
-	public Integer getAssistType() {
+	public String getAssistType() {
 		return assistType;
 	}
 
-	public void setAssistType(Integer assistType) {
+	public void setAssistType(String assistType) {
 		this.assistType = assistType;
 	}
 

+ 7 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -2742,9 +2742,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			List<PublicReleaseClock> publicReleaseClocks = publicReleaseClockMapper.selectList(collect);
 			pushiClockInTime(list, publicReleaseClocks);
 		}
-		list.forEach(e -> {
-			e.setAssistType(pushAssistTypeName(e.getAssistType()));
-		});
 		return page;
 	}
 
@@ -2760,7 +2757,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getStatus()!=null) map.put("status", in.getStatus());
 		if(in.getClockIn()!=null) map.put("clockIn", in.getClockIn());
 		if(in.getPublicType()!=null)map.put("publicType",in.getPublicType());
-		if(in.getAssistType()!=null)map.put("assistType",in.getAssistType());
+		if(in.getAssistType()!=null){
+			String[] split = in.getAssistType().split(",");
+			map.put("assistType",split);
+		}
 		//type 0私有 1管理权限 2所有权限
 		if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
 				||TokenManager.hasRole(AFTConstants.CED_ASSISTANT )||TokenManager.hasRole(AFTConstants.PERSONNEL_AUDITOR)
@@ -3461,6 +3461,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	private void pushiClockInTime(List<OutPublicDtails> list, List<PublicReleaseClock> publicReleaseClocks) {
 		for (OutPublicDtails outPublicDtails : list) {
+			//处理协单类型
+			outPublicDtails.setAssistType(pushAssistTypeName(outPublicDtails.getAssistType()));
+			//处理打卡
 			if (outPublicDtails.getClockIn()!=null){
 				if (outPublicDtails.getAlone()==2&&outPublicDtails.getAssist()==1){
 					outPublicDtails.setClockInStr("无需打卡");