Commit Graph
580 Commits
Author SHA1 Message Date
liuchenglong 1214dc05b7 * Resolve confilict. 2023-05-06 01:51:00 +00:00
shenshulong 64cc586bd4 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 01:47:52 +00:00
shenshulong a09b477950 * Adjusted programplan ajaxCustom function. 2023-05-06 01:47:30 +00:00
dingguodong 1334804d34 * Replace $this->productID with $productID for better readable code. 2023-05-06 09:43:30 +08:00
liuchenglong 158152c119 * Split program plan edit function. 2023-05-06 01:41:38 +00:00
dingguodong 6023df6846 * Prepare refactor programplanModel::create(). 2023-05-06 09:41:16 +08:00
dingguodong 678d65f104 * Correct code refer to sonar. 2023-05-06 08:49:17 +08:00
dingguodong bd9e112cd6 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 08:44:37 +08:00
dingguodong c46c48f0e6 * Prepare refactor programplanModel::create. 2023-05-06 08:37:15 +08:00
jukui d00b2a0394 * Modify getSiblings function and test case for programplan model. 2023-05-05 19:19:03 +08:00
lanzongjun 36e723769d * Adjusted gantt data func. 2023-05-05 19:14:48 +08:00
shenshulong a1d135c76d * Adjusted programplan getByID test case. 2023-05-05 08:49:36 +00:00
lanzongjun 51ddaf842b * Adjusted gantt func. 2023-05-05 16:22:35 +08:00
lanzongjun 49613fe51d * Adjusted gantt func. 2023-05-05 15:47:53 +08:00
lanzongjun 4184338b87 * Adjusted file header. 2023-05-05 15:00:21 +08:00
lanzongjun 0bb3100a29 + Add programplan tao zen. 2023-05-05 14:56:25 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
朱金勇 97d9e06807 * Fix bug#34391. 2023-04-19 08:05:12 +00:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
王怡栋 bf5c829e3d Merge branch 'sprint/304_liumengyi_89851' into 'master'
* Finish task #89851.

See merge request easycorp/zentaopms!7286
2023-04-03 01:45:23 +00:00
liumengyi 295c53d6ee * Finish task #89851. 2023-04-03 09:22:02 +08:00
tianshujie d30de7b7a2 * Code for task #89153. 2023-03-29 13:23:39 +08:00
liumengyi 19fe5417de * Fix bug #32640. 2023-03-15 06:34:32 +00:00
王怡栋 49c755c8a6 Merge branch 'tsj_fixbug' into 'master'
* Add skip stash page.

See merge request easycorp/zentaopms!7188
2023-03-15 01:36:22 +00:00
tianshujie 8580b13627 * Fix bug 32911. 2023-03-14 15:05:42 +08:00
wangxuepeng 7f45a3d34f * Fixed bug #87025. 2023-03-14 05:09:14 +00:00
caoyanyi 234347cede * Update project common language. 2023-03-07 15:58:38 +08:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
孙广明 1ec9676309 Merge branch 'fixbug_liumengyi' into 'master'
* Fix bug 32578, and fix bug of set path.

See merge request easycorp/zentaopms!7118
2023-03-02 00:48:31 +00:00
Yagami 73b5269051 * Fix bug #32428. 2023-03-02 08:37:15 +08:00
liumengyi 72b0baa4cd * Fix bug #32578, and fix bug of set path. 2023-03-02 00:29:11 +00:00
王怡栋 a1c1af8469 Merge branch 'sprint/hufangzhou_bug_32426' into 'master'
* Fix bug #32426.

See merge request easycorp/zentaopms!7105
2023-03-01 10:15:30 +00:00
王怡栋 b8b59cba27 Merge branch 'sprint/hufangzhou_bug_32476' into 'master'
* Fix bug #32476.

See merge request easycorp/zentaopms!7103
2023-03-01 10:15:15 +00:00
孙广明 db4662cfbc Merge branch 'cyy_bug' into 'master'
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
2023-03-01 09:13:25 +00:00
tianshujie fdc0e3fa41 * Code for fix bug #32567. 2023-03-01 15:56:55 +08:00
liumengyi 2bcf84cf2a * Fix bug #32540. 2023-03-01 06:40:51 +00:00
liumengyi afd1f05159 * Fix bug #32423. 2023-03-01 06:03:02 +00:00
hufangzhou 4357e448f7 * Fix bug #32426. 2023-03-01 03:32:53 +00:00
hufangzhou 200af8e045 * Fix bug #32476. 2023-03-01 03:16:04 +00:00
hufangzhou e93bfa4498 * Fix bug #32518. 2023-03-01 00:55:15 +00:00
孙广明 54c3641625 Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.

See merge request easycorp/zentaopms!7086
2023-02-28 07:15:20 +00:00
liumengyi cbed975b74 * Fix bug #32477, and fix bug of change parent stage. 2023-02-28 05:44:39 +00:00
zhujinyong 39822c34a6 * Fix bug: orderBy is not defined. 2023-02-28 13:07:35 +08:00
liumengyi bcaa92b137 * Fix bug #32477. 2023-02-28 03:18:39 +00:00
liumengyi 226f798470 * Finish task #85631. 2023-02-27 08:08:07 +00:00
孙广明 167539f822 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Modify menu name.

See merge request easycorp/zentaopms!7076
2023-02-27 06:59:14 +00:00
liumengyi 599150da94 * Fix bug #32442. 2023-02-27 06:58:37 +00:00
tianshujie 16903e6247 * Modify method tip of stage create page. 2023-02-27 14:14:48 +08:00
hufangzhou 64bb25430b * Add the programplan unit testcase. 2023-02-25 03:19:49 +00:00
liumengyi 137dcf1e9a * * Optimize code for create waterfallplus execution. 2023-02-24 05:06:14 +00:00