From 67948062ddb2efc1a0d57de99076782508a380cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Fri, 23 Aug 2024 21:15:10 +0800
Subject: [PATCH 1/3] pengyuthon

---
 room/__manifest__.py                          |   1 +
 room/controllers/__init__.py                  |   1 +
 .../controllers/main_room_yuthon.py           |   0
 room/models/room_booking.py                   |   1 +
 .../views/webclient_templates.xml             |   6 +++---
 room/wizard/room_booking_sign_wizard.xml      |   4 ++--
 website_form_room/__init__.py                 |   1 -
 website_form_room/__manifest__.py             |  11 ----------
 website_form_room/controllers/__init__.py     |   1 -
 website_form_room/static/description/icon.png | Bin 2329 -> 0 bytes
 yuthon_notice/models/yuthon_confirm_users.py  |  20 ------------------
 yuthon_notice/models/yuthon_notice.py         |   2 --
 12 files changed, 8 insertions(+), 40 deletions(-)
 rename website_form_room/controllers/main.py => room/controllers/main_room_yuthon.py (100%)
 rename {website_form_room => room}/views/webclient_templates.xml (93%)
 delete mode 100644 website_form_room/__init__.py
 delete mode 100644 website_form_room/__manifest__.py
 delete mode 100644 website_form_room/controllers/__init__.py
 delete mode 100644 website_form_room/static/description/icon.png

diff --git a/room/__manifest__.py b/room/__manifest__.py
index 43b68f973..2420d9226 100644
--- a/room/__manifest__.py
+++ b/room/__manifest__.py
@@ -15,6 +15,7 @@
         'views/room_menus.xml',
         'views/room_booking_templates_frontend.xml',
         'views/room_office_views.xml',
+        'views/webclient_templates.xml',
         'data/ir_module_category_data.xml',
         'security/ir_rule.xml',
         'security/ir.model.access.csv',
diff --git a/room/controllers/__init__.py b/room/controllers/__init__.py
index 5d4b25db9..9f2bd40b1 100644
--- a/room/controllers/__init__.py
+++ b/room/controllers/__init__.py
@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import main
+from . import main_room_yuthon
diff --git a/website_form_room/controllers/main.py b/room/controllers/main_room_yuthon.py
similarity index 100%
rename from website_form_room/controllers/main.py
rename to room/controllers/main_room_yuthon.py
diff --git a/room/models/room_booking.py b/room/models/room_booking.py
index ffc5769fb..8bc24e745 100644
--- a/room/models/room_booking.py
+++ b/room/models/room_booking.py
@@ -75,6 +75,7 @@ class RoomBooking(models.Model):
             'name': _("签到二维码"),
             'res_model': 'room.booking.sign.wizard',
             'views': [(False, 'form')],
+            'target': 'new',
             'context': {
                 'default_qrcode_image': qrcode_image,
             }
diff --git a/website_form_room/views/webclient_templates.xml b/room/views/webclient_templates.xml
similarity index 93%
rename from website_form_room/views/webclient_templates.xml
rename to room/views/webclient_templates.xml
index 135d9bbf3..eefd3307a 100644
--- a/website_form_room/views/webclient_templates.xml
+++ b/room/views/webclient_templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="website_form_room.frontend_layout" name="Frontend Layout" inherit_id="web.layout" primary="True">
+    <template id="room.frontend_layout" name="Frontend Layout" inherit_id="web.layout" primary="True">
         <xpath expr="//head/meta[last()]" position="after">
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         </xpath>
@@ -38,8 +38,8 @@
         </xpath>
     </template>
 
-    <template id="website_form_room.website_form_room" name="website form room">
-        <t t-call="website_form_room.frontend_layout">
+    <template id="room.room" name="website form room">
+        <t t-call="room.frontend_layout">
             <div class="container py-5">
                 <form class="oe_website_form_room" role="form" t-attf-action="/web/room" method="post" onsubmit="this.action = '/web/room' + location.hash">
                     <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
