MVP1.5.4-SSC审核

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java

@@ -140,12 +140,12 @@ public class TDispatchInfo extends BaseEntity {
 	/**
 	 * 0未提交1待审核2审核通过3审核不通过4办理完成
 	 */
-	@NotBlank(message = "0未提交1待审核2审核通过3审核不通过4办理完成不能为空" )
-	@Length(max = 1, message = "0未提交1待审核2审核通过3审核不通过4办理完成 不能超过1个字符" )
-	@ExcelAttribute(name = "0未提交1待审核2审核通过3审核不通过4办理完成", isNotEmpty = true, errorInfo = "0未提交1待审核2审核通过3审核不通过4办理完成不能为空", maxLength = 1)
-	@Schema(description = "0未提交1待审核2审核通过3审核不通过4办理完成" )
+	@NotBlank(message = "0未提交1待审核2审核通过3审核不通过4办理完成不能为空5待SSC审核" )
+	@Length(max = 1, message = "0未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 不能超过1个字符" )
+	@ExcelAttribute(name = "0未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核", isNotEmpty = true, errorInfo = "0未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核不能为空", maxLength = 1)
+	@Schema(description = "0未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核" )
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("0未提交1待审核2审核通过3审核不通过4办理完成" )
+	@ExcelProperty("0未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核" )
 	private String status;
 	/**
 	 * 0派增1派减
@@ -741,4 +741,13 @@ public class TDispatchInfo extends BaseEntity {
 	@ExcelProperty("公积金是否已导出" )
 	private String exportFundFlag;
 
+	/**
+	 * @Description: SSC 审核，不审核自己创建的
+	 * @Author: hgw
+	 * @Date: 2023/5/18 16:18
+	 * @return:
+	 **/
+	@TableField(exist = false)
+	private String noCreateUser;
+
 }

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

@@ -189,6 +189,13 @@ public class TDispatchInfoController {
 		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
 		tDispatchInfo.setStatus(CommonConstants.ONE_STRING);
 		YifuUser user = SecurityUtils.getUser();
+		// SSC派单组-1659015946137583618L  SSC审核组-1659016108176130049L
+		long roleId = 1659016108176130049L;
+		boolean isSsc =	tDispatchInfoService.haveRole(user, roleId);
+		if (isSsc) {
+			tDispatchInfo.setStatus(CommonConstants.FIVE_STRING);
+			tDispatchInfo.setNoCreateUser(user.getId());
+		}
 		menuUtil.setAuthSql(user, tDispatchInfo);
 		if (Common.isNotNull(tDispatchInfo.getAuthSql())) {
 			if (tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
@@ -374,9 +381,16 @@ public class TDispatchInfoController {
 	public void auditExport(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo,
 							@RequestParam(required = false,name = "mId") String mId) {
 		searchVo.setDeleteFlag(CommonConstants.ZERO_STRING);
+		YifuUser user = SecurityUtils.getUser();
 		searchVo.setStatus(CommonConstants.ONE_STRING);
+		// SSC派单组-1659015946137583618L  SSC审核组-1659016108176130049L
+		long roleId = 1659016108176130049L;
+		boolean isSsc =	tDispatchInfoService.haveRole(user, roleId);
+		if (isSsc) {
+			searchVo.setStatus(CommonConstants.FIVE_STRING);
+			searchVo.setNoCreateUser(user.getId());
+		}
 		searchVo.setMId(mId);
-		YifuUser user = SecurityUtils.getUser();
 		menuUtil.setAuthSql(user, searchVo);
 		if (Common.isNotNull(searchVo.getAuthSql())) {
 			if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {

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

@@ -114,4 +114,14 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 	R<Boolean> updateExportSocialFlagById(String id,String status);
 
 	R<Boolean> updateExportFundFlagById(String id,String status);
+
+	/**
+	 * @param user
+	 * @param roleId  SSC派单组-1659015946137583618L  SSC审核组-1659016108176130049L
+	 * @Description: 判断用户是否含有某个角色
+	 * @Author: hgw
+	 * @Date: 2023/5/18 16:15
+	 * @return: boolean
+	 **/
+	boolean haveRole(YifuUser user, long roleId);
 }

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

@@ -520,6 +520,9 @@
 					<if test="tDispatchInfo.authSql != null and tDispatchInfo.authSql.trim() != ''">
 						${tDispatchInfo.authSql}
 					</if>
+					<if test="tDispatchInfo.noCreateUser != null and tDispatchInfo.noCreateUser.trim() != ''">
+						AND a.CREATE_BY != #{tDispatchInfo.noCreateUser}
+					</if>
 		</if>
     </sql>
 
@@ -778,6 +781,7 @@
 		when a.STATUS = 2 then "审核通过"
 		when a.STATUS = 3 then "审核不通过"
 		when a.STATUS = 4 then "已办结"
+		when a.STATUS = 5 then "待SSC审核"
 		else null  end as STATUS,
 		a.AUDIT_USER_NAME as AUDIT_USER,
 		a.AUDIT_TIME,