Merge branch 'dev_v4.8.92_wh' of qmx/jy into feature/v4.8.92

src/jfw/modules/bigmember/src/entity/report.go

@@ -75,25 +75,28 @@ func GetReportProjectInfo(param *ReportProjectInfoParam, positionId int64) (data
 		// 行业 {"水利水电":["水利工程","发电工程","航运工程","其他工程"]} sql中处理成 "水利水电_水利工程"
 		tmpArr := []string{}
 		for topIndustry, subList := range param.Industry {
-			for i := 0; i < len(subList); i++ {
-				tmpArr = append(tmpArr, "find_in_set(?,subscopeclass)")
-				values = append(values, fmt.Sprintf("%s_%s", topIndustry, subList[i]))
-			}
 			if param.From == From {
 				tmpArr = append(tmpArr, "find_in_set(?,subscopeclass)")
 				values = append(values, topIndustry)
+			} else {
+				for i := 0; i < len(subList); i++ {
+					tmpArr = append(tmpArr, "find_in_set(?,subscopeclass)")
+					values = append(values, fmt.Sprintf("%s_%s", topIndustry, subList[i]))
+				}
 			}
 		}
 		qstr = append(qstr, fmt.Sprintf("(%s)", strings.Join(tmpArr, " or ")))
 	}
 	// 采购单位类型
-	if param.BuyerClass != nil && len(param.BuyerClass) > 0 {
-		tmpArr := []string{}
-		for i := 0; i < len(param.BuyerClass); i++ {
-			tmpArr = append(tmpArr, "?")
-			values = append(values, param.BuyerClass[i])
+	if param.From != From {
+		if param.BuyerClass != nil && len(param.BuyerClass) > 0 {
+			tmpArr := []string{}
+			for i := 0; i < len(param.BuyerClass); i++ {
+				tmpArr = append(tmpArr, "?")
+				values = append(values, param.BuyerClass[i])
+			}
+			qstr = append(qstr, fmt.Sprintf("buyerclass in (%s)", strings.Join(tmpArr, ",")))
 		}
-		qstr = append(qstr, fmt.Sprintf("buyerclass in (%s)", strings.Join(tmpArr, ",")))
 	}
 	// 采购单位
 	if param.Buyer != "" {

src/jfw/modules/publicapply/.idea/workspace.xml

@@ -5,8 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="99903b5d-26c6-49b2-8d9c-56347398c448" name="变更" comment="">
-      <change beforePath="$PROJECT_DIR$/../app/src/go.sum" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../bigmember/src/service/analysis/forecastproject.go" beforeDir="false" afterPath="$PROJECT_DIR$/../bigmember/src/service/analysis/forecastproject.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../subscribepay/src/invoice.json" beforeDir="false" afterPath="$PROJECT_DIR$/../subscribepay/src/invoice.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,6 +33,13 @@
   <component name="GoLibraries">
     <option name="indexEntireGoPath" value="false" />
   </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://H:/go/go1.20.4/pkg/mod/app.yhyue.com/moapp/jypkg@v0.0.0-20230925120741-9e02619bfe25/common/src/qfw/util/jy/bigVipPower.go" root0="SKIP_INSPECTION" />
+    <setting file="file://H:/go/go1.20.4/pkg/mod/app.yhyue.com/moapp/jypkg@v0.0.0-20230925120741-9e02619bfe25/middleground/usercenter.go" root0="SKIP_INSPECTION" />
+    <setting file="file://H:/go/go1.20.4/pkg/mod/app.yhyue.com/moapp/jypkg@v1.1.2/common/src/qfw/util/dataexport/dataexport.go" root0="SKIP_INSPECTION" />
+    <setting file="file://H:/go/go1.20.4/pkg/mod/app.yhyue.com/moapp/jypkg@v1.1.7/common/src/qfw/util/dataexport/dataexport.go" root0="SKIP_INSPECTION" />
+    <setting file="file://H:/go/go1.20.4/pkg/mod/bp.jydev.jianyu360.cn/!base!service/user!center@v1.2.14/rpc/usercenter/usercenter.go" root0="SKIP_INSPECTION" />
+  </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>

src/jfw/modules/subscribepay/src/invoice.json

@@ -3,7 +3,7 @@
   "tax_rate": "0.06",
   "tax_policy": "0",
   "invoice_nature": "0",
-  "invoice_interface_address": "https://jybx3-webtest.jydev.jianyu360.com",
+  "invoice_interface_address": "http://127.0.0.1:7070",
   "code": "3040205000000000000",
   "switch_paymch":{
 	"model":1,