diff --git a/room/wizard/room_booking_sign_wizard.xml b/room/wizard/room_booking_sign_wizard.xml
index 172d987e7..384288bd2 100644
--- a/room/wizard/room_booking_sign_wizard.xml
+++ b/room/wizard/room_booking_sign_wizard.xml
@@ -5,9 +5,9 @@
         <field name="model">room.booking.sign.wizard</field>
         <field name="arch" type="xml">
             <form create="false" edit="false" delete="false">
-                <group>
+                <div class="col-12 text-center">
                     <field name="qrcode_image" widget="image" readonly="1"/>
-                </group>
+                </div>
             </form>
         </field>
     </record>
diff --git a/website_form_room/__init__.py b/website_form_room/__init__.py
deleted file mode 100644
index e046e49fb..000000000
--- a/website_form_room/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import controllers
diff --git a/website_form_room/__manifest__.py b/website_form_room/__manifest__.py
deleted file mode 100644
index eef5e99ba..000000000
--- a/website_form_room/__manifest__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-{
-    'name': '会议表单',
-    'version': '17.0',
-    'depends': ['web', 'room'],
-    'data': [
-        'views/webclient_templates.xml',
-        ],
-}
diff --git a/website_form_room/controllers/__init__.py b/website_form_room/controllers/__init__.py
deleted file mode 100644
index 12a7e529b..000000000
--- a/website_form_room/controllers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import main
diff --git a/website_form_room/static/description/icon.png b/website_form_room/static/description/icon.png
deleted file mode 100644
index b7aaac75c2d3f1b84c4d84c26abb29d310f54364..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2329
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

diff --git a/yuthon_notice/models/yuthon_confirm_users.py b/yuthon_notice/models/yuthon_confirm_users.py
index 9171c7cc4..ee9cf970f 100644
--- a/yuthon_notice/models/yuthon_confirm_users.py
+++ b/yuthon_notice/models/yuthon_confirm_users.py
@@ -13,23 +13,3 @@ class YuthonConfirmUsers(models.Model):
     notice_code = fields.Char(string="公告编号")
     notice_name = fields.Char(string="公告名称")
     state = fields.Selection([('no', '未确认'), ('yes', '已确认')], string="状态")
-
-    # @api.model_create_multi
-    # def create(self, vals_list):
-        # notice_name = vals_list[0]['notice_name']
-        # message_body = f"您有一条新的公告确认请求：{notice_name}。请登录系统查看详情。"
-        # user_id_list = []
-        # for val in vals_list:
-        #     if 'user_id' in val:
-        #         user_id_list.append(val['user_id'])
-        # partner_ids = self.sudo().env['res.users'].search([('id', 'in', user_id_list)]).mapped('partner_id').ids
-        # partner_ids = self.env['res.partner'].search([('user_id', 'in', user_id_list)]).ids
-        # self.message_post(
-        #     body=message_body,
-        #     subject="公告确认提醒",
-        #     partner_ids=[partner_id.id],  # 收件人的伙伴ID
-        #     message_type='notification',
-        # )
-        # self.sudo().with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'yuthon_notice.message_yuthon_confirm_users_data')
-        # return super().create(vals_list)
-
diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py
index f890a7050..be7f27605 100644
--- a/yuthon_notice/models/yuthon_notice.py
+++ b/yuthon_notice/models/yuthon_notice.py
@@ -79,8 +79,6 @@ class YuthonNotice(models.Model):
                         'notice_origin_id': self.id,
                     })
 
-
-
                 # 普通用户权限是否打开，可能需要配置权限
                 # 关联待办和不关联待办
                 # partner_ids = self.sudo().env['res.users'].search([('id', 'in', publish_user_list)]).mapped('partner_id').ids

From 6326c62579d299d78278b1fd86ce6b373874a810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Sat, 24 Aug 2024 17:28:05 +0800
Subject: [PATCH 2/3] pengyuthon

