Merge branch 'ic-deliver' of gitlab.gongsibao.com:jiangyong/zhichan into ic-deliver

ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js

@@ -131,7 +131,7 @@ class BizOptCtl extends CtlBase {
    /*更新业务员信息*/
    /*更新业务员信息*/
   async updateSalesmanInfoByDemandCode(mobj, qobj, req){
   async updateSalesmanInfoByDemandCode(mobj, qobj, req){
     var pobj = mobj.d;
     var pobj = mobj.d;
-    if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.salesmanId && pobj.salesmanId != 'undefined' && pobj.salesmanName && pobj.salesmanName != 'undefined' && pobj.salesmanOpcode && pobj.salesmanOpcode != 'undefined'){
+    if (pobj.businessMode && pobj.businessMode != 'undefined'){
       try{
       try{
         var res = await this.service.findInfoByDemandCode(pobj);
         var res = await this.service.findInfoByDemandCode(pobj);
         if (res){
         if (res){
@@ -143,9 +143,15 @@ class BizOptCtl extends CtlBase {
               "oldOpcode": res.salesman_opcode,
               "oldOpcode": res.salesman_opcode,
               "oldClerkName": res.salesman_name,
               "oldClerkName": res.salesman_name,
               "oldClerkId": res.salesman_id,
               "oldClerkId": res.salesman_id,
+              "oldClerkPhone": res.salesman_phone,
+              "oldFacilitatorId": res.facilitator_id,
+              "oldFacilitatorName": res.facilitator_name,
               "newOpcode": pobj.salesmanOpcode,
               "newOpcode": pobj.salesmanOpcode,
               "newClerkName": pobj.salesmanName,
               "newClerkName": pobj.salesmanName,
-              "newClerkId": pobj.salesmanId
+              "newClerkId": pobj.salesmanId,
+              "newClerkPhone": pobj.salesmanPhone,
+              "newFacilitatorId": pobj.facilitatorId,
+              "newFacilitatorName": pobj.facilitatorName
             }
             }
           }
           }
           await this.shisService.insertInfo(sInfo);//之前业务员转历史
           await this.shisService.insertInfo(sInfo);//之前业务员转历史
@@ -267,7 +273,7 @@ class BizOptCtl extends CtlBase {
 module.exports = BizOptCtl;
 module.exports = BizOptCtl;
 
 
 // var task = new BizOptCtl();
 // var task = new BizOptCtl();
-// var obj={"d":{"businessMode":"201111093003","salesmanId":"12","salesmanName":"zhangsan","salesmanOpcode":"root/ic/zhangsan"}};
+// var obj={"d":{"businessMode":"201111093003","facilitatorId":"10","facilitatorName":"猪八戒","salesmanId":"12","salesmanName":"zhangsan","salesmanOpcode":"root/ic/zhangsan"}};
 // task.updateSalesmanInfoByDemandCode(obj,{},{}).then(d=>{
 // task.updateSalesmanInfoByDemandCode(obj,{},{}).then(d=>{
 //   console.log(d);
 //   console.log(d);
 // })
 // })

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -516,7 +516,7 @@ class DeliverybillCtl extends CtlBase {
   /*更新业务员信息*/
   /*更新业务员信息*/
   async updateSalesmanInfoByDeliverCode(mobj, qobj, req) {
   async updateSalesmanInfoByDeliverCode(mobj, qobj, req) {
     var pobj = mobj.d;
     var pobj = mobj.d;
-    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.salesmanId && pobj.salesmanId != 'undefined' && pobj.salesmanName && pobj.salesmanName != 'undefined' && pobj.salesmanOpcode && pobj.salesmanOpcode != 'undefined') {
+    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
       try {
       try {
         var res = await this.service.findInfoByDeliverCode(pobj);
         var res = await this.service.findInfoByDeliverCode(pobj);
         if (res) {
         if (res) {
@@ -528,9 +528,15 @@ class DeliverybillCtl extends CtlBase {
               "oldOpcode": res.salesman_opcode,
               "oldOpcode": res.salesman_opcode,
               "oldClerkName": res.salesman_name,
               "oldClerkName": res.salesman_name,
               "oldClerkId": res.salesman_id,
               "oldClerkId": res.salesman_id,
+              "oldClerkPhone": res.salesman_phone,
+              "oldFacilitatorId": res.facilitator_id,
+              "oldFacilitatorName": res.facilitator_name,
               "newOpcode": pobj.salesmanOpcode,
               "newOpcode": pobj.salesmanOpcode,
               "newClerkName": pobj.salesmanName,
               "newClerkName": pobj.salesmanName,
-              "newClerkId": pobj.salesmanId
+              "newClerkId": pobj.salesmanId,
+              "newClerkPhone": pobj.salesmanPhone,
+              "newFacilitatorId": pobj.facilitatorId,
+              "newFacilitatorName": pobj.facilitatorName
             }
             }
           }
           }
           await this.shisService.insertInfo(sInfo);//之前业务员转历史
           await this.shisService.insertInfo(sInfo);//之前业务员转历史
@@ -945,9 +951,8 @@ module.exports = DeliverybillCtl;
 // // var diff = task.diffDays(ss,oneYear);
 // // var diff = task.diffDays(ss,oneYear);
 // // console.log(oneYear);
 // // console.log(oneYear);
 // // console.log(diff);
 // // console.log(diff);
-// var obj={"d":{"deliverNumber":"1111111","salesmanId":"12","salesmanName":"zhangsan","salesmanOpcode":"root/ic/zhangsan"}};
+// var obj={"d":{"deliverNumber":"1111111","facilitatorId":"10","facilitatorName":"猪八戒","salesmanId":"12","salesmanName":"zhangsan","salesmanOpcode":"root/ic/zhangsan"}};
 // task.updateSalesmanInfoByDeliverCode(obj,{},{}).then(d=>{
 // task.updateSalesmanInfoByDeliverCode(obj,{},{}).then(d=>{
 //   console.log(d);
 //   console.log(d);
 //   //console.log(d[0].analyse);
 //   //console.log(d[0].analyse);
-
 // })
 // })

ic-deliver/app/base/db/impl/bizchance/bizoptDao.js

@@ -54,10 +54,24 @@ class BizoptDao extends Dao {
 
 
   /*更新业务员信息*/
   /*更新业务员信息*/
   async updateSalesmanInfoByDemandCode(qobj,t){
   async updateSalesmanInfoByDemandCode(qobj,t){
-    var setobj = { 
-      "salesman_id": qobj.salesmanId,
-      "salesman_name":qobj.salesmanName,
-      "salesman_opcode":qobj.salesmanOpcode
+    var setobj = {};
+    if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
+      setobj.salesman_id = qobj.salesmanId;
+    };
+    if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
+      setobj.salesman_name = qobj.salesmanName;
+    };
+    if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
+      setobj.salesman_opcode = qobj.salesmanOpcode;
+    };
+    if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
+      setobj.salesman_phone = qobj.salesmanPhone;
+    };
+    if (qobj.facilitatorId && qobj.facilitatorId != 'undefined') {
+      setobj.facilitator_id = qobj.facilitatorId;
+    };
+    if (qobj.facilitatorName && qobj.facilitatorName != 'undefined') {
+      setobj.facilitator_name = qobj.facilitatorName;
     };
     };
     var whereobj = { "demand_code": qobj.businessMode };
     var whereobj = { "demand_code": qobj.businessMode };
     return await this.updateByWhere(setobj, whereobj, t);
     return await this.updateByWhere(setobj, whereobj, t);

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js

@@ -86,10 +86,24 @@ class DeliverybillDao extends Dao {
 
 
   /*更新业务员信息*/
   /*更新业务员信息*/
   async updateSalesmanInfoByDeliverCode(qobj, t) {
   async updateSalesmanInfoByDeliverCode(qobj, t) {
-    var setobj = {
-      "salesman_id": qobj.salesmanId,
-      "salesman_name": qobj.salesmanName,
-      "salesman_opcode": qobj.salesmanOpcode
+    var setobj = {};
+    if (qobj.salesmanId && qobj.salesmanId != 'undefined') {
+      setobj.salesman_id = qobj.salesmanId;
+    };
+    if (qobj.salesmanName && qobj.salesmanName != 'undefined') {
+      setobj.salesman_name = qobj.salesmanName;
+    };
+    if (qobj.salesmanOpcode && qobj.salesmanOpcode != 'undefined') {
+      setobj.salesman_opcode = qobj.salesmanOpcode;
+    };
+    if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
+      setobj.salesman_phone = qobj.salesmanPhone;
+    };
+    if (qobj.facilitatorId && qobj.facilitatorId != 'undefined') {
+      setobj.facilitator_id = qobj.facilitatorId;
+    };
+    if (qobj.facilitatorName && qobj.facilitatorName != 'undefined') {
+      setobj.facilitator_name = qobj.facilitatorName;
     };
     };
     var whereobj = { "delivery_code": qobj.deliverNumber };
     var whereobj = { "delivery_code": qobj.deliverNumber };
     return await this.updateByWhere(setobj, whereobj, t);
     return await this.updateByWhere(setobj, whereobj, t);