前后:基建对比

src/dashoo.cn/backend/api/business/oilsupplier/basisbuild/oilbasisbuildService.go

@@ -137,9 +137,9 @@ func (s *OilBasisBuildService) GetPClassEntities(pageIndex, itemsPerPage int64,
 		sql += " FROM OilBasisBuild a LEFT JOIN Tmp_OilBasisBuild tmpa ON tmpa.Name = a.Name where (" + having + ")"
 	}
 	if asc {
-		sql += ` order by b.` + orderby + ` ASC `
+		sql += ` order by a.` + orderby + ` ASC `
 	} else {
-		sql += ` order by b.` + orderby + ` DESC `
+		sql += ` order by a.` + orderby + ` DESC `
 	}
 	sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
 

src/dashoo.cn/backend/api/controllers/oilsupplier/basisbuild.go

@@ -1332,7 +1332,7 @@ func (this *OilBasisBuildController) GetCompareTmpSupplier() {
 	}
 
 	if Conditions == "2"{
-		where = where + " and MinClassId = '0'"
+		where = where + " and NoSubCnt > 0"
 	} else if Conditions == "3"{
 		where = where + " and Checked = '0'"
 	} else if Conditions == "4"{
@@ -1409,7 +1409,7 @@ func (this *OilBasisBuildController) GetCompareList() {
 		where += " and tmpa.Name is null"
 	} else if Conditions == "6" {
 		// 资质+级别匹配
-		where += " and a.Name = tmpa.Name and (a.F01 = tmpa.F01 or (tmpa.F01 = '' && a.F01 is null)) and (a.F02 = tmpa.F02 or (tmpa.F02 = '' && a.F02 is null)) and (a.F03 = tmpa.F03 or (tmpa.F03 = '' && a.F03 is null)) and (a.F04 = tmpa.F04 or (tmpa.F04 = '' && a.F04 is null)) and (a.F05 = tmpa.F05 or (tmpa.F05 = '' && a.F05 is null)) and (a.F06 = tmpa.F06 or (tmpa.F06 = '' && a.F06 is null)) and (a.F07 = tmpa.F07 or (tmpa.F07 = '' && a.F07 is null)) and (a.F08 = tmpa.F08 or (tmpa.F08 = '' && a.F08 is null)) and (a.F09 = tmpa.F09 or (tmpa.F09 = '' && a.F09 is null)) and (a.F10 = tmpa.F10 or (tmpa.F10 = '' && a.F10 is null))" +
+		where += " and (a.F01 = tmpa.F01 or (tmpa.F01 = '' && a.F01 is null)) and (a.F02 = tmpa.F02 or (tmpa.F02 = '' && a.F02 is null)) and (a.F03 = tmpa.F03 or (tmpa.F03 = '' && a.F03 is null)) and (a.F04 = tmpa.F04 or (tmpa.F04 = '' && a.F04 is null)) and (a.F05 = tmpa.F05 or (tmpa.F05 = '' && a.F05 is null)) and (a.F06 = tmpa.F06 or (tmpa.F06 = '' && a.F06 is null)) and (a.F07 = tmpa.F07 or (tmpa.F07 = '' && a.F07 is null)) and (a.F08 = tmpa.F08 or (tmpa.F08 = '' && a.F08 is null)) and (a.F09 = tmpa.F09 or (tmpa.F09 = '' && a.F09 is null)) and (a.F10 = tmpa.F10 or (tmpa.F10 = '' && a.F10 is null))" +
 			" and (a.F11 = tmpa.F11 or (tmpa.F11 = '' && a.F11 is null)) and (a.F12 = tmpa.F12 or (tmpa.F12 = '' && a.F12 is null)) and (a.F13 = tmpa.F13 or (tmpa.F13 = '' && a.F13 is null)) and (a.F14 = tmpa.F14 or (tmpa.F14 = '' && a.F14 is null)) and (a.F15 = tmpa.F15 or (tmpa.F15 = '' && a.F15 is null)) and (a.F16 = tmpa.F16 or (tmpa.F16 = '' && a.F16 is null)) and (a.F17 = tmpa.F17 or (tmpa.F17 = '' && a.F17 is null)) and (a.F18 = tmpa.F18 or (tmpa.F18 = '' && a.F18 is null)) and (a.F19 = tmpa.F19 or (tmpa.F19 = '' && a.F19 is null)) and (a.F20 = tmpa.F20 or (tmpa.F20 = '' && a.F20 is null))" +
 			" and (a.F21 = tmpa.F21 or (tmpa.F21 = '' && a.F21 is null)) and (a.F22 = tmpa.F22 or (tmpa.F22 = '' && a.F22 is null)) and (a.F23 = tmpa.F23 or (tmpa.F23 = '' && a.F23 is null)) and (a.F24 = tmpa.F24 or (tmpa.F24 = '' && a.F24 is null)) and (a.F25 = tmpa.F25 or (tmpa.F25 = '' && a.F25 is null))"
 	}

src/dashoo.cn/backend/api/controllers/oilsupplier/goodsaptitude.go

@@ -2470,7 +2470,7 @@ func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
 	}
 
 	if Conditions == "2"{
-		where = where + " and MinClassId = '0'"
+		where = where + " and NoSubCnt > 0"
 	} else if Conditions == "3"{
 		where = where + " and Checked = '0'"
 	} else if Conditions == "4"{

src/dashoo.cn/backend/api/controllers/oilsupplier/technologyservice.go

@@ -1754,7 +1754,7 @@ func (this *OilTechnologyServiceController) GetCompareTmpSupplier() {
 	}
 
 	if Conditions == "2"{
-		where = where + " and MinClassId = '0'"
+		where = where + " and NoSubCnt > 0"
 	} else if Conditions == "3"{
 		where = where + " and Checked = '0'"
 	} else if Conditions == "4"{

src/dashoo.cn/frontend_web/src/pages/oilsupplier/basisbuild/tmpclasscheck.vue

@@ -44,7 +44,7 @@
         <el-table-column v-for="column in dynamicTableColumns" :prop="column.prop" sortable :width="300"
                          :key="column.Id" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ transferStr(scope.row[column.prop]) }}
+            {{ transferStr2(scope.row[column.prop]) }}|{{ transferStr2(scope.row['tmp'+column.prop]) }}
           </template>
         </el-table-column>
       </el-table>
@@ -134,12 +134,6 @@
             label: '名称',
             width: 260,
             sort: true
-          },
-          {
-            prop: 'OrgName',
-            label: '部门名称',
-            width: 150,
-            sort: true
           }
         ],
         dynamicTableColumns: [],
@@ -269,7 +263,7 @@
         this.getCertSub()
       },
       initTableHeader () {
-        setapi.initTsTableHeader(this.$axios).then(res => {
+        setapi.initBbTableHeader(this.$axios).then(res => {
           this.dynamicTableColumns = res.data.items
         })
       },