---
 room/data/room_wechat_cron_data.xml          |  1 -
 room/models/room_booking.py                  | 19 ++----------
 yuthon_notice/__manifest__.py                |  1 +
 yuthon_notice/data/notice_cron_data.xml      | 18 ++++++++++++
 yuthon_notice/models/yuthon_confirm_users.py | 10 +++++--
 yuthon_notice/report/notice_report.xml       | 31 --------------------
 6 files changed, 29 insertions(+), 51 deletions(-)
 create mode 100644 yuthon_notice/data/notice_cron_data.xml
 delete mode 100644 yuthon_notice/report/notice_report.xml

diff --git a/room/data/room_wechat_cron_data.xml b/room/data/room_wechat_cron_data.xml
index 1a458d825..1e30b58f6 100644
--- a/room/data/room_wechat_cron_data.xml
+++ b/room/data/room_wechat_cron_data.xml
@@ -14,6 +14,5 @@
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
         </record>
-
     </data>
 </odoo>
\ No newline at end of file
diff --git a/room/models/room_booking.py b/room/models/room_booking.py
index c23f70e08..196a17788 100644
--- a/room/models/room_booking.py
+++ b/room/models/room_booking.py
@@ -98,23 +98,8 @@ class RoomBooking(models.Model):
                         if attendee.get("userid", ""):
                             user_obj = self.sudo().env["res_users"].search([("oauth_uid", '=',  attendee.get("userid", ""))])
                             for obj in user_obj:
-                                sign_obj = self.sudo().env["res_users"].search([("sign_user_id", '=', obj.id), ("room_booking_id", "=", record.id)])
-                                if sign_obj:
-                                    sign_obj.write({
-                                        "room_booking_id": record.id,
-                                        "sign_user_id": obj.id,
-                                        "sign_user_name": obj.name,
-                                        "user_type": "insiders",
-                                        "sign_type": 'yes'
-                                    })
-                                else:
-                                    self.env["room.meeting.sign"].sudo().create({
-                                        "room_booking_id": record.id,
-                                        "sign_user_id": obj.id,
-                                        "sign_user_name": obj.name,
-                                        "user_type": "insiders",
-                                        "sign_type": 'yes'
-                                    })
+                                sign_obj = self.sudo().env["room.meeting.sign"].search([("sign_user_id", '=', obj.id), ("room_booking_id", "=", record.id)])
+                                sign_obj.write({"sign_type": 'yes'})
 
     @api.constrains("start_datetime", "stop_datetime")
     def _check_date_boundaries(self):
diff --git a/yuthon_notice/__manifest__.py b/yuthon_notice/__manifest__.py
index 15ebb3111..5c8156a93 100644
--- a/yuthon_notice/__manifest__.py
+++ b/yuthon_notice/__manifest__.py
@@ -15,6 +15,7 @@
         'security/ir.model.access.csv',
         # 'data/notice_code_data.xml',
         'data/project_state_type_data.xml',
+        'data/notice_cron_data.xml',
         'views/inherit_project_task_views.xml',
         'views/yuthon_notice_views.xml',
         'views/yuthon_notice_type_views.xml',
diff --git a/yuthon_notice/data/notice_cron_data.xml b/yuthon_notice/data/notice_cron_data.xml
new file mode 100644
index 000000000..0faba9965
--- /dev/null
+++ b/yuthon_notice/data/notice_cron_data.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data noupdate="1">
+        <!--  定时任务: 每天提醒一次  -->
+        <record forcecreate="True" id="ir_cron_yuthon_confirm_users" model="ir.cron">
+            <field name="name">公告未确认通知</field>
+            <field name="model_id" ref="model_yuthon_confirm_users"/>
+            <field name="state">code</field>
+            <field name="code">model.sync_confirm_users_notices()</field>
+            <field eval="False" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_notice/models/yuthon_confirm_users.py b/yuthon_notice/models/yuthon_confirm_users.py
index ee9cf970f..be0952e4c 100644
--- a/yuthon_notice/models/yuthon_confirm_users.py
+++ b/yuthon_notice/models/yuthon_confirm_users.py
@@ -5,11 +5,17 @@ from odoo import api, fields, models, tools
 class YuthonConfirmUsers(models.Model):
     _name = "yuthon.confirm.users"
     _description = "公告确认信息"
