Merge branch 'feat-20230402-zhongzhi' into temp-pre

# Conflicts:
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/GigTypeEnum.java
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectLocation.java
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/SysUserSignCertServiceImpl.java

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/GigTypeEnum.java

@@ -24,8 +24,8 @@ public enum GigTypeEnum {
 	LANG_CHAO(5, "浪潮", "浪潮", LangChaoCertStatus.class),
 	HUI_QI_YUN(6, "汇企云", "汇企云", HuiQiYunCertStatus.class),
 	ZHONG_YI_YUN(7, "众蚁云", "众蚁云", ZhongYiYunCertStatus.class),
-	HAN_TANG(8, "汉唐", "汉唐", HanTangCertStatus.class),
-	ZHONG_ZHI(9, "中智", "中智", ZhongZhiCertStatus.class);
+	ZHONG_ZHI(8, "中智", "中智", ZhongZhiCertStatus.class);
+//	HAN_TANG(9, "汉唐", "汉唐", HanTangCertStatus.class);
 
 	@EnumValue
 	private int code;
@@ -79,12 +79,6 @@ public enum GigTypeEnum {
 			case ZHONG_YI_YUN:
 				certStatusStr = ZhongYiYunCertStatus.resolve(certStatus).name();
 				break;
-			case HAN_TANG:
-				certStatusStr = HanTangCertStatus.resolve(certStatus).name();
-				break;
-			case ZHONG_ZHI:
-				certStatusStr = ZhongZhiCertStatus.resolve(certStatus).name();
-				break;
 			default:
 		}
 
@@ -125,12 +119,6 @@ public enum GigTypeEnum {
 			case ZHONG_YI_YUN:
 				certStatusStr = ZhongYiYunCertStatus.resolve(certStatus).getMessage();
 				break;
-			case HAN_TANG:
-				certStatusStr = HanTangCertStatus.resolve(certStatus).getMessage();
-				break;
-			case ZHONG_ZHI:
-				certStatusStr = ZhongZhiCertStatus.resolve(certStatus).getMessage();
-				break;
 			default:
 		}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectLocation.java

@@ -44,9 +44,9 @@ public enum SubjectLocation {
 	// 众蚁云
 	ZHONG_YI_YUN("ZHONG_YI_YUN", GigTypeEnum.ZHONG_YI_YUN, "众蚁云", 11),
 	// 汉唐
-	HAN_TANG("HAN_TANG", GigTypeEnum.HAN_TANG, "汉唐", 12),
+//	HAN_TANG("HAN_TANG", GigTypeEnum.HAN_TANG, "汉唐", 12),
 	// 中智
-	ZHONG_ZHI("ZHONG_ZHI", GigTypeEnum.ZHONG_ZHI, "中智", 13);
+	ZHONG_ZHI("ZHONG_ZHI", GigTypeEnum.ZHONG_ZHI, "中智", 12);
 
 	@EnumValue
 	private final String type;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/SysUserSignCertServiceImpl.java

@@ -406,13 +406,13 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 				}
 				this.updateUserCertStatus(userSub.getId(), "内部状态对其", ZhongZhiCertStatus.SIGN.getCode(), null);
 				return R.ok();
-			case HAN_TANG:
-				// 汉唐
-				if (userSub.getCertStatus() > HanTangCertStatus.UN_SIGN.getCode()) {
-					return R.ok();
-				}
-				this.updateUserCertStatus(userSub.getId(), "内部状态对其", HanTangCertStatus.SIGN.getCode(), null);
-				return R.ok();
+//			case HAN_TANG:
+//				// 汉唐
+//				if (userSub.getCertStatus() > HanTangCertStatus.UN_SIGN.getCode()) {
+//					return R.ok();
+//				}
+//				this.updateUserCertStatus(userSub.getId(), "内部状态对其", HanTangCertStatus.SIGN.getCode(), null);
+//				return R.ok();
 			default:
 				message = "不支持该税源地操作";
 		}
@@ -601,9 +601,10 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 					return true;
 				} else if (GigTypeEnum.ZHONG_ZHI.equals(sysUserSub.getGigType())) {
 					return true;
-				} else if (GigTypeEnum.HAN_TANG.equals(sysUserSub.getGigType())) {
-					return true;
 				}
+//				else if (GigTypeEnum.HAN_TANG.equals(sysUserSub.getGigType())) {
+//					return true;
+//				}
 				return false;
 			}).forEach(userSub -> {