Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8

yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysUserPermissionMapper.xml

@@ -46,7 +46,7 @@
                 a.ID,
                 a.EMP_NAME,
                 a.EMP_LOGIN_NAME,
-                b.fd_dept_name,
+                b.fd_dept_name as EMP_DEPT,
                 a.PERMISSION_TYPE,
                 a.NAME,
                 a.CODE,
@@ -71,7 +71,7 @@
                         AND a.EMP_LOGIN_NAME = #{sysUserPermission.empLoginName}
                     </if>
                     <if test="sysUserPermission.empDept != null and sysUserPermission.empDept.trim() != ''">
-                        AND b.EMP_DEPT like concat('%',#{sysUserPermission.empDept},'%')
+                        AND b.fd_dept_name like concat('%',#{sysUserPermission.empDept},'%')
                     </if>
                     <if test="sysUserPermission.permissionType != null and sysUserPermission.permissionType.trim() != ''">
                         AND a.PERMISSION_TYPE = #{sysUserPermission.permissionType}
@@ -92,7 +92,7 @@
     <select id="getSysUserPermissionPage" resultMap="sysUserPermissionMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM sys_user_permission a left join sys_user_info b on a.EMP_LOGIN_NAME = b.fd_login_name
+        FROM sys_user_permission a left join sys_user_info b on a.user_id = b.fd_id
         <where>
             a.DELETE_FLAG = '1'
             <include refid="sysUserPermission_where"/>
@@ -103,7 +103,7 @@
 	<select id="userSelectCount" resultType="java.lang.Long">
 		SELECT
 			count(1)
-		FROM sys_user_permission a left join sys_user_info b on a.EMP_LOGIN_NAME = b.fd_login_name
+		FROM sys_user_permission a left join sys_user_info b on a.user_id = b.fd_id
 		<where>
 			a.DELETE_FLAG = '1'
 			<include refid="sysUserPermission_where"/>
@@ -114,8 +114,8 @@
 		SELECT
 		a.EMP_NAME,
 		a.EMP_LOGIN_NAME,
-		c.fd_dept_name,
-		b.name AS PERMISSION_TYPE,
+		b.fd_dept_name as EMP_DEPT,
+		c.name AS PERMISSION_TYPE,
 		a.NAME,
 		a.CODE,
 		CASE WHEN a.IS_CONTAINS=0 THEN "是"
@@ -125,8 +125,8 @@
 		WHEN a.PERMISSION_STATUS =1 THEN "禁用"
 		ELSE a.PERMISSION_STATUS END as PERMISSION_STATUS
 		FROM sys_user_permission a
-		LEFT JOIN permission_type b on a.PERMISSION_TYPE = b.id
-		LEFT JOIN sys_user_info c on a.EMP_LOGIN_NAME = c.fd_login_name
+		LEFT JOIN permission_type c on a.PERMISSION_TYPE = c.id
+		LEFT JOIN sys_user_info b on a.user_id = b.fd_id
 		<where>
 			a.DELETE_FLAG = '1'
 			<include refid="sysUserPermission_where"/>

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

@@ -828,14 +828,14 @@ public class TDispatchInfoController {
 
 	/**
 	 * @Author wzb
-	 * @Description 导出 导出医保花名册
+	 * @Description 导出住房公积金补缴清册
 	 * @Date 10:05 2023/7/28
 	 * @Param
 	 * @return
 	 **/
 	@PostMapping("/doexportFundSupplementaryInfo")
-	@Operation(description = "导出住房公积金补缴申请书")
-	@SysLog("导出住房公积金补缴申请书")
+	@Operation(description = "导出住房公积金补缴清册")
+	@SysLog("导出住房公积金补缴清册")
 	public void doexportFundInfoOne(HttpServletResponse response, HttpServletRequest request,
 								 @RequestBody SocialHandleSearchVo searchVo) {
 		YifuUser user = SecurityUtils.getUser();

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

@@ -1978,11 +1978,17 @@
 	<sql id="where_getFund">
 		a.DELETE_FLAG = 0
 		AND a.fund_id is not null
-		AND a.STATUS in ('2','4')
 		AND ((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1) >0
 		AND a.DISPATCH_ITEM like concat('%','公积金','%')
 		AND a.Type=0
 		<if test="tDispatchInfo != null">
+			<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
+			<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "0" '>
+				AND a.STATUS in ('2','4')
+			</if>
+			<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "1" '>
+				AND a.STATUS in ('1','5')
+			</if>
 			<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
 				AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
 			</if>