Browse Source

feat: 变更新增拷贝变更令功能。ok

lanjianrong 4 years ago
parent
commit
70cea27e97
2 changed files with 10 additions and 4 deletions
  1. 5 2
      app/controller/change_controller.js
  2. 5 2
      app/service/change.js

+ 5 - 2
app/controller/change_controller.js

@@ -986,13 +986,16 @@ module.exports = app => {
             try {
                 const cid = ctx.params.cid;
                 const copy_cid = JSON.parse(ctx.request.body.data);
-                await ctx.service.change.handleCopyChange(cid, copy_cid);
+                const result = await ctx.service.change.handleCopyChange(cid, copy_cid);
+                if (!result) {
+                    responseData.err = 1;
+                    responseData.msg = '拷贝失败!';
+                }
             } catch (error) {
                 responseData.err = 1;
                 responseData.msg = error;
             }
             ctx.body = responseData;
-
         }
     }
 

+ 5 - 2
app/service/change.js

@@ -1326,9 +1326,12 @@ module.exports = app => {
          * @param {String} copy_cid - 要拷贝的变更令
          */
         async handleCopyChange(cid, copy_cid) {
-            const change = await this.getDataByCondition({ cid });
+            // const change = await this.getDataByCondition({ cid });
             const copyChange = await this.getDataByCondition({ cid: copy_cid });
-
+            return await this.update({ name: copyChange.name, peg: copyChange.peg, org_name: copyChange.org_name, org_code: copyChange.org_code, new_name: copyChange.new_name, content: copyChange.content, basis: copyChange.basis, expr: copyChange.expr, memo: copyChange.memo, type: copyChange.type,
+                class: copyChange.class, quality: copyChange.quality, company: copyChange.company, charge: copyChange.charge }, {
+                cid,
+            });
         }
     }