feature-wzb:获取项目名称缩小可见范围

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpChangeInfoController.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.RequestExcel;
 import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TCutsomerDataPermisson;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpChangeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService;
@@ -132,6 +133,18 @@ public class TEmpChangeInfoController {
 		return new R<>(tEmpChangeInfoService.getAllDeptPage(page, departName, nameOrNo, customerId,flag));
 	}
 
+	/**
+	 * 分页查询获取所有项目名称(缩小范围)
+	 * @param page 分页对象
+	 * @return
+	 */
+	@Operation(description = "分页查询缩小范围")
+	@GetMapping("/getAllDeptPagePermission" )
+	public R<IPage<TSettleDomain>> getItemNamePagePermission(Page page, @RequestParam(required = false) String departName
+			                                                ,@RequestParam(required = false) String nameOrNo
+			,@RequestParam(required = false) String customerId, @RequestParam(required = false) String flag) {
+		return new R<>(tEmpChangeInfoService.getAllDeptPagePermission(page,departName, nameOrNo, customerId,flag));
+	}
 	/**
 	 * 获取所有项目名称
 	 * @return R

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java

@@ -42,6 +42,20 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 
 	List<TSettleDomain> getPage(@Param("tSettleDomain") TSettleDomain tSettleDomain);
 
+	/**
+	 * 	分页获取项目名称缩小可见范围
+	 *
+	 * @author wzb
+	 * @param page
+	 * @param userId
+	 * @param departName
+	 * @param nameOrNo
+	 * @param customerId
+	 * @param flag
+	 * @return {@link IPage< TSettleDomain>}
+	 */
+	IPage<TSettleDomain> getPagePerMission(Page<TSettleDomain> page, @Param("userId") String userId,@Param("departName") String departName,@Param("nameOrNo") String nameOrNo,@Param("customerId") String customerId, @Param("flag") String flag);
+
 	IPage<IdNameNoVo> getUnitPage(Page<IdNameNoVo> page, @Param("idNameNoVo") IdNameNoVo idNameNoVo);
 	/**
 	 * @param departNo

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TCutsomerDataPermisson;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpChangeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpChangeInfoNewVO;
@@ -71,7 +72,22 @@ public interface TEmpChangeInfoService extends IService<TEmpChangeInfo> {
 	 */
 	R<List<TCustomerInfo>> getAllUint(String customerName);
 
-	IPage<TSettleDomain> getAllDeptPage(Page page, String deptName, String nameOrNo, String customerId,String flag);
 
+	/**
+	 * 	分页获取项目名称缩小可见范围
+	 *
+	 * @author wzb
+	 * @param page
+	 * @param departName
+	 * @param nameOrNo
+	 * @param customerId
+	 * @param flag
+	 * @return {@link IPage< TSettleDomain>}
+	 */
+	IPage<TSettleDomain> getAllDeptPagePermission(Page page, String departName, String nameOrNo, String customerId,String flag);
+
+
+
+	IPage<TSettleDomain> getAllDeptPage(Page page, String deptName, String nameOrNo, String customerId,String flag);
 	R<Boolean> changeEmpProArcNew(TEmpChangeInfoNewVO changeVo);
 }

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

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TCutsomerDataPermissonMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmpChangeInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper;
@@ -325,6 +326,24 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 		return R.ok(list);
 	}
 
+	/**
+	 * 分页获取项目名称缩小可见范围
+	 *
+	 * @author wzb
+	 * @param page
+	 * @param departName
+	 * @param nameOrNo
+	 * @param customerId
+	 * @param flag
+	 * @return {@link IPage< TSettleDomain>}
+	 */
+	@Override
+	public IPage<TSettleDomain> getAllDeptPagePermission(Page page, String departName, String nameOrNo, String customerId,String flag) {
+		YifuUser user = SecurityUtils.getUser();
+		String userId=user.getId();
+		return tSettleDomainMapper.getPagePerMission(page, userId, departName, nameOrNo, customerId, flag);
+
+	}
 	/**
 	 * 分页获取所有项目名称
 	 * @return R

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

@@ -265,6 +265,34 @@
 		WHERE a.id=#{id} GROUP BY a.id
 	</select>
 
+
+	<select id="getPagePerMission" resultMap="tSettleDomainMap">
+		SELECT
+		<include refid="Base_Column_List"/>
+		FROM
+			t_settle_domain a
+				LEFT JOIN t_cutsomer_data_permisson b ON b.SETTLE_DOMAIN_NO = a.DEPART_NO
+		WHERE
+			 b.USER_ID = #{userId}
+		  AND a.DELETE_FLAG = '0'
+		<if test="departName != null and departName.trim() != ''">
+			and a.DEPART_NAME like concat("%",#{departName},"%")
+		</if>
+		<if test="nameOrNo != null and nameOrNo.trim() != ''">
+			and a.DEPART_NAME like concat("%",#{nameOrNo},"%") or a.DEPART_NO like concat("%",#{nameOrNo},"%")
+		</if>
+		<if test="customerId != null and customerId.trim() != ''">
+			and a.CUSTOMER_ID =#{customerId}
+		</if>
+		<if test="flag != null">
+			and a.STOP_FLAG='0'
+		</if>
+		GROUP BY
+			b.USER_ID,
+			b.SETTLE_DOMAIN_NO
+	</select>
+
+
 	<select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap">
 		SELECT
 		<include refid="Base_Column_List"/>,

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -572,4 +572,11 @@ public interface CommonConstants {
 	String NO_SETTLE_DOMAIN_AUTH =  "Hro系统中身份证号不存在,或者没有该人员的结算主体权限";
 	String HRO_EMPLOYEE_NULL =  "Hro人员列表为空";
 	int THIRTY_INT_NEGATIVE = -30;
+
+	/*
+	 * 启用停用状态
+	 */
+
+	String START =  "启用";
+	String STOP  =  "停用";
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TMinSalaryController.java

@@ -121,7 +121,7 @@ public class TMinSalaryController {
 
 
 	/**
-	 * 最低工资批量导入
+	 * 最低工资批量更新
 	 *
 	 * @author wzb
 	 * @param file