Selaa lähdekoodia

山西bug修改

lvzhikai 5 vuotta sitten
vanhempi
commit
cc282a39a3

+ 6 - 3
src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgmxzMapper.xml

@@ -447,7 +447,8 @@
447 447
 		a.lsdj, 
448 448
 		sum(a.srsl) as srsl, 
449 449
 		sum(a.zcsl) as zcsl, 
450
-		a.kcsl 
450
+		a.kcsl,
451
+        c.depot_id isJz
451 452
 	    from (SELECT * from business_agent_bgmxz WHERE 1=1 AND SUBSTR(house_id,1,2)!='YG' ORDER BY fssj DESC) a 
452 453
 	    LEFT JOIN business_agent b ON b.id=a.agent_id 
453 454
 	    LEFT JOIN business_agent_depot c ON c.id=a.szlk_org_id 
@@ -472,7 +473,8 @@
472 473
 		a.lsdj, 
473 474
 		sum(a.srsl) as srsl, 
474 475
 		sum(a.zcsl) as zcsl, 
475
-		a.kcsl 
476
+		a.kcsl,
477
+        c.depot_id isJz
476 478
 		from (SELECT * from business_agent_bgmxz WHERE 1=1 AND SUBSTR(house_id,1,2)='YG' AND sjly=1 ORDER BY fssj DESC) a 
477 479
 		LEFT JOIN business_agent b ON b.id=a.agent_id 
478 480
 		LEFT JOIN business_agent_depot c ON c.id=a.szlk_org_id 
@@ -496,7 +498,8 @@
496 498
 		a.lsdj, 
497 499
 		sum(a.srsl) as srsl, 
498 500
 		sum(a.zcsl) as zcsl, 
499
-		a.kcsl 
501
+		a.kcsl,
502
+        c.depot_id isJz
500 503
 		from (SELECT * from business_agent_bgmxz WHERE 1=1 AND SUBSTR(house_id,1,2)='YG' AND sjly=0 ORDER BY fssj DESC) a 
501 504
 		LEFT JOIN business_agent b ON b.id=a.agent_id 
502 505
 		LEFT JOIN business_agent_depot c ON c.id=a.szlk_org_id 

+ 2 - 1
src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentFcbgzMapper.xml

@@ -457,7 +457,8 @@
457 457
 		DATE_FORMAT(fcbgz.fssj,'%Y-%m') fssj, 
458 458
 		sum(fcbgz.srsl) as srsl, 
459 459
 		sum(fcbgz.zcsl) as zcsl, 
460
-		fcbgz.kcsl 
460
+		fcbgz.kcsl,
461
+        c.depot_id isJz
461 462
 	FROM (SELECT * FROM business_agent_fcbgz where 1=1 ORDER BY fssj desc) fcbgz 
462 463
 	LEFT JOIN business_agent b ON b.id=agent_id 
463 464
 	LEFT JOIN business_agent_depot c ON c.id=dck_id 

+ 9 - 0
src/main/java/com/chinaitop/depot/agent/bgz/model/BusinessAgentBgzz.java

@@ -37,6 +37,15 @@ public class BusinessAgentBgzz {
37 37
     private String createPerson;
38 38
 
39 39
     private Date updatetime;
40
+    private String isJz;
41
+
42
+    public String getIsJz() {
43
+        return isJz;
44
+    }
45
+
46
+    public void setIsJz(String isJz) {
47
+        this.isJz = isJz;
48
+    }
40 49
 
41 50
     /**
42 51
      * 主键

+ 9 - 0
src/main/java/com/chinaitop/depot/agent/bgz/model/BusinessAgentFcbgz.java

@@ -43,6 +43,15 @@ public class BusinessAgentFcbgz {
43 43
     private String createPerson;
44 44
 
45 45
     private Date updatetime;
46
+    private String isJz;
47
+
48
+    public String getIsJz() {
49
+        return isJz;
50
+    }
51
+
52
+    public void setIsJz(String isJz) {
53
+        this.isJz = isJz;
54
+    }
46 55
 
47 56
     /**
48 57
      * 主键