Merge branch 'feat-20230417-hantang' into temp-pre

# Conflicts:
#	hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/HanTangCertStatus.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),
-	ZHONG_ZHI(8, "中智", "中智", ZhongZhiCertStatus.class);
-//	HAN_TANG(9, "汉唐", "汉唐", HanTangCertStatus.class);
+	ZHONG_ZHI(8, "中智", "中智", ZhongZhiCertStatus.class),
+	HAN_TANG(9, "汉唐", "汉唐", HanTangCertStatus.class);
 
 	@EnumValue
 	private int code;
@@ -79,9 +79,9 @@ public enum GigTypeEnum {
 			case ZHONG_YI_YUN:
 				certStatusStr = ZhongYiYunCertStatus.resolve(certStatus).name();
 				break;
-//			case HAN_TANG:
-//				certStatusStr = HanTangCertStatus.resolve(certStatus).name();
-//				break;
+			case HAN_TANG:
+				certStatusStr = HanTangCertStatus.resolve(certStatus).name();
+				break;
 			case ZHONG_ZHI:
 				certStatusStr = ZhongZhiCertStatus.resolve(certStatus).name();
 				break;
@@ -125,9 +125,9 @@ public enum GigTypeEnum {
 			case ZHONG_YI_YUN:
 				certStatusStr = ZhongYiYunCertStatus.resolve(certStatus).getMessage();
 				break;
-//			case HAN_TANG:
-//				 certStatusStr = HanTangCertStatus.resolve(certStatus).getMessage();
-//				break;
+			case HAN_TANG:
+				 certStatusStr = HanTangCertStatus.resolve(certStatus).getMessage();
+				break;
 			case ZHONG_ZHI:
 				certStatusStr = ZhongZhiCertStatus.resolve(certStatus).getMessage();
 				break;

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

@@ -36,4 +36,4 @@ public enum HanTangCertStatus {
 		return UN_SIGN;
 
 	}
-}
+}

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

@@ -45,11 +45,11 @@ public enum SubjectLocation {
 
 	// 众蚁云
 	ZHONG_YI_YUN("ZHONG_YI_YUN", GigTypeEnum.ZHONG_YI_YUN, "众蚁云", 11, "zhong_yi_yun_invoice"),
-	// 汉唐
-//	HAN_TANG("HAN_TANG", GigTypeEnum.HAN_TANG, "汉唐", 12),
 	// 中智
 	ZHONG_ZHI("ZHONG_ZHI", GigTypeEnum.ZHONG_ZHI, "中智", 12, "zhongzhi_invoice"),
-	ZHAO_YU("ZHAO_YU", GigTypeEnum.OLADING, "钉灵工-河南兆宇", 13, "olading_zhaoyu_invoice");
+	ZHAO_YU("ZHAO_YU", GigTypeEnum.OLADING, "钉灵工-河南兆宇", 13, "olading_zhaoyu_invoice"),
+ 	// 汉唐
+	HAN_TANG("HAN_TANG", GigTypeEnum.HAN_TANG, "汉唐", 14, "hantang_invoice");
 
 	/**
 	 * 税源地类型

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

@@ -19,6 +19,7 @@ public enum SubjectTypeEnum {
 	TYPE_HUI_QI_YUN("6", "汇企云"),
 	TYPE_ZHONG_YI_YUN("7", "众蚁云"),
 	TYPE_ZHONG_ZHI("8", "中智"),
+	TYPE_HAN_TANG("9", "汉唐"),
 
 	ENABLE_FLAG_FALSE("0", "无效"),
 	ENABLE_FLAG_TRUE("1", "有效"),

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

@@ -440,13 +440,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 = "不支持该税源地操作";
 		}
@@ -635,10 +635,9 @@ 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 -> {
 

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

@@ -217,6 +217,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				case HUI_QI_YUN:
 				case ZHONG_YI_YUN:
 				case ZHONG_ZHI:
+				case HAN_TANG:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						throw new RuntimeException(user.getRealname() + "未认证，不能发起结算");
 					}

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

@@ -611,6 +611,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			case HUI_QI_YUN:
 			case ZHONG_YI_YUN:
 			case ZHONG_ZHI:
+			case HAN_TANG:
 				if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 					return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
 				}
@@ -760,6 +761,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				case HUI_QI_YUN:
 				case ZHONG_YI_YUN:
 				case ZHONG_ZHI:
+				case HAN_TANG:
 					if (!Objects.equals(userSub.getCertStatus(), DingEnum.CER_STATUS_1.getType())) {
 						return R.failed(sysUser.getRealname() + "未认证，不能发起结算");
 					}