-    # todo 定时任务给未确认的用户发送通知公告
-    # todo 打印
 
     employee_id = fields.Many2one('hr.employee', string='员工')
     notice_id = fields.Many2one('yuthon.notice', string="公告名称")
     notice_code = fields.Char(string="公告编号")
     notice_name = fields.Char(string="公告名称")
     state = fields.Selection([('no', '未确认'), ('yes', '已确认')], string="状态")
+
+    def sync_confirm_users_notices(self):
+        menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的通知公告')])
+        for record in self.search([('state', '=', 'no')]):
+            str = 'https://www.thtzjt.com/web#id={}&cids=1&menu_id={}&action={}&model=yuthon.notice&view_type=form'.format(
+                record.notice_id.id, menu_id.id, menu_id.action.id)
+            data = "您有待确认的通知公告请及时确认\n" + "<a href=\"{}\">{}</a>".format(str, self.name)
+            record.sudo().env["wecom.apps"].sync_send_message(record.employee_id.wecom_userid, data)
diff --git a/yuthon_notice/report/notice_report.xml b/yuthon_notice/report/notice_report.xml
deleted file mode 100644
index 0b3784d5b..000000000
--- a/yuthon_notice/report/notice_report.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="yuthon_notice_report_actions" model="ir.actions.report">
-        <field name="name">通知公告打印</field>
-        <field name="model">yuthon.notice</field>
-        <field name="report_type">qweb-pdf</field>
-        <field name="report_name">yuthon_notice.yuthon_notice_report_template</field>
-        <field name="report_file">yuthon_notice.yuthon_notice_report_template</field>
-        <field name="print_report_name">'%s' % (object.name).replace('/', '')</field>
-        <field name="binding_model_id" ref="model_yuthon_notice"/>
-<!--        <field name="binding_model_id" eval="False"/>-->
-        <field name="binding_type">report</field>
-    </record>
-
-    <template id="yuthon_notice_report_template">
-        <t t-call="web.basic_layout" t-foreach="docs" t-as="doc">
-            <div class="page">
-                <h2 style="text-align:center;">
-                    <storng>
-                        <t t-esc="doc.name"/>
-                    </storng>
-                </h2>
-            </div>
-            <table width="100%" style="table-layout:fixed;">
-                <tr colspan="7" rowspan="2">
-                    <t t-esc="doc.notice_text"/>
-                </tr>
-            </table>
-        </t>
-    </template>
-</odoo>

From e5cc0d274e0452ca49a7f403d3437970eb2071e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Mon, 26 Aug 2024 09:41:39 +0800
Subject: [PATCH 3/3] pengyuthon

---
 soong_workflow/models/soong_workflow.py       | 67 +++++++++++++++++--
 soong_workflow/models/soong_workflow_mixin.py |  2 +-
 soong_workflow/views/soong_workflow_views.xml |  8 +++
 yuthon_notice/__manifest__.py                 |  3 +-
 yuthon_notice/models/__init__.py              |  2 +-
 yuthon_notice/models/yuthon_confirm_users.py  | 15 ++++-
 yuthon_notice/models/yuthon_notice.py         | 18 +++--
 .../views/yuthon_confirm_users_views.xml      |  6 +-
 yuthon_notice/views/yuthon_notice_views.xml   | 42 ++++++------
 序列号生成器/序列号.py               |  2 +-
 10 files changed, 126 insertions(+), 39 deletions(-)

diff --git a/soong_workflow/models/soong_workflow.py b/soong_workflow/models/soong_workflow.py
index 5f3822187..4822b184c 100644
--- a/soong_workflow/models/soong_workflow.py
+++ b/soong_workflow/models/soong_workflow.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+import logging
+import datetime
 from odoo import models, fields, api, _, modules
 from odoo.exceptions import ValidationError, UserError
-import logging
 
 _logger = logging.getLogger(__name__)
 
