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/TEmployeeInfoServiceImpl.java

@@ -790,8 +790,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 			errorMsg.add("员工类型必填！");
 			errorMsgMap.put(lineNum, new ErrorMessage("员工类型必填！"));
 		} else if (EmployeeConstants.EMP_NATRUE_ZERO.equals(employeeInfo.getEmpNatrue())
-				|| EmployeeConstants.EMP_NATRUE_ONE.equals(employeeInfo.getEmpNatrue())) {
-			// 2.员工类型为外包和派遣，额外必填项有：身份证开始日期、身份证截止日期、民族、户籍所在（省市县）、户口性质、档案所在地（省市县）、是否大专及以上、通信地址
+				|| EmployeeConstants.EMP_NATRUE_ONE.equals(employeeInfo.getEmpNatrue())
+				|| CommonConstants.THREE_STRING.equals(employeeInfo.getEmpNatrue())) {
+			// 2.员工类型为外包和派遣和内部员工，额外必填项有：身份证开始日期、身份证截止日期、民族、户籍所在（省市县）、户口性质、档案所在地（省市县）、是否大专及以上、通信地址
 			if (Common.isEmpty(employeeInfo.getValidityStart())) {
 				errorMsg.add(EmployeeConstants.VALIDITY_START);
 				errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.VALIDITY_START));
@@ -1890,7 +1891,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 	private void judgeNull(Set<String> errorMsg, TEmployeeInfo employeeInfo) {
 		if (Common.isNotNull(employeeInfo.getEmpNatrue())
 				&& (CommonConstants.ZERO_STRING.equals(employeeInfo.getEmpNatrue())
-				|| CommonConstants.ONE_STRING.equals(employeeInfo.getEmpNatrue()))) {
+				|| CommonConstants.ONE_STRING.equals(employeeInfo.getEmpNatrue())
+				|| CommonConstants.THREE_STRING.equals(employeeInfo.getEmpNatrue()))) {
 			// 2.员工类型为外包和派遣，额外必填项有：身份证开始日期、身份证截止日期、民族、户籍所在（省市县）、户口性质、档案所在地（省市县）、是否大专及以上、通信地址
 			if (Common.isEmpty(employeeInfo.getValidityStart())) {
 				errorMsg.add(EmployeeConstants.VALIDITY_START);

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

@@ -277,7 +277,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			//从剩下的项目档案中查找员工类型并更新
 			if (Common.isNotNull(list)) {
 				Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
-				if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ZERO_STRING))) {
+				if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.THREE_STRING))) {
+					tEmployeeInfo.setEmpNatrue(CommonConstants.THREE_STRING);
+				} else if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ZERO_STRING))) {
 					tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
 				} else if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ONE_STRING))) {
 					tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
@@ -758,7 +760,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 			idCard = excel.getEmpIdcard();
 			deptNo = excel.getDeptNo();
-			if (excel.getEmpNatrue().equals(CommonConstants.ZERO_STRING) || excel.getEmpNatrue().equals(CommonConstants.ONE_STRING)) {
+			if (excel.getEmpNatrue().equals(CommonConstants.ZERO_STRING)
+					|| excel.getEmpNatrue().equals(CommonConstants.ONE_STRING)
+					|| excel.getEmpNatrue().equals(CommonConstants.THREE_STRING)) {
 				if (excel.getContractType().equals(CommonConstants.ONE_STRING) && Common.isEmpty(excel.getWorkingHours())) {
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "工时制不能为空！"));
 				}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -79,16 +79,15 @@ public class TDispatchInfoController {
 		YifuUser user = SecurityUtils.getUser();
 		menuUtil.setAuthSql(user, tDispatchInfo);
 		if (Common.isNotNull(tDispatchInfo.getAuthSql())) {
-			if(tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+			if (tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
 				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
 			}
-			if (tDispatchInfo.getAuthSql().contains("s.") || tDispatchInfo.getAuthSql().contains("f.")){
-				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("s.", "a."));
-				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("f.", "a."));
+			if (tDispatchInfo.getAuthSql().contains("1=2 EXISTS")) {
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
 			}
 		}
 		tDispatchInfo.setCreateBy(user.getId());
-        return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
+        return  new R<>(tDispatchInfoService.getTDispatchInfoPageAudit(page,tDispatchInfo));
     }
 
     /**
@@ -189,13 +188,12 @@ public class TDispatchInfoController {
 			if (tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
 				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
 			}
-			if (tDispatchInfo.getAuthSql().contains("s.") || tDispatchInfo.getAuthSql().contains("f.")){
-				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("s.", "a."));
-				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("f.", "a."));
+			if (tDispatchInfo.getAuthSql().contains("1=2 EXISTS")) {
+				tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
 			}
 		}
 		tDispatchInfo.setCreateBy(user.getId());
-		return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
+		return new R<>(tDispatchInfoService.getTDispatchInfoPageAudit(page,tDispatchInfo));
 	}
 
 	/**
@@ -326,8 +324,13 @@ public class TDispatchInfoController {
     public void export(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo) {
 		YifuUser user = SecurityUtils.getUser();
 		menuUtil.setAuthSql(user, searchVo);
-		if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
-			searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+		if (Common.isNotNull(searchVo.getAuthSql())) {
+			if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
+				searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
+			}
+			if (searchVo.getAuthSql().contains("1=2 EXISTS")) {
+				searchVo.setAuthSql(searchVo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
+			}
 		}
 		searchVo.setCreateBy(user.getId());
 		tDispatchInfoService.listExport(response,searchVo);

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java

@@ -42,6 +42,8 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
      */
     IPage<TDispatchInfoPageVo> getTDispatchInfoPage(Page<TDispatchInfo> page, @Param("tDispatchInfo") TDispatchInfoSearchVo tDispatchInfo);
 
+	IPage<TDispatchInfoPageVo> getTDispatchInfoPageAudit(Page<TDispatchInfo> page, @Param("tDispatchInfo") TDispatchInfoSearchVo tDispatchInfo);
+
 	/**
 	 * @Description: 派单导出
 	 * @Author: hgw

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java

@@ -46,7 +46,9 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
      */
     IPage<TDispatchInfoPageVo> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo);
 
