信息上报查询修改

src/dashoo.cn/backend/api/business/oilsupplier/selectbusiness/selectservice.go

@@ -65,7 +65,7 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 	return total
 }
 
-func (s *SelectService) GetUp(supplierTableName, supplierCertTableName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where string) (total int64) {
+func (s *SelectService) GetUp(supplierTableName, supplierCertTableName, supplierCertSubTableName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where string) (total int64) {
 	var resultsSlice []map[string][]byte
 
 	//获取总记录数
@@ -74,10 +74,13 @@ func (s *SelectService) GetUp(supplierTableName, supplierCertTableName string, p
 	sqlCount += ` where ` + where
 
 	var sql string
-	sql = `select a.SupplierName,b.SupplierTypeCode, b.SupplierTypeName`
+	sql = `select max(a.SupplierName) as SupplierName,b.SupplierTypeCode, b.SupplierTypeName, count(b.Id) as AllUpNum `
 	sql += ` from ` + supplierTableName + ` a `
-	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
+	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id "
+	sql += ` left join ` + supplierCertSubTableName + " c on c.SupplierCertId = b.Id "
 	sql += ` where ` + where
+	sql += ` group by b.Id `
+
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `
 	} else {

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

@@ -23,6 +23,15 @@ type RegCapitalRange struct {
 type UpSearch struct {
 	SupplierName string
 }
+type UpInfoSearch struct {
+	SupplierName      string
+	SupplierTypeCode  string
+	SupplierTypeName  string
+	AllUpNum          int
+	HeGeNum           int
+	UnHeGeNum         int
+	Reason            string
+}
 
 // @Title 获取所有
 // @Description
@@ -170,9 +179,9 @@ func (this *SelectController) Up() {
 	}
 
 	svc := selectbusiness.GetSelectService(utils.DBE)
-	var list []supplier.OilSupplierView
+	var list []UpInfoSearch
 
-	total := svc.GetUp(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, Prop, asc, &list, where)
+	total := svc.GetUp(OilSupplierName, OilSupplierCertName, OilSupplierCertSubName, page.CurrentPage, page.Size, Prop, asc, &list, where)
 
 	var datainfo DataInfo
 	datainfo.Items = list

src/dashoo.cn/frontend_web/src/pages/select/informationreporting/index.vue

@@ -56,10 +56,10 @@
         <!--内框表格剩余栏显示-->
         <el-table-column label="企业名称" prop="SupplierName" align="center"></el-table-column>
         <el-table-column label="准入类别" prop="SupplierTypeName" align="center"></el-table-column>
-        <el-table-column label="上报数量" prop align="center"></el-table-column>
-        <el-table-column label="合格数量" prop align="center"></el-table-column>
-        <el-table-column label="不合格数量" prop align="center"></el-table-column>
-        <el-table-column label="不合格原因" prop align="center"></el-table-column>
+        <el-table-column label="上报数量" prop="AllUpNum" align="center"></el-table-column>
+        <el-table-column label="合格数量" prop="AllUpNum" align="center"></el-table-column>
+        <el-table-column label="不合格数量" prop="UnHeGeNum" align="center"></el-table-column>
+        <el-table-column label="不合格原因" prop="Reason" align="center"></el-table-column>
       </el-table>
 
       <!-- 分页 -->
@@ -191,7 +191,7 @@ export default {
         .up(params, this.searchForm, this.$axios)
         .then(res => {
           this.entityList = res.data.items;
-          console.log(this.entityList);
+          console.log("----this.entityList--",this.entityList)
           this.getSpanArr(res.data.items);
           this.currentItemCount = res.data.currentItemCount;
         })