@@ -34,7 +35,7 @@ class SoongWorkflow(models.Model):
 
     _sql_constraints = [
         ("uniq_name", "unique(name)", _("Workflow name must be unique.")),
-        ("uniq_model", "unique(model_id)", _("Model must be unique.")),
+        # ("uniq_model", "unique(model_id)", _("Model must be unique.")),
     ]
 
     name = fields.Char(string="Name", help="Give workflow a name.")
@@ -44,13 +45,67 @@ class SoongWorkflow(models.Model):
     remove_default_attrs_mod = fields.Boolean(string="Remove Default Attributes & Modifiers", default=True,
         help="This option will remove default attributes set on fields & buttons of current model view in order to customized all attributes depending on your needs\nAttributes like: [required, readonly, invisible].")
     current_stage_highlight_color = fields.Char(default="rgb(0, 255, 255)", help="The color to highlight the current stage on flow",)
+    start_time = fields.Datetime(string="Start Time", copy=False)
+    end_time = fields.Datetime(string="End Time", copy=False)
+    is_enable = fields.Boolean(string="Enable", default="False", compute="compute_is_enable", store=True)
 
     def copy(self, default=None):
+        workflow_id = self.search([('model_id', '=', self.model_id.id)])
+        workflow_version = len(workflow_id) + 1
         default = dict(default or {})
-        default['name'] = ''
-        default['model_id'] = False
-        # [0,0...]
-        return super(SoongWorkflow, self).copy(default)
+        default.update({
+            'name': self.name + '-v' + str(workflow_version),
+            'model_id': False,
+            'remove_default_attrs_mod': self.remove_default_attrs_mod,
+            'current_stage_highlight_color': self.current_stage_highlight_color,
+        })
+        res = super(SoongWorkflow, self).copy(default)
+        node_dict = dict()
+        button_dict = dict()
+        # 复制节点
+        for node_id in self.node_ids:
+            new_noode_id = node_id.copy({
+                'workflow_id': res.id
+            })
+            node_dict[node_id.id] = new_noode_id.id
+            # 复制节点-按钮
+            for button_id in node_id.button_ids:
+                new_button_id = button_id.copy({
+                    'node_id': new_noode_id.id,
+                    'link_id': False
+                })
+                if button_id.link_id:
+                    if button_id.link_id.id in button_dict:
+                        button_dict[button_id.link_id.id] |= new_button_id
+                    else:
+                        button_dict[button_id.link_id.id] = new_button_id
+            # 复制节点-字段
+            for field_id in node_id.field_ids:
+                field_id.copy({
+                    'node_id': new_noode_id.id,
+                })
+        # 复制链接
+        for link_id in self.link_ids:
+            new_link_id = link_id.copy({
+                'workflow_id': res.id,
+                'node_from': node_dict[link_id.node_from.id],
+                'node_to': node_dict[link_id.node_to.id]
+            })
+            if link_id.id in button_dict:
+                for new_button_id in button_dict[link_id.id]:
+                    new_button_id.link_id = new_link_id.id
+        return res
+
+    @api.depends('start_time', 'end_time')
+    def compute_is_enable(self):
+        for rec in self:
+            if rec.start_time and rec.end_time:
+                if rec.start_time < datetime.datetime.now() and rec.end_time > datetime.datetime.now():
+                    rec.is_enable = True
+                else:
+                    rec.is_enable = False
+            else:
+                rec.is_enable = False
 
     @api.constrains("node_ids")
     def validate_nodes(self):
diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py
index 213c1aeb0..727629ccd 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -190,7 +190,7 @@ class SoongWorkflowMixin(models.AbstractModel):
         # Variables
         model = self._name
         wkf_obj = self.env["soong.workflow"]
-        wkf_rec = wkf_obj.search([("model_id", "=", model)])
+        wkf_rec = wkf_obj.search([("model_id", "=", model), ('is_enable', '=', True)])
         arch = etree.fromstring(res["arch"])
 
         # Validation