-    R<List<ErrorMessage>> importDiy(InputStream inputStream, String orderId);
+	IPage<TDispatchInfoPageVo> getTDispatchInfoPageAudit(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo);
+
+	R<List<ErrorMessage>> importDiy(InputStream inputStream, String orderId);
 
     void listExport(HttpServletResponse response, TDispatchInfoSearchVo searchVo);
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -120,6 +120,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return baseMapper.getTDispatchInfoPage(page, tDispatchInfo);
 	}
 
+	/**
+	 * 派单信息记录表简单分页查询
+	 *
+	 * @param tDispatchInfo 派单信息记录表
+	 */
+	@Override
+	public IPage<TDispatchInfoPageVo> getTDispatchInfoPageAudit(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
+		return baseMapper.getTDispatchInfoPageAudit(page, tDispatchInfo);
+	}
+
 	/**
 	 * 派单信息记录表批量导出
 	 *

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -444,8 +444,6 @@
 		<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
 			left join t_socialfund_house_res p on p.USER_ID = #{tDispatchInfo.createBy}
 		</if>
-		<!--left join t_social_info s on s.id=a.SOCIAL_ID
-		left join t_provident_fund f on f.id=a.FUND_ID-->
         <where>
             1=1
             <include refid="tDispatchInfo_where"/>
@@ -454,6 +452,21 @@
 		order by a.CREATE_TIME desc
     </select>
 
+	<!--tDispatchInfo简单分页查询-->
+	<select id="getTDispatchInfoPageAudit" resultMap="dispatchPageMap">
+		SELECT
+		<include refid="Base_Column_List"/>,
+		a.SOCIAL_HOUSEHOLD_NAME,
+		a.PROVIDENT_HOUSEHOLD_NAME
+		FROM t_dispatch_info a
+		<where>
+			1=1
+			<include refid="tDispatchInfo_where"/>
+		</where>
+
+		order by a.CREATE_TIME desc
+	</select>
+
 	<!-- 派单导出 -->
     <select id="exportDispatch" resultMap="exportMap">
 		select
@@ -484,16 +497,11 @@
 			a.ORGAN_NAME,
 			a.CREATE_TIME
 		from t_dispatch_info a
-		<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
-			left join t_socialfund_house_res p on p.USER_ID = #{tDispatchInfo.createBy}
-		</if>
 		left join t_social_info s on s.id=a.SOCIAL_ID
-		left join t_provident_fund f on f.id=a.FUND_ID
         <where>
             a.DELETE_FLAG = '0'
             <include refid="tDispatchInfo_where"/>
         </where>
-		group by a.id
 		order by a.CREATE_TIME desc
 		<if test="tDispatchInfo.limitStart != null">
 			limit #{tDispatchInfo.limitStart},#{tDispatchInfo.limitEnd}