Merge branch 'dev3.4' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4

src/jy/clear/clear.go

@@ -29,6 +29,7 @@ func init() {
 	BindFn("clearBuyerPerson", ClearBuyerPerson) //处理较长采购联系人
 	BindFn("clearNumber", ClearNumber)           //一般用于处理抽取联系人后带有电话的情况
 	BindFn("clearEndSymblo", ClearEndSymblo)     //去除尾部特殊符号
+	BindFn("chiToInt", ChiToFloat)			      //中文转数字(费率、折扣率)
 }
 
 //绑定清理方法

src/jy/clear/tonumber.go

@@ -78,6 +78,29 @@ func ObjToFloat(data []interface{}) []interface{} {
 	}
 }
 
+func ChiToFloat(data []interface{}) []interface{} {
+	tmp := ""
+	str := fmt.Sprint(data[0])
+	if strings.Contains(str, "百分之") {
+		str = strings.ReplaceAll(str, "百分之", "")
+		moneyRegChar.ReplaceAllStringFunc(str, func(key string) string {
+			if v, ok := moneyChar[key].(float64); ok {
+				tmp += strconv.FormatFloat(v, 'f', 0, 64)
+			}else if v, ok := moneyChar[key].(string); ok {
+				tmp += v
+			}
+			return tmp
+		})
+		tmpF, err := strconv.ParseFloat(tmp, 64)
+		if err != nil {
+			return data
+		}
+		return []interface{}{tmpF/100, data[1]}
+	}else {
+		return data
+	}
+}
+
 //金额转换
 func ObjToMoney(data []interface{}) []interface{} {
 	isfindUnit := true

src/web/templates/admin/clear.html

@@ -102,7 +102,10 @@ menuActive("version")
 var field = {{.field}};
 var _id = "";
 //var clearArr = ["cutspace","cutallspace","cutSymbol","cutNotPrs","clearAllWord","clearMaxAmount","clearProjectName","toint","tofloat","totimestamp","tomoney","getcurrency","getrate","getPhone","rateToFloat"]; 
-var clearMap = {"中文符号转英文":"chiToEng","去除首尾空格":"cutspace","去除所有空格":"cutallspace","清理符号":"cutSymbol","清理不成对符号后面的内容":"cutNotPrs","清理全部是汉字或者特殊符号的情况":"clearAllWord","过滤大于1万亿":"clearMaxAmount","清理项目名称":"clearProjectName","转int":"toint","转float":"tofloat","转时间戳":"totimestamp","转换金额":"tomoney","获取币种":"getcurrency","获取汇率":"getrate","取手机号":"getPhone","清理数字":"clearNumber","费率转小数":"rateToFloat","处理较长采购联系人":"clearBuyerPerson","去除尾部特殊符号":"clearEndSymblo"}
+var clearMap = {"中文符号转英文":"chiToEng","去除首尾空格":"cutspace","去除所有空格":"cutallspace","清理符号":"cutSymbol","清理不成对符号后面的内容":"cutNotPrs",
+	"清理全部是汉字或者特殊符号的情况":"clearAllWord","过滤大于1万亿":"clearMaxAmount","清理项目名称":"clearProjectName","转int":"toint","转float":"tofloat",
+	"转时间戳":"totimestamp", "转换金额":"tomoney","获取币种":"getcurrency","获取汇率":"getrate","取手机号":"getPhone", "清理数字":"clearNumber",
+	"费率转小数":"rateToFloat","处理较长采购联系人":"clearBuyerPerson","去除尾部特殊符号":"clearEndSymblo","费率/折扣类报价中文转float":"chiToInt"}
 $(function () {
 	ttableclear=$('#clearTable').DataTable({
 		"lengthChange": false,