Merge branch 'dev' of http://59.110.10.99:53000/liuc/biz_supplier_manage into dev

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SynchronousController.java

@@ -22,6 +22,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * /synchronous/receiveApprove  供应商准入审批回调接口
+ * /synchronous/receiveCategoryApprove  供应商品类准入审批回调接口
+ * /synchronous/supplierCategoryTcApprove 供应商品类退出审批回调接口
+ * /synchronous/supplierChangeApprove/  供应商变更审批回调接口
+ *
+ */
 @RestController
 @RequestMapping("/synchronous")
 public class SynchronousController {

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java

@@ -154,7 +154,7 @@ public class MessageLogAspect {
                     getSendMessage(supplier.getSupplierId(), cont, sendMessageVoList);
                 });
             }
-            //sendMessageList(sendMessageVoList);
+            sendMessageList(sendMessageVoList);
 
         }
 
@@ -187,7 +187,7 @@ public class MessageLogAspect {
             CoscoMessage coscoMessage = coscoMessageData(vo.getDeptId(), "供应商在" + vo.getDeptName() + "部门，添加黑名单" + resultast, messageType);
             coscoMessageList.add(coscoMessage);
             pustMessage(coscoMessageList);
-            //sendMessageList(sendMessageVoList);
+            sendMessageList(sendMessageVoList);
         }
     }
 
@@ -222,7 +222,7 @@ public class MessageLogAspect {
             }
 
             pustMessage(coscoMessageList);
-            //sendMessageList(sendMessageVoList);
+            sendMessageList(sendMessageVoList);
         }
     }
 
@@ -305,7 +305,7 @@ public class MessageLogAspect {
             //保存消息内容
             pustMessage(coscoMessageList);
             //发送短信
-            //sendMessageList(sendMessageVoList);
+            sendMessageList(sendMessageVoList);
         } else {
             throw new IllegalArgumentException("返回对象类型不匹配");
         }
@@ -345,7 +345,7 @@ public class MessageLogAspect {
             //保存消息
             pustMessage(coscoMessageList);
             //发送短信
-            //sendMessageList(sendMessageVoList);
+            sendMessageList(sendMessageVoList);
         } else {
             throw new IllegalArgumentException("返回对象类型不匹配");
         }
@@ -408,7 +408,7 @@ public class MessageLogAspect {
             pustMessage(coscoMessageList);
 
             //发送短信
-            //sendMessageList(sendMessageVoList);
+            sendMessageList(sendMessageVoList);
         } else {
             throw new IllegalArgumentException("返回对象类型不匹配");
         }
@@ -464,7 +464,7 @@ public class MessageLogAspect {
             //保存消息
             pustMessage(coscoMessageList);
             //发送短信
-            //sendMessageList(sendMessageVoList);
+            sendMessageList(sendMessageVoList);
         } else {
             throw new IllegalArgumentException("返回对象类型不匹配");
         }
@@ -498,7 +498,7 @@ public class MessageLogAspect {
             //消息保存
             pustMessage(coscoMessageList);
             //发送短信
-            //sendMessageList(sendMessageVoList);
+            sendMessageList(sendMessageVoList);
         } else {
             throw new IllegalArgumentException("返回对象类型不匹配");
         }
@@ -581,9 +581,9 @@ public class MessageLogAspect {
      * 发送短信
      */
     public void sendMessageList(List<SendMessageVo> sendMessageVoList) {
-        for (SendMessageVo sendMessageVo : sendMessageVoList) {
+        /*for (SendMessageVo sendMessageVo : sendMessageVoList) {
             sendMessage(sendMessageVo.getPhone(), sendMessageVo.getMessage(), sendMessageVo.getId());
-        }
+        }*/
     }
 
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java

@@ -97,4 +97,6 @@ public class CoscoCategoryLibraryVo implements Serializable {
      * 品类全名拼接
      */
     private String categoryPathName;
+
+    private String workFlowId;
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/ListCoscoCategoryLibrarySupplierApplyVo.java

@@ -78,4 +78,6 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable {
      */
     private CoscoCategoryLibrarAttachments coscoCategoryLibrarAttachments;
 
+    private String workFlowId;
+
 }

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml

@@ -226,6 +226,7 @@
         ccl.name,
         GROUP_CONCAT(DISTINCT CASE WHEN cclc.category_type = 0 THEN  cclc.category_name ELSE NULL END SEPARATOR ', ') AS categoryNames,
         GROUP_CONCAT(DISTINCT CASE WHEN cclc.category_type = 0 THEN  cclc.category_path_name ELSE NULL END SEPARATOR ', ') as categoryPathName,
+        ccl.work_flow_id as workFlowId,
         ccl.create_by,
         ccl.apply_dept_id,
         ccl.term_of_validity AS termOfValidity,

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml

@@ -235,6 +235,7 @@
         case when cclsa.approve_status=1 then '通过'
         when cclsa.approve_status=2 then '驳回'
         end as approveResult,
+        cclsa.work_flow_id as workFlowId,
         CASE
         WHEN COUNT(csb.id) = 0 THEN NULL
         WHEN COUNT(csb.id) = 1 THEN MAX(csb.name)