Merge remote-tracking branch 'origin/develop' into develop

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

@@ -496,11 +496,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
 					.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));
 
+			String errorMessage = excel.getEmpName() + ";" + excel.getEmpIdcard() + "," + excel.getDeptNo() + ";";
 			if (Common.isNotNull(tEmployeeProject)) {
 				if (tEmployeeProject.getInsuranceStatus() != CommonConstants.dingleDigitIntArray[0] || tEmployeeProject.getSocialStatus() != CommonConstants.dingleDigitIntArray[0] ||
 						tEmployeeProject.getFundStatus() != CommonConstants.dingleDigitIntArray[0]) {
-
-					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_CHANGE_NOT_EXIST)));
+					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMessage + MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_CHANGE_NOT_EXIST)));
 				} else {
 					TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
 					tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
@@ -968,7 +968,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 								.eq(TEmployeeInfo::getDeleteFlag, CommonConstants.STATUS_NORMAL));
 						infoUpdList.add(tEmployeeInfo);
 					} else {
-						errorList.add(new ErrorMessage(i, MsgUtils.getMessage(ErrorCodes.CHECKS_PROJECT_DELETE_ERROR)));
+						errorList.add(new ErrorMessage(i, delProject.getEmpName() + ";" + delProject.getEmpIdcard() + "," + delProject.getDeptNo() + ";" + "项目档案状态为已审核，禁止删除"));
 					}
 				} catch (Exception e) {
 					log.error("项目档案批量删除异常：" + e.getMessage());

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

@@ -65,16 +65,16 @@
 			AND a.EMP_IDCARD = #{tElecEmployeeInfo.empIdcard}
 		</if>
 		<if test="tElecEmployeeInfo.unitName != null and tElecEmployeeInfo.unitName.trim() != ''">
-			AND b.UNIT_NAME like concat('%',#{tElecEmployeeInfo.unitName},'%')
+			AND c.UNIT_NAME like concat('%',#{tElecEmployeeInfo.unitName},'%')
 		</if>
 		<if test="tElecEmployeeInfo.deptName != null and tElecEmployeeInfo.deptName.trim() != ''">
-			AND b.DEPT_NAME like concat('%',#{tElecEmployeeInfo.deptName},'%')
+			AND c.DEPT_NAME like concat('%',#{tElecEmployeeInfo.deptName},'%')
 		</if>
 		<if test="tElecEmployeeInfo.empNo != null and tElecEmployeeInfo.empNo.trim() != ''">
-			AND b.EMP_NO = #{tElecEmployeeInfo.empNo}
+			AND c.EMP_NO = #{tElecEmployeeInfo.empNo}
 		</if>
 		<if test="tElecEmployeeInfo.deptNo != null and tElecEmployeeInfo.deptNo.trim() != ''">
-			AND b.DEPT_NO like concat('%',#{tElecEmployeeInfo.deptNo},'%')
+			AND c.DEPT_NO like concat('%',#{tElecEmployeeInfo.deptNo},'%')
 		</if>
 		<if test="tElecEmployeeInfo.dataType != null and tElecEmployeeInfo.dataType.trim() != ''">
 			AND a.DATA_TYPE = #{tElecEmployeeInfo.dataType}
@@ -100,14 +100,15 @@
 	<!--tElecEmployeeInfo简单分页查询-->
 	<select id="getTElecEmployeeInfoPage" resultMap="tElecEmployeeInfoMap">
 		SELECT
-		<include refid="Base_Column_List"/>,GROUP_CONCAT(distinct b.DEPT_NAME) as DEPT_NAME,GROUP_CONCAT(distinct b.UNIT_NAME) as UNIT_NAME,GROUP_CONCAT(distinct b.DEPT_NO) as DEPT_NO,GROUP_CONCAT(distinct b.EMP_NO) as EMP_NO
+		<include refid="Base_Column_List"/>,GROUP_CONCAT(distinct c.DEPT_NAME) as DEPT_NAME,GROUP_CONCAT(distinct c.UNIT_NAME) as UNIT_NAME,GROUP_CONCAT(distinct c.DEPT_NO) as DEPT_NO,GROUP_CONCAT(distinct c.EMP_NO) as EMP_NO
 		FROM t_elec_employee_info a
-		left join t_employee_project b on a.EMP_IDCARD = b.EMP_IDCARD
+		left join t_employee_info b on a.EMP_IDCARD = b.EMP_IDCARD
+		left join t_employee_project c on a.EMP_IDCARD = c.EMP_IDCARD
 		<where>
-			1=1  AND a.DELETE_FLAG = '0' AND b.DELETE_FLAG = '0'
+			1=1  AND a.DELETE_FLAG = '0'
 			<include refid="tElecEmployeeInfo_where"/>
 		</where>
-		GROUP BY a.EMP_IDCARD,a.CREATE_TIME
+		GROUP BY a.EMP_IDCARD,a.CREATE_TIME,a.DATA_TYPE
 		ORDER BY a.CREATE_TIME desc
 	</select>
 </mapper>