huyc 项目档案代码提交

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -94,8 +94,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 				if (!Common.isEmpty(tEmployeeInfo)) {
 					map.put("empProId",tEmployeeProject.getId());
 					if (CommonConstants.STATUS_NORMAL.equals(tEmployeeInfo.getFileStatus())) {
+						map.put("code","201");
 						return R.ok(map, "该人员已减项，是否“复项”");
 					} else {
+						map.put("code","202");
 						map.put("employeeId", tEmployeeInfo.getId());
 						return R.ok(map, "该人员已减档减项，是否“复档复项”");
 					}
@@ -113,6 +115,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			//判断是否已经减档
 			if (CommonConstants.ONE_STRING.equals(tEmployeeInfo.getFileStatus())) {
 				map.put("employeeId", tEmployeeInfo.getId());
+				map.put("code","203");
 				return R.ok(null,"该人员在离职库已存在，是否“恢复档案”");
 			}
 		}

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -481,6 +481,12 @@
 			<if test="tEmployeeProject.fileTown != null">
 				AND b.FILE_TOWN = #{tEmployeeProject.fileTown}
 			</if>
+			<if test="tEmployeeInfo.idList != null">
+				AND a.id in
+				<foreach item="idStr" index="index" collection="tEmployeeInfo.idList" open="(" separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
 		</if>
 	</sql>
 
@@ -667,8 +673,7 @@
 	<!--tEmployeeInfo简单分页查询-->
 	<select id="getTEmployeeProjectInfoPage" resultMap="tEmployeeProjectMap">
 	SELECT
-		<include refid="Base_Column_List"/>,
-	    b.
+		<include refid="Base_Column_List"/>
 		FROM t_employee_project a
 		left join t_employee_info b on a.EMP_ID = b.id
 		<where>
@@ -684,13 +689,7 @@
 		left join t_employee_info b on a.EMP_ID = b.id
 		<where>
 			1=1  AND a.DELETE_FLAG = 0
-			<include refid="tEmployeeProject_where"/>
-			<if test="tEmployeeInfo.idList != null">
-				AND a.id in
-				<foreach item="idStr" index="index" collection="tEmployeeInfo.idList" open="(" separator="," close=")">
-					#{idStr}
-				</foreach>
-			</if>
+			<include refid="exportTEmployeeProject_where"/>
 		</where>
 	</select>
 </mapper>