From c964b315dc68d10201155e4ec1b29f17afa4a990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E9=91=AB?= <695997094@qq.com>
Date: Fri, 23 Aug 2024 17:13:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=8F=AF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/Components/FormBinding/index.tsx   |  19 +++-
 .../Config/Components/FormBinding/option.tsx  |   5 +-
 .../tools/editModal/summaryFormModal.tsx      |  28 ++++-
 src/executor/tools/workForm/detail.tsx        |   2 +-
 src/ts/core/thing/standard/form.ts            | 106 ++++++++++++++++++
 5 files changed, 151 insertions(+), 9 deletions(-)

diff --git a/src/components/Common/FlowDesign/Config/Components/FormBinding/index.tsx b/src/components/Common/FlowDesign/Config/Components/FormBinding/index.tsx
index 918159137..5cbf7d5fc 100644
--- a/src/components/Common/FlowDesign/Config/Components/FormBinding/index.tsx
+++ b/src/components/Common/FlowDesign/Config/Components/FormBinding/index.tsx
@@ -21,6 +21,7 @@ interface IProps {
 }
 
 const FormBinding: React.FC<IProps> = (props) => {
+  console.log(props, 'props======>');
   const [open, setOpen] = useState<boolean>(false);
   const [forms, setForms] = useState<FormInfo[]>([]);
   useEffect(() => {
@@ -60,12 +61,22 @@ const FormBinding: React.FC<IProps> = (props) => {
           <span>
             <ShareShowComp
               key={'表单'}
-              departData={props.current.primaryForms}
+              departData={
+                props.formType === '主表'
+                  ? props.current.primaryForms
+                  : props.current.detailForms
+              }
               onClick={formViewer}
               deleteFuc={(id: string) => {
-                props.current.primaryForms = props.current.primaryForms.filter(
-                  (a) => a.id != id,
-                );
+                if (props.formType === '主表') {
+                  props.current.primaryForms = props.current.primaryForms.filter(
+                    (a) => a.id != id,
+                  );
+                } else {
+                  props.current.detailForms = props.current.detailForms.filter(
+                    (a) => a.id != id,
+                  );
+                }
                 props.current.forms = props.current.forms.filter((a) => a.id != id);
                 setForms(props.current.forms.filter((a) => a.typeName == props.formType));
               }}
diff --git a/src/components/Common/FlowDesign/Config/Components/FormBinding/option.tsx b/src/components/Common/FlowDesign/Config/Components/FormBinding/option.tsx
index 089650dcf..a2d37dc0e 100644
--- a/src/components/Common/FlowDesign/Config/Components/FormBinding/option.tsx
+++ b/src/components/Common/FlowDesign/Config/Components/FormBinding/option.tsx
@@ -12,6 +12,7 @@ const DataModal = (props: {
   isOpen: boolean;
   onClose: () => void;
 }) => {
+  console.log(props, 'props====>');
   const [mappingData, setMappingData] = useState<model.MappingData[]>(
     props.operateRule.showChangeData ?? [],
   );
@@ -137,14 +138,14 @@ export const FormOption = (props: {
       {loadOperateRule('生成', props.operateRule, 'allowGenerate')}
       {loadOperateRule('选择文件', props.operateRule, 'allowSelectFile')}
       {loadOperateRule('单位空间', props.operateRule, 'selectBelong')}
-      {props.typeName === '子表' &&
+      {props.operateRule.typeName === '子表' &&
         loadOperateRule(
           '仅显示变更数据',
           props.operateRule,
           'allowShowChangeData',
           props.departData,
         )}
-      {props.typeName === '子表' && (
+      {props.operateRule.typeName === '子表' && (
         <Space>
           <Button
             size="small"
diff --git a/src/executor/tools/editModal/summaryFormModal.tsx b/src/executor/tools/editModal/summaryFormModal.tsx
index 485937a3f..946280e82 100644
--- a/src/executor/tools/editModal/summaryFormModal.tsx
+++ b/src/executor/tools/editModal/summaryFormModal.tsx
@@ -62,7 +62,7 @@ const SummaryFormModal = ({ form, fields, belong, onSave }: IProps) => {
 
     const assetDatas = collectIds(selectMenu.children);
 
-    const intersection = async (results: any) => {
+    const intersection = async (results: any, loadOptions: any) => {
       let arr: any[] = [];
       if (results && results.length > 0) {
         results?.forEach((result: any) => {
@@ -81,6 +81,30 @@ const SummaryFormModal = ({ form, fields, belong, onSave }: IProps) => {
         });
       }
 
+      const attr = form.attributes.filter((attr) => attr.code === 'UPDATE_COUNT');
+      if (attr) {
+        const ids = arr.map((item) => item[speciesFields[0].code]);
+        const currentYear = new Date().getFullYear();
+        const applyTime = currentYear + 1 + '-12-31 23:59:59';
+        const sumResult: any = await metaForm.loadExpireSummary(
+          loadOptions,
+          applyTime,
+          ids,
+        );
+        if (sumResult && sumResult.length > 0) {
+          arr.forEach((item: any) => {
+            item['T' + attr[0].id] = 0;
+            Object.keys(item).map((key) => {
+              sumResult?.forEach((sum: any) => {
+                if (item[key] === sum[speciesFields[0].code]) {
+                  item['T' + attr[0].id] = sum.totalQuantity;
+                }
+              });
+            });
+          });
+        }
+      }
+
       const createFn = async () => {
         const promises = arr.map(async (item) => {
           const res = await kernel.createThing(belong.id, [], '');
@@ -145,7 +169,7 @@ const SummaryFormModal = ({ form, fields, belong, onSave }: IProps) => {
                   loadOptions,
                   speciesFields[0].code,
                 );
-                return await intersection(summaryResult);
+                return await intersection(summaryResult, loadOptions);
               },
             })
           }
diff --git a/src/executor/tools/workForm/detail.tsx b/src/executor/tools/workForm/detail.tsx
index c4519616b..66e9e5963 100644
--- a/src/executor/tools/workForm/detail.tsx
+++ b/src/executor/tools/workForm/detail.tsx
@@ -265,7 +265,7 @@ const DetailTable: React.FC<FormProps> = (props) => {
   async function updateModal(info: model.operationButtonInfo) {
     const metaForm = new Form(info.form?.metadata, props.service.belong.directory);
     const fields = await metaForm.loadFields();
-    let FormProps = {
+    let FormProps: any = {
       form: info.form?.metadata,
       fields: fields,
       belong: props.service.belong,
diff --git a/src/ts/core/thing/standard/form.ts b/src/ts/core/thing/standard/form.ts
index 2548255ee..4d6c27282 100644
--- a/src/ts/core/thing/standard/form.ts
+++ b/src/ts/core/thing/standard/form.ts
@@ -75,6 +75,12 @@ export interface IForm extends IStandardFileInfo<schema.XForm> {
     loadOptions: any,
     speciesId: string | undefined,
   ): Promise<{ [key: string]: number }>;
+  /** 可更新数汇总查询 */
+  loadExpireSummary(
+    loadOptions: LoadOptions,
+    applyTime: string,
+    ids: string[],
+  ): Promise<{ [key: string]: number }>;
 }
 
 const getString = (datas: any[]) => {
@@ -658,6 +664,106 @@ export class Form extends StandardFileInfo<schema.XForm> implements IForm {
     return result.data;
   }
 
+  async loadExpireSummary(
+    loadOptions: any,
+    applyTime: string,
+    ids: string[],
+  ): Promise<{ [key: string]: number }> {
+    const filters = this.summaryFields;
+    if (filters.length == 0) {
+      return {};
+    }
+    const group: { [key: string]: any } = { key: [] };
+    for (const field of filters) {
+      group[field.code] = { _sum_: '$' + field.code };
+    }
+    const match = {
+      ...loadOptions.options?.match,
+      ...common.filterConvert(JSON.stringify(loadOptions.filter ?? '[]')),
+    };
+    if (loadOptions.userData?.length > 0) {
+      if (match.labels) {
+        match._and_ = match._and_ || [];
+        match._and_.push({ labels: { _in_: loadOptions.userData } });
+        match._and_.push({ labels: { ...match.labels } });
+        delete match.labels;
+      } else {
+        match.labels = { _in_: loadOptions.userData };
+      }
+    }
+
+    const options = [
+      { match },
+      {
+        match: {
+          T527635708853231616: ids.length > 0 ? { $ne: null, _in_: ids } : { $ne: null }, // 资产分类非空
+          T527635558076391424: { $ne: null }, // 取得日期非空
+          T527635600648577024: { $ne: null }, // 数量非空
+          T527635680336158720: { $ne: null }, // 折旧撤销年限(月份)非空
+        },
+      },
+      {
+        project: {
+          T527635708853231616: 1,
+          T527635558076391424: {
+            $cond: {
+              if: {
+                $eq: [
+                  {
+                    $type: '$T527635558076391424',
+                  },
+                  'date',
+                ],
+              },
+              then: '$T527635558076391424',
+              else: {
+                $dateFromString: {
+                  dateString: '$T527635558076391424',
+                },
+              },
+            },
+          },
+          T527635600648577024: 1,
+          T527635680336158720: 1,
+          newDate: {
+            $dateAdd: {
+              startDate: applyTime,
+              unit: 'month',
+              amount: {
+                $multiply: ['$T527635680336158720', -1],
+              },
+            },
+          },
+        },
+      },
+      {
+        match: {
+          newDate: { $ne: null },
+          $expr: {
+            $lt: ['$T527635558076391424', '$newDate'],
+          },
+        },
+      },
+      {
+        group: {
+          key: 'T527635708853231616',
+          totalQuantity: {
+            $sum: '$T527635600648577024',
+          },
+        },
+      },
+      { limit: 99999999 },
+    ];
+    const result = await kernel.collectionAggregate(
+      this.target.id,
+      this.target.spaceId,
+      this.target.relations,
+      this.thingColl.collName,
+      options,
+    );
+    return result.data && result.data.length > 0 ? result.data : [];
+  }
+
   parseClassify() {
     const classifyExp = this.metadata.options?.dataRange?.classifyExp;
     try {
-- 
Gitee


From b1dce48c86666eaf1b27fe59b9e33661082f1402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E9=91=AB?= <695997094@qq.com>
Date: Fri, 23 Aug 2024 17:27:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/Components/FormBinding/index.tsx   | 20 -------------------
 .../Config/Components/FormBinding/option.tsx  |  1 -
 2 files changed, 21 deletions(-)

diff --git a/src/components/Common/FlowDesign/Config/Components/FormBinding/index.tsx b/src/components/Common/FlowDesign/Config/Components/FormBinding/index.tsx
index 1dad1e862..495cbd35f 100644
--- a/src/components/Common/FlowDesign/Config/Components/FormBinding/index.tsx
+++ b/src/components/Common/FlowDesign/Config/Components/FormBinding/index.tsx
@@ -22,7 +22,6 @@ interface IProps {
 }
 
 const FormBinding: React.FC<IProps> = (props) => {
-  console.log(props, 'props======>');
   const [open, setOpen] = useState<boolean>(false);
   const [forms, setForms] = useState<FormInfo[]>([]);
   useEffect(() => {
@@ -62,29 +61,10 @@ const FormBinding: React.FC<IProps> = (props) => {
           <span>
             <ShareShowComp
               key={'表单'}
-<<<<<<< HEAD
-              departData={
-                props.formType === '主表'
-                  ? props.current.primaryForms
-                  : props.current.detailForms
-              }
-              onClick={formViewer}
-              deleteFuc={(id: string) => {
-                if (props.formType === '主表') {
-                  props.current.primaryForms = props.current.primaryForms.filter(
-                    (a) => a.id != id,
-                  );
-                } else {
-                  props.current.detailForms = props.current.detailForms.filter(
-                    (a) => a.id != id,
-                  );
-                }
-=======
               departData={props.xforms}
               onClick={formViewer}
               deleteFuc={(id: string) => {
                 props.xforms = props.xforms.filter((a) => a.id != id);
->>>>>>> 2455b14a875590ea3a2bcc09513a41bea57898ea
                 props.current.forms = props.current.forms.filter((a) => a.id != id);
                 setForms(props.current.forms.filter((a) => a.typeName == props.formType));
               }}
diff --git a/src/components/Common/FlowDesign/Config/Components/FormBinding/option.tsx b/src/components/Common/FlowDesign/Config/Components/FormBinding/option.tsx
index a2d37dc0e..b6faafbc6 100644
--- a/src/components/Common/FlowDesign/Config/Components/FormBinding/option.tsx
+++ b/src/components/Common/FlowDesign/Config/Components/FormBinding/option.tsx
@@ -12,7 +12,6 @@ const DataModal = (props: {
   isOpen: boolean;
   onClose: () => void;
 }) => {
-  console.log(props, 'props====>');
   const [mappingData, setMappingData] = useState<model.MappingData[]>(
     props.operateRule.showChangeData ?? [],
   );
-- 
Gitee


From e4b9ad24a8d670e786f89069b038df81631bf715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E9=91=AB?= <695997094@qq.com>
Date: Fri, 23 Aug 2024 18:31:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/executor/tools/editModal/summaryFormModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/executor/tools/editModal/summaryFormModal.tsx b/src/executor/tools/editModal/summaryFormModal.tsx
index 946280e82..84ee06a6c 100644
--- a/src/executor/tools/editModal/summaryFormModal.tsx
+++ b/src/executor/tools/editModal/summaryFormModal.tsx
@@ -82,7 +82,7 @@ const SummaryFormModal = ({ form, fields, belong, onSave }: IProps) => {
       }
 
       const attr = form.attributes.filter((attr) => attr.code === 'UPDATE_COUNT');
-      if (attr) {
+      if (attr && attr.length > 0) {
         const ids = arr.map((item) => item[speciesFields[0].code]);
         const currentYear = new Date().getFullYear();
         const applyTime = currentYear + 1 + '-12-31 23:59:59';
-- 
Gitee