diff --git a/soong_workflow/views/soong_workflow_views.xml b/soong_workflow/views/soong_workflow_views.xml
index fef9512f0..896c58481 100644
--- a/soong_workflow/views/soong_workflow_views.xml
+++ b/soong_workflow/views/soong_workflow_views.xml
@@ -26,6 +26,11 @@
                             <field name="model_id" required="1" options="{'no_open': True, 'no_create': True}"/>
                             <field name="current_stage_highlight_color" widget="color"/>
                         </group>
+                        <group>
+                            <field name="start_time"/>
+                            <field name="end_time"/>
+                            <field name="is_enable"/>
+                        </group>
                         <div>
                             <div>
                                 <label for="remove_default_attrs_mod"/>
@@ -55,6 +60,9 @@
                 <field name="name"/>
                 <field name="model_id"/>
                 <field name="remove_default_attrs_mod"/>
+                <field name="start_time"/>
+                <field name="end_time"/>
+                <field name="is_enable"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_notice/__manifest__.py b/yuthon_notice/__manifest__.py
index 5c8156a93..f4cb26607 100644
--- a/yuthon_notice/__manifest__.py
+++ b/yuthon_notice/__manifest__.py
@@ -16,11 +16,10 @@
         # 'data/notice_code_data.xml',
         'data/project_state_type_data.xml',
         'data/notice_cron_data.xml',
-        'views/inherit_project_task_views.xml',
+        # 'views/inherit_project_task_views.xml',
         'views/yuthon_notice_views.xml',
         'views/yuthon_notice_type_views.xml',
         'views/yuthon_confirm_users_views.xml',
-        'report/notice_report.xml',
     ],
     'installable': True,
     'application': True,
diff --git a/yuthon_notice/models/__init__.py b/yuthon_notice/models/__init__.py
index 39e2dbe02..5d48b2fea 100644
--- a/yuthon_notice/models/__init__.py
+++ b/yuthon_notice/models/__init__.py
@@ -3,5 +3,5 @@
 from . import yuthon_notice
 from . import yuthon_notice_type
 from . import yuthon_confirm_users
-from . import inherit_project_task
+# from . import inherit_project_task
 
diff --git a/yuthon_notice/models/yuthon_confirm_users.py b/yuthon_notice/models/yuthon_confirm_users.py
index be0952e4c..01bd7c83c 100644
--- a/yuthon_notice/models/yuthon_confirm_users.py
+++ b/yuthon_notice/models/yuthon_confirm_users.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from odoo import api, fields, models, tools
+from odoo.exceptions import UserError, ValidationError
 
 
 class YuthonConfirmUsers(models.Model):
@@ -17,5 +18,17 @@ class YuthonConfirmUsers(models.Model):
         for record in self.search([('state', '=', 'no')]):
             str = 'https://www.thtzjt.com/web#id={}&cids=1&menu_id={}&action={}&model=yuthon.notice&view_type=form'.format(
                 record.notice_id.id, menu_id.id, menu_id.action.id)
-            data = "您有待确认的通知公告请及时确认\n" + "<a href=\"{}\">{}</a>".format(str, self.name)
+            data = "您有待确认的通知公告请确认\n" + "<a href=\"{}\">{}</a>".format(str, self.name)
             record.sudo().env["wecom.apps"].sync_send_message(record.employee_id.wecom_userid, data)
+
+    def reminders_notice(self):
+        for rem in self:
+            if rem.state == 'yes':
+                raise UserError('已确认不可催办')
+        confirm_noice_ids = self.env["yuthon.confirm.users"].browse(self._context.get('active_ids', self._context.get('active_id')))
+        for rec in confirm_noice_ids:
+            menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的通知公告')])
+            str = 'https://www.thtzjt.com/web#id={}&cids=1&menu_id={}&action={}&model=yuthon.notice&view_type=form'.format(
+                rec.notice_id.id, menu_id.id, menu_id.action.id)
+            data = "您有待确认的通知公告请尽快确认\n" + "<a href=\"{}\">{}</a>".format(str, rec.notice_id.name)
+            rec.sudo().env["wecom.apps"].sync_send_message(rec.employee_id.wecom_userid, data)
diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py
index be7f27605..eb77fcac8 100644
--- a/yuthon_notice/models/yuthon_notice.py
+++ b/yuthon_notice/models/yuthon_notice.py
@@ -13,10 +13,11 @@ class YuthonNotice(models.Model):
     name = fields.Char(string='通知公告标题')
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('notice_code'))
     user_id = fields.Many2one('res.users', string="创建人", default=lambda self: self.env.user)
