Labels Milestones

盛世科技: #1

Merged

howec merged 1 commits from dev-lh into dev 1 year ago

Conversation 0 Commits 1 Files Changed 4

howec commented 1 year ago

Collaborator

1.夜班天数日报表、月报表字段添加 2.更新日报表、月报表夜班天数字段数据，（当天排班是 夜班，上班 1 和下班1都打卡 计为一天）
2.天数统计需要按照搜索条件进行更新.
3.日报表导出.
4.月报表导出.(导出并非是按照当月进行合计,是根据条件,本周,当天,本季度,上个月) 夜班统计sql用的是id(3,5,6)分别代表(两班夜班,值夜班(17:00-8:00),值夜班(8:00-8:00))

1.夜班天数日报表、月报表字段添加 2.更新日报表、月报表夜班天数字段数据，（当天排班是 夜班，上班 1 和下班1都打卡 计为一天） 2.天数统计需要按照搜索条件进行更新. 3.日报表导出. 4.月报表导出.(导出并非是按照当月进行合计,是根据条件,本周,当天,本季度,上个月) 夜班统计sql用的是id(3,5,6)分别代表(两班夜班,值夜班(17:00-8:00),值夜班(8:00-8:00))

howec added 1 commit 1 year ago

c1e961117b 盛世科技: ...

1.夜班天数日报表、月报表字段添加 2.更新日报表、月报表夜班天数字段数据，（当天排班是 夜班，上班 1 和下班1都打卡 计为一天）
2.天数统计需要按照搜索条件进行更新.
3.日报表导出.
4.月报表导出.(导出并非是按照当月进行合计,是根据条件,本周,当天,本季度,上个月)  夜班统计sql用的是id(3,5,6)分别代表(两班夜班,值夜班(17:00-8:00),值夜班(8:00-8:00))

howec merged commit 26429f2575 into dev 1 year ago

howec referenced this issue from a commit 1 year ago

Merge pull request '盛世科技:' (#1) from dev-lh into dev

The pull request has been merged as 26429f2575.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b dev-lh dev

git pull origin dev-lh

Step 2:

Merge the changes and update on Gitea.

git checkout dev

git merge --no-ff dev-lh

git push origin dev

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Set Project

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: chenwei/weaver-sskj#1

Write Preview

Loading…

Cancel

Save

There is no content yet.