更改彻底删除为添加completeDeleted标记

modules/all_schemas/delete_schema.js

@@ -8,6 +8,7 @@ var Schema = mongoose.Schema;
 
 var deleteSchema = new Schema({
     deleted: Boolean,
+    completeDeleted: {type: Boolean, default: false},
     deleteDateTime: Date,
     deleteBy: String // userID
 });

modules/fee_rates/facade/fee_rates_facade.js

@@ -406,7 +406,7 @@ async function changeFeeRateFileFromOthers(jdata) {
 }
 
 async function getGCFeeRateFiles(userID){
-    return await feeRateFileModel.find({userID: userID, 'deleteInfo.deleted': true});
+    return await feeRateFileModel.find({userID: userID, 'deleteInfo.deleted': true, '$or': [{'deleteInfo.completeDeleted': false}, {'deleteInfo.completeDeleted': null}]});
 }
 
 async function getFeeRateByID(ID) {

modules/glj/models/unit_price_file_model.js

@@ -143,7 +143,7 @@ class UnitPriceFileModel extends BaseModel {
      * @return {Promise}
      */
     async getGCUnitPriceFiles(userID){
-        let condition = {user_id: userID, 'deleteInfo.deleted': true};
+        let condition = {user_id: userID, 'deleteInfo.deleted': true, '$or': [{'deleteInfo.completeDeleted': false}, {'deleteInfo.completeDeleted': null}]};
         let result = await this.findDataByCondition(condition, null, false);
         return result;
     }

modules/pm/controllers/pm_controller.js

@@ -367,13 +367,13 @@ module.exports = {
         try{
             for(let data of delDatas){
                 if(data.updateType === 'Project'){
-                    bulkProjs.push({deleteOne: {filter: {ID: data.ID}}});
+                    bulkProjs.push({updateOne: {filter: {ID: data.ID}, update: {'deleteInfo.completeDeleted': true}}});
                 }
                 else if(data.updateType === fileType.unitPriceFile){
-                    bulkUFs.push({deleteOne: {filter: {id: data.ID}}});
+                    bulkUFs.push({updateOne: {filter: {id: data.ID}, update: {'deleteInfo.completeDeleted': true}}});
                 }
                 else{
-                    bulkFFs.push({deleteOne: {filter: {ID: data.ID}}});
+                    bulkFFs.push({updateOne: {filter: {ID: data.ID}, update: {'deleteInfo.completeDeleted': true}}});
                 }
             }
             if(bulkProjs.length > 0){

modules/pm/models/project_model.js

@@ -416,7 +416,8 @@ ProjectsDAO.prototype.getGCFiles = async function (fileType, userID) {
             }
         }
         if (!isExist) throw '不存在此项目类型！';
-        rst = await Projects.find({userID: userID, projType: fileType, 'deleteInfo.deleted': true});
+        rst = await Projects.find(
+            {userID: userID, projType: fileType, 'deleteInfo.deleted': true, '$or': [{'deleteInfo.completeDeleted': false}, {'deleteInfo.completeDeleted': null}]});
     }
     return rst;
 };

web/building_saas/pm/js/pm_gc.js

@@ -882,7 +882,7 @@ function m_getRecDatas(oprNode){
     return rst;
 }
 
-//获取清除的额数据
+//获取清除的数据
 function m_getDelDatas(oprNode){
     let rst = [];
     if(!oprNode){