-    department_id = fields.Many2one(related='user_id.employee_id.department_id', string="创建人部门")
+    department_id = fields.Many2one(related='user_id.employee_id.department_id', string="部门")
     department_ids = fields.Many2many('hr.department', string='部门范围')
     employee_ids = fields.Many2many('hr.employee', string='人员范围')
     users_role_ids = fields.Many2many('soong.user.role', string='角色范围')
+    company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '粮储')], string="公司", compute='_compute_company_page', store=True)
     notice_type_id = fields.Many2one('yuthon.notice.type', string="公告类型")
     create_date = fields.Date(string="发布日期")
     start_date = fields.Date(string="生效日期")
@@ -28,6 +29,9 @@ class YuthonNotice(models.Model):
     is_notice_roger = fields.Selection([('yes', '已读'), ('no', '未读')], default='no', string="确认状态")
     is_change_notice = fields.Boolean(string="是否发送通知", default=True)
     notice_text = fields.Html(string="正文")
+    read_number = fields.Integer(string='阅读量')
+    approval_user_id = fields.Many2one('res.users', string="审核人")
+    approval_date = fields.Datetime(string="审核日期")
 
     @api.onchange('is_notice_roger')
     def onchange_is_notice_roger(self):
@@ -72,12 +76,12 @@ class YuthonNotice(models.Model):
                     data = "您有新的通知公告请及时确认\n" + "<a href=\"{}\">{}</a>".format(str, self.name)
                     we_id = self.env['hr.employee'].search([('id', '=', user)]).wecom_userid
                     self.sudo().env["wecom.apps"].sync_send_message(we_id, data)
-                    # 待办关联
-                    self.env['project.task'].create({
-                        'name': '新的通知公告' + self.name + "请及时确认",
-                        'user_ids': [(4, user)],
-                        'notice_origin_id': self.id,
-                    })
+                    # # 待办关联
+                    # self.env['project.task'].create({
+                    #     'name': '新的通知公告' + self.name + "请及时确认",
+                    #     'user_ids': [(4, user)],
+                    #     'notice_origin_id': self.id,
+                    # })
 
                 # 普通用户权限是否打开，可能需要配置权限
                 # 关联待办和不关联待办
diff --git a/yuthon_notice/views/yuthon_confirm_users_views.xml b/yuthon_notice/views/yuthon_confirm_users_views.xml
index e9690ca97..df09d78c2 100644
--- a/yuthon_notice/views/yuthon_confirm_users_views.xml
+++ b/yuthon_notice/views/yuthon_confirm_users_views.xml
@@ -4,7 +4,11 @@
         <field name="name">yuthon.confirm.users.tree</field>
         <field name="model">yuthon.confirm.users</field>
         <field name="arch" type="xml">
-            <tree create="false" edit="false" delete="false" string="公告确认信息" editable="bottom">
+            <tree create="false" edit="false" string="公告确认信息" editable="bottom">
+                <header>
+                    <button class="oe_stat_button" name="reminders_notice" string="批量催办" type="object"
+                            icon="fa-bars"/>
+                </header>
                 <field name="employee_id"/>
                 <field name="notice_id"/>
                 <field name="notice_code"/>
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index 974a63115..8993e57a4 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -7,13 +7,16 @@
             <tree string="公告管理">
                 <field name="name"/>
                 <field name="user_id"/>
+                <field name="department_id"/>
                 <field name="notice_type_id"/>
+                <field name="company_page"/>
                 <field name="create_date"/>
                 <field name="start_date"/>
                 <field name="end_date"/>
                 <field name="statu"/>
                 <button name="on_sequence" string="置顶" invisible="sequence != 0" type="object" class="btn-primary"/>
