维修故障统计调整

apiserver/routers/report.go

@@ -18,6 +18,7 @@ func MaintainList(c *gin.Context) {
 	end := fsion.Get("endTime").ValueStr()
 	level := fsion.Get("level").ValueStr()
 	eqName := fsion.Get("eqName").ValueStr()
+	eqClassPIdStr := fsion.Get("eqClassPIdStr").ValueStr()
 
 	offset := fsion.Get("offset").ValueInt()
 	pagecount := fsion.Get("pagecount").ValueDefaultInt(99999999)
@@ -42,7 +43,7 @@ func MaintainList(c *gin.Context) {
 		}
 		c.JSON(200, map[string]interface{}{"code": 200, "data": resp, "msg": "ok", "total": total, "pageNum": offset, "pageSize": pagecount})
 	} else if level == "2" {
-		total, resp, err := service.MaintainList(pastureName, eqClassId, startTime, endTime, offset, pagecount)
+		total, resp, err := service.MaintainList(pastureName, eqClassId, startTime, endTime, offset, pagecount, eqClassPIdStr)
 		if err != nil {
 			c.JSON(500, map[string]interface{}{"code": 500, "data": err.Error(), "msg": "fail", "total": total, "pageNum": offset, "pageSize": pagecount})
 			return

apiserver/service/job.go

@@ -19,10 +19,10 @@ func SapJobInit() {
 	c.AddFunc(spec, func() {
 		AutoSapOrderJob()
 		//AutoSrmOrderJob()
-		AutoSapReturnOrderJob()
+		//AutoSapReturnOrderJob()
 		//AutoSrmReturnOrderJob()
 	})
-	c.Start()
+	//c.Start()
 
 	//pastureList := make([]*model.Pasture, 0)
 	//s.d.DB.Table("pasture").Find(&pastureList)

apiserver/service/report.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-func MaintainList(pastureName, eqClassIdStr string, startTime, endTime time.Time, offset, pagecount int) (int, []map[string]interface{}, error) {
+func MaintainList(pastureName, eqClassIdStr string, startTime, endTime time.Time, offset, pagecount int, eqClassPIdStr string) (int, []map[string]interface{}, error) {
 
 	//eqClassIdList := []string{}
 
@@ -21,12 +21,12 @@ func MaintainList(pastureName, eqClassIdStr string, startTime, endTime time.Time
 	//eqList := make([]*model.EqClass, 0)
 	//s.d.DB.Raw()
 	s.d.DB.Raw("select e.id,p.id,e.typeName,p.name from eqclass e join  pasture p  where section = 3  "+
-		"and (p.name = ? or ? = '现代牧业' or  ?= '') and p.IsEnergy = 0  and p.name != '现代牧业'  and (e.id = ? or ?= '') limit ?,?",
-		pastureName, pastureName, pastureName, eqClassIdStr, eqClassIdStr, offset-1, pagecount).Order(" eqsort asc ").Find(&eqList)
+		"and (p.name = ? or ? = '现代牧业' or  ?= '') and p.IsEnergy = 0  and p.name != '现代牧业'  and (e.id = ? or ?= '')  and (e.pid = ? or ?= '') limit ?,?",
+		pastureName, pastureName, pastureName, eqClassIdStr, eqClassIdStr, eqClassPIdStr, eqClassPIdStr, offset-1, pagecount).Order(" eqsort asc ").Find(&eqList)
 
 	s.d.DB.Raw("select count(1) from eqclass e join  pasture p  where section = 3  "+
-		"and (p.name = ? or ? = '现代牧业' or  ?= '') and p.IsEnergy = 0  and p.name != '现代牧业'  and (e.id = ? or ?= '') ",
-		pastureName, pastureName, pastureName, eqClassIdStr, eqClassIdStr).Count(&total)
+		"and (p.name = ? or ? = '现代牧业' or  ?= '') and p.IsEnergy = 0  and p.name != '现代牧业'  and (e.id = ? or ?= '')  and (e.pid = ? or ?= '') ",
+		pastureName, pastureName, pastureName, eqClassIdStr, eqClassIdStr, eqClassPIdStr, eqClassPIdStr).Count(&total)
 
 	//} else {
 	//	eqClassIdList = append(eqClassIdList, eqClassIdStr)

migration/v0002_alter_bigpartpurchase.sql

@@ -1052,4 +1052,9 @@ WHERE (
   AND (
     IF (	? = 1,bpu.ProofCode IS NOT NULL,	IF	( ? = 2, bpu.ProofCode IS NULL, bpu.id > 0 ) 	)
     )
-ORDER BY bpu.receiveTime DESC,bpu.id desc;
+ORDER BY bpu.receiveTime DESC,bpu.id desc;
+
+
+ALTER TABLE `bigpartpurchase`  ADD COLUMN  `financeId` int(11) DEFAULT NULL COMMENT '财务审核id';
+ALTER TABLE  `bigpartpurchase`  ADD COLUMN  `financedate` datetime DEFAULT NULL COMMENT '财务审核时间';
+ALTER TABLE `bigbuydetail`  ADD COLUMN  `providerName` varchar(255) NOT NULL DEFAULT '' COMMENT '供应商名称';