From fd2184ee47221684ceccf93b7a65428835055253 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期三, 06 四月 2022 11:55:06 +0800
Subject: [PATCH] Merge branch 'PIPLDeploy0405'
---
force-app/main/default/classes/MaintenanceContractWebService.cls | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/classes/MaintenanceContractWebService.cls b/force-app/main/default/classes/MaintenanceContractWebService.cls
index 22ba499..1849a04 100644
--- a/force-app/main/default/classes/MaintenanceContractWebService.cls
+++ b/force-app/main/default/classes/MaintenanceContractWebService.cls
@@ -1,7 +1,7 @@
global class MaintenanceContractWebService {
// 鐢ㄦ埛鐐瑰嚮涓婁紶sap鎸夐挳锛屾洿鏂扮姸鎬佸埌濂戠害锛岃嚜鍔ㄨЕ鍙戜笂浼爏ap鎺ュ彛绋嬪簭
WebService static String up2sap(String mcid) {
- List<Maintenance_Contract__c> mcList = [select id, Status__c, Maintenance_Contract_No__c , Hospital__c , RecordTypeId, RecordType.DeveloperName from Maintenance_Contract__c where id = :mcid ];
+ List<Maintenance_Contract__c> mcList = [select id, Status__c, Maintenance_Contract_No__c , Hospital__c , RecordTypeId, RecordType.DeveloperName,Is_RecognitionModel__c,Recognition_Model_Type__c,upload_to_RM_time__c,old_Is_RecognitionModel__c,Is_Recognition_Model_True__c from Maintenance_Contract__c where id = :mcid ];
if (mcList.size() == 0) {
return '缁翠慨鍚堝悓涓嶅瓨鍦紝璇风‘璁ょ淮淇悎鍚孖D銆�';
}
@@ -9,24 +9,40 @@
if (mc.Maintenance_Contract_No__c == null || mc.Maintenance_Contract_No__c == '') {
return Schema.SObjectType.Maintenance_Contract__c.fields.Maintenance_Contract_No__c.label + '涓虹┖锛屼笉鑳戒笂浼爏ap';
}
- mc.Status__c = '濂戠磩';
- mc.upload_to_sap_time__c = Datetime.now();
-
+ //update wangweipeng 2021/11/17 start
+ //鐢ㄤ簬鍒ゆ柇褰撳墠鍚堝悓鏄惁闇�瑕佽娆�
+ boolean flag = false;
+ //鍒ゆ柇鏄惁闇�瑕佽娆惧悎鍚�
+ if(mc.old_Is_RecognitionModel__c){
+ //鍒ゆ柇褰撳墠鍚堝悓鏄惁宸茬粡璁ゆ瀹屾垚
+ if(!mc.Is_Recognition_Model_True__c){
+ flag = true;
+ }
+ }
+ //update wangweipeng 2021/11/17 end
try {
- //2021-01-14 mzy add LJPH-BWY5QB 鍚堝悓鐘舵�佷负鍚堝悓涓椂 ,灏嗗鎴蜂笂鐨� 缁翠慨鍚堝悓鐢ㄦ埛绫诲瀷 璁句负true ,鍚堝悓涓婄殑 鐢ㄦ埛绫诲瀷 涓� 鏂扮敤鎴�, 浠ュ悗缁翠慨鍚堝悓鐢ㄦ埛绫诲瀷 閮戒负 true 鍚堝悓涓婄殑 鐢ㄦ埛绫诲瀷 涓� 鏃㈡湁鐢ㄦ埛
- //鍙湁鍚堝悓鏄淮淇悎鍚屽拰鏈嶅姟鍚堝悓鐨勬椂鍊欒繘鍏�
- if (!mc.RecordType.DeveloperName.equals('VM_Contract')) {
- List<Account> acList = [select id, MaintenanceContractUserType__c from Account where id = :mc.Hospital__c];
- if (acList != null && acList.size() > 0) {
- Account hp = acList[0];
- //鑰佺敤鎴�
- if (hp.MaintenanceContractUserType__c == true) {
- mc.UserType__c = '鏃㈡湁鐢ㄦ埛';
- } else {
- //鏂扮敤鎴�
- hp.MaintenanceContractUserType__c = true;
- mc.UserType__c = '鏂扮敤鎴�';
- update hp;
+ if(flag){
+ mc.upload_to_RM_time__c = Datetime.now();//涓婁紶璁ゆ鍚堝悓鏃堕棿
+ //mc.old_Is_RecognitionModel__c = mc.Is_RecognitionModel__c;
+ }else{
+ mc.Status__c = '濂戠磩';
+ mc.upload_to_sap_time__c = Datetime.now();
+
+ //2021-01-14 mzy add LJPH-BWY5QB 鍚堝悓鐘舵�佷负鍚堝悓涓椂 ,灏嗗鎴蜂笂鐨� 缁翠慨鍚堝悓鐢ㄦ埛绫诲瀷 璁句负true ,鍚堝悓涓婄殑 鐢ㄦ埛绫诲瀷 涓� 鏂扮敤鎴�, 浠ュ悗缁翠慨鍚堝悓鐢ㄦ埛绫诲瀷 閮戒负 true 鍚堝悓涓婄殑 鐢ㄦ埛绫诲瀷 涓� 鏃㈡湁鐢ㄦ埛
+ //鍙湁鍚堝悓鏄淮淇悎鍚屽拰鏈嶅姟鍚堝悓鐨勬椂鍊欒繘鍏�
+ if (!mc.RecordType.DeveloperName.equals('VM_Contract')) {
+ List<Account> acList = [select id, MaintenanceContractUserType__c from Account where id = :mc.Hospital__c];
+ if (acList != null && acList.size() > 0) {
+ Account hp = acList[0];
+ //鑰佺敤鎴�
+ if (hp.MaintenanceContractUserType__c == true) {
+ mc.UserType__c = '鏃㈡湁鐢ㄦ埛';
+ } else {
+ //鏂扮敤鎴�
+ hp.MaintenanceContractUserType__c = true;
+ mc.UserType__c = '鏂扮敤鎴�';
+ update hp;
+ }
}
}
}
--
Gitblit v1.9.1