-                <button name="no_sequence" string="取消置顶" invisible="sequence != 1" type="object" class="btn-primary"/>
+                <button name="no_sequence" string="取消置顶" invisible="sequence != 1" type="object"
+                        class="btn-primary"/>
                 <button name="stop_notice" string="终止" type="object" class="btn-primary"/>
                 <field name="sequence" column_invisible="1"/>
             </tree>
@@ -26,8 +29,10 @@
         <field name="arch" type="xml">
             <form string="公告管理">
                 <header>
-                    <button name="look_up_notice_users" string="查看确认信息" invisible="statu != 'yes'" type="object" class="btn-primary"/>
-                    <button name="notice_publish" string="发布" invisible="statu not in ['yes', 'done']" type="object" class="btn-primary"/>
+                    <button name="look_up_notice_users" string="查看确认信息" invisible="statu != 'yes'" type="object"
+                            class="btn-primary"/>
+                    <button name="notice_publish" string="发布" invisible="statu not in ['yes', 'done']" type="object"
+                            class="btn-primary"/>
                     <field name="statu" widget="statusbar"/>
                 </header>
                 <sheet>
@@ -42,6 +47,7 @@
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="department_id"/>
+                            <field name="company_page"/>
                             <field name="department_ids" widget="many2many_tags"/>
                             <field name="employee_ids" widget="many2many_tags"/>
                             <field name="users_role_ids" widget="many2many_tags"/>
@@ -108,6 +114,7 @@
             <tree string="公告管理" create="false" edit="false" delete="false">
                 <field name="name"/>
                 <field name="user_id"/>
+                <field name="department_id"/>
                 <field name="notice_type_id"/>
                 <field name="create_date"/>
                 <field name="start_date"/>
@@ -128,31 +135,28 @@
                         <field name="name" required="1"/>
                     </h1>
                 </div>
-                <group>
+                <group col="3">
                     <group>
-                        <field name="code"/>
-                        <field name="user_id"/>
-                        <field name="department_id"/>
-                        <field name="department_ids" widget="many2many_tags"/>
-                        <field name="employee_ids" widget="many2many_tags"/>
-                        <field name="users_role_ids" widget="many2many_tags"/>
                         <field name="notice_type_id"/>
-                        <field name="is_notice_roger"/>
+                        <field name="department_id"/>
                     </group>
                     <group>
+                        <field name="user_id"/>
+                        <field name="read_number"/>
+                    </group>
+                    <group>
+                        <field name="approval_user_id"/>
+                        <field name="approval_date"/>
                         <field name="create_date"/>
-                        <field name="start_date"/>
-                        <field name="end_date"/>
-                        <field name="notice_documents_ids">
-                            <tree>
-                                <field name="name"/>
-                            </tree>
-                        </field>
                     </group>
                 </group>
                 <group>
                     <field name="notice_text" widget="tinymce"/>
-                    <field name="sequence" invisible="1"/>
+                    <field name="notice_documents_ids">
+                        <tree>
+                            <field name="name"/>
+                        </tree>
+                    </field>
                 </group>
             </form>
         </field>
diff --git a/序列号生成器/序列号.py b/序列号生成器/序列号.py
index 132a85d8a..32c19b7cb 100644
--- a/序列号生成器/序列号.py
+++ b/序列号生成器/序列号.py
@@ -39,7 +39,7 @@ def rsaDecrypt(str1):
     return con
 
 
-str1 = rsaEncrypt("base#2030-04-18 23:59:59")
+str1 = rsaEncrypt("base#2050-09-18 23:59:59")
 print("加密后密文：\n%s" % str1)
 # content = rsaDecrypt('16E01254F15E539CF5B734A9A6FB3649640709796F06F5167CB5BFE542210596CE920CBFDB5E22E863983682DC326C421EF896A9D8E2CAC6B9226E89F502FDD7')
 # print("解密后明文：\n%s" % content)