ibizdev提交

PSMODULES/ibiz/PSCODELISTS/CodeList25/PSCODELIST.json

@@ -8,6 +8,7 @@
   "userscope" : 0,
   "valuepsdefname" : "USERNAME",
   "validflag" : 1,
+  "enablecache" : 0,
   "textpsdefid" : "ou/IBZEMP/PERSONNAME",
   "psdename" : "IBZEMP",
   "psdedsid" : "ou/IBZEMP/ProductTeamM",

PSMODULES/ibiz/PSDATAENTITIES/IBZ_MYTERRITORY/PSDATAENTITY.json

@@ -633,6 +633,52 @@
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "LEFTLCBCNT",
+    "psdatatypename" : "整型",
+    "validflag" : 1,
+    "physicalfield" : 0,
+    "codename" : "Leftlcbcnt",
+    "psdatatypeid" : "INT",
+    "pkey" : 0,
+    "logicname" : "剩余里程碑",
+    "majorfield" : 0,
+    "deftype" : 5,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[LEFTLCBCNT][剩余里程碑]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[LEFTLCBCNT][剩余里程碑]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "LEFTLCBJZCNT",
+    "psdatatypename" : "文本，可指定长度",
+    "validflag" : 1,
+    "physicalfield" : 0,
+    "codename" : "Leftlcbjzcnt",
+    "psdatatypeid" : "TEXT",
+    "pkey" : 0,
+    "logicname" : "剩余里程碑（今日到期）",
+    "majorfield" : 0,
+    "deftype" : 5,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[LEFTLCBJZCNT][剩余里程碑（今日到期）]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[LEFTLCBJZCNT][剩余里程碑（今日到期）]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "LOCKED",
@@ -952,6 +998,29 @@
       "codename" : "MobileDefault",
       "ftmode" : "MOBILEDEFAULT"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "MYTODOCNTJZ",
+    "psdatatypename" : "文本，可指定长度",
+    "validflag" : 1,
+    "physicalfield" : 0,
+    "codename" : "Mytodocntjz",
+    "psdatatypeid" : "TEXT",
+    "pkey" : 0,
+    "logicname" : "今日截止待办",
+    "majorfield" : 0,
+    "deftype" : 5,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[MYTODOCNTJZ][今日截止待办]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[MYTODOCNTJZ][今日截止待办]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "NICKNAME",
@@ -1097,6 +1166,52 @@
       "codename" : "MobileDefault",
       "ftmode" : "MOBILEDEFAULT"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "PROJECTTEAMCNT",
+    "psdatatypename" : "整型",
+    "validflag" : 1,
+    "physicalfield" : 0,
+    "codename" : "Projectteamcnt",
+    "psdatatypeid" : "INT",
+    "pkey" : 0,
+    "logicname" : "项目成员",
+    "majorfield" : 0,
+    "deftype" : 5,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[PROJECTTEAMCNT][项目成员]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[PROJECTTEAMCNT][项目成员]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "PROJECTTEAMJZCNT",
+    "psdatatypename" : "文本，可指定长度",
+    "validflag" : 1,
+    "physicalfield" : 0,
+    "codename" : "Projectteamjzcnt",
+    "psdatatypeid" : "TEXT",
+    "pkey" : 0,
+    "logicname" : "项目成员（今日截止）",
+    "majorfield" : 0,
+    "deftype" : 5,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[PROJECTTEAMJZCNT][项目成员（今日截止）]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[PROJECTTEAMJZCNT][项目成员（今日截止）]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "QQ",

PSMODULES/ibiz/PSDATAENTITIES/IBZ_MYTERRITORY/PSDEDATAQUERIES/MyWorkPm/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "MyWorkPm",
+  "logicname" : "我的工作（项目经理）",
+  "codename" : "MyWorkPm",
+  "defaultmode" : 0,
+  "custommode" : 1,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "IBZ_MYTERRITORY",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_MYTERRITORY/PSDEDATAQUERIES/MyWorkPm/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT\n\tt1.`ACCOUNT`,\n\t(select count(1) as projects from zt_project tt where tt.deleted = '0' and (tt.`status` <> 'closed' ) and tt.pm = t1.account) as  projects,\n\tconcat('已延期 ', (select count(1) as eprojects from zt_project tt where tt.deleted = '0' and (tt.`status` <> 'closed' ) and tt.`end` < DATE_FORMAT(now(),'%Y-%m-%d') and tt.pm = t1.account) ) as  eprojects,\n\t(select count(1) as LEFTLCBCNT from T_PMSEE_MILESTONE tt left JOIN t_pmsee_project t2 on t2.PMSEE_PROJECTID = tt.projectid and tt.version = t2.MILESTONEVERSION where t2.deleted = '0' and tt.`status` = '0' and t2.PMO = t1.account) as LEFTLCBCNT,\n\tconcat('今日里程碑 ',(select count(1) as LEFTLCBJZCNT from T_PMSEE_MILESTONE tt left JOIN t_pmsee_project t2 on t2.PMSEE_PROJECTID = tt.projectid and tt.version = t2.MILESTONEVERSION where t2.deleted = '0' and DATE_FORMAT(now(),'%Y-%m-%d') = DATE_FORMAT(tt.`end`,'%Y-%m-%d') and t2.PMO = t1.account)) as LEFTLCBJZCNT,\n\t(select count(1) as PROJECTTEAMCNT from (select t2.pm,tt.account from zt_team tt left join zt_project t2 on tt.root = t2.id where tt.type = 'project' and t2.PM is not null and t2.pm <> '' GROUP BY t2.PM, tt.account) tt where tt.pm = t1.account) as PROJECTTEAMCNT,\n\tconcat('今日离场 ',(select count(1) as PROJECTTEAMJZCNT  from (select t2.pm,tt.account from zt_team tt left join zt_project t2 on tt.root = t2.id where DATE_FORMAT(now(),'%Y-%m-%d') = DATE_FORMAT(DATE_ADD(tt.`join`, INTERVAL tt.days day),'%Y-%m-%d')  and tt.type = 'project' and t2.PM is not null and t2.pm <> '' GROUP BY t2.PM, tt.account) tt where tt.pm = t1.account)) as PROJECTTEAMJZCNT,\n\t(select count(1) as MYTODOCNT from zt_todo t where t.`status` in( 'doing', 'wait') and t.type = 'custom' and t.cycle = '0' and t.account = t1.account) as MYTODOCNT,\n\tconcat('今日截止 ',(select count(1) as MYTODOCNTJZ from zt_todo t where t.`status` in( 'doing', 'wait') and t.type = 'custom' and t.cycle = '0' and DATE_FORMAT(now(),'%Y-%m-%d') >= t.date and t.account = t1.account)) as MYTODOCNTJZ\nFROM\n\t(select DISTINCT t1.actor as account from zt_action t1 where t1.actor <> '' and t1.actor is not null) t1",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5"
+}
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_MYTERRITORY/PSDEDATASETS/MyWorkPm/PSDEDATASET.json

+{
+  "logicname" : "我的工作（项目经理）",
+  "codename" : "MyWorkPm",
+  "psdedatasetname" : "MyWorkPm",
+  "psdedsdqs" : [ {
+    "ordervalue" : 100,
+    "psdedqid" : "<PSDATAENTITY>/MyWorkPm"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDATAENTITY.json

@@ -128,6 +128,43 @@
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "END",
+    "psdatatypename" : "日期型",
+    "pssysdbcolumnid" : "DEFAULT/ZT_TEAM/END",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "end",
+    "psdatatypeid" : "DATE",
+    "psdetableid" : "<PSDATAENTITY>/ZT_TEAM",
+    "pkey" : 0,
+    "logicname" : "结束时间",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "tablename" : "zt_team",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[END][结束时间]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[END][结束时间]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "LTANDEQ",
+      "psdbvalueopname" : "小于等于(<=)",
+      "psdefsfitemname" : "N_END_LTANDEQ"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "END",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "ESTIMATE",
@@ -247,11 +284,57 @@
       "codename" : "MobileDefault",
       "ftmode" : "MOBILEDEFAULT"
     } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "GTANDEQ",
+      "psdbvalueopname" : "大于等于(>=)",
+      "psdefsfitemname" : "N_JOIN_GTANDEQ"
+    } ],
     "psdefdtcols" : [ {
       "psdefdtcolname" : "JOIN",
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "LEADINGCADRE",
+    "psdatatypename" : "单项选择(文本值)",
+    "pssysdbcolumnid" : "DEFAULT/ZT_TEAM/LEADINGCADRE",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "Leadingcadre",
+    "psdatatypeid" : "SSCODELIST",
+    "psdetableid" : "<PSDATAENTITY>/ZT_TEAM",
+    "pscodelistname" : "用户真实名称（动态）",
+    "pkey" : 0,
+    "length" : 60,
+    "logicname" : "当前负责人",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "pscodelistid" : "zentao/UserRealName",
+    "tablename" : "zt_team",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[LEADINGCADRE][当前负责人]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[LEADINGCADRE][当前负责人]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "psdefsfitemname" : "N_LEADINGCADRE_EQ"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "LEADINGCADRE",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "LEFT",
@@ -421,6 +504,11 @@
       "psdbvalueopid" : "EQ",
       "psdbvalueopname" : "等于(=)",
       "psdefsfitemname" : "N_ROOT_EQ"
+    }, {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "IN",
+      "psdbvalueopname" : "值在范围中(In)",
+      "psdefsfitemname" : "N_ROOT_IN"
     } ],
     "psdefdtcols" : [ {
       "psdefdtcolname" : "ROOT",
@@ -450,6 +538,45 @@
       "codename" : "MobileDefault",
       "ftmode" : "MOBILEDEFAULT"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "TEAMSTATUS",
+    "psdatatypename" : "文本，可指定长度",
+    "pssysdbcolumnid" : "DEFAULT/ZT_TEAM/TEAMSTATUS",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "Teamstatus",
+    "psdatatypeid" : "TEXT",
+    "psdetableid" : "<PSDATAENTITY>/ZT_TEAM",
+    "defaultvalue" : "10",
+    "pkey" : 0,
+    "length" : 100,
+    "logicname" : "成员状态",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "tablename" : "zt_team",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[TEAMSTATUS][成员状态]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[TEAMSTATUS][成员状态]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "psdefsfitemname" : "N_TEAMSTATUS_EQ"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "TEAMSTATUS",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
   }, {
     "enableuserinput" : 3,
     "formulafields" : "days;hours",
@@ -574,7 +701,7 @@
     "pssystemdbcfgname" : "MYSQL5",
     "pssysdmitemname" : "ZT_TEAM",
     "userflag" : 0,
-    "createsql4" : "CREATE TABLE `zt_team`(\n`JOIN`  DATETIME COMMENT '加盟日' \n,`HOURS`  DOUBLE COMMENT '可用工时/天' \n,`ID`  BIGINT(8)  UNSIGNED  NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT '编号' \n,`ROLE`  VARCHAR(30) COMMENT '角色' \n,`TYPE`  VARCHAR(7) COMMENT '团队类型' \n,`LIMITED`  VARCHAR(8) COMMENT '受限用户' \n,`ROOT`  BIGINT(8)  UNSIGNED COMMENT '产品编号' \n,`ACCOUNT`  VARCHAR(30) COMMENT '用户' \n,`DAYS`  INTEGER COMMENT '可用工日' \n,`ORDER`  INTEGER COMMENT '排序' \n,`CONSUMED`  DOUBLE COMMENT '总计消耗' \n,`LEFT`  DOUBLE COMMENT '预计剩余' \n,`ESTIMATE`  DOUBLE COMMENT '最初预计' \n)COMMENT='产品团队';",
+    "createsql4" : "CREATE TABLE `zt_team`(\n`JOIN`  DATETIME COMMENT '加盟日' \n,`HOURS`  DOUBLE COMMENT '可用工时/天' \n,`ID`  BIGINT(8)  UNSIGNED  NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT '编号' \n,`ROLE`  VARCHAR(30) COMMENT '角色' \n,`TYPE`  VARCHAR(7) COMMENT '团队类型' \n,`LIMITED`  VARCHAR(8) COMMENT '受限用户' \n,`ROOT`  BIGINT(8)  UNSIGNED COMMENT '产品编号' \n,`ACCOUNT`  VARCHAR(30) COMMENT '用户' \n,`DAYS`  INTEGER COMMENT '可用工日' \n,`ORDER`  INTEGER COMMENT '排序' \n,`CONSUMED`  DOUBLE COMMENT '总计消耗' \n,`LEFT`  DOUBLE COMMENT '预计剩余' \n,`ESTIMATE`  DOUBLE COMMENT '最初预计' \n,`END`  DATETIME COMMENT '结束时间' \n,`LEADINGCADRE`  VARCHAR(60) COMMENT '当前负责人' \n,`TEAMSTATUS`  VARCHAR(100) COMMENT '成员状态' \n)COMMENT='产品团队';",
     "testsql" : "SELECT 1 FROM `zt_team` WHERE 1<>1",
     "psobjid" : "6f370e908cfb0d5bd5fe99ce2e4d7832",
     "pssystemdbcfgid" : "MYSQL5",
@@ -609,6 +736,16 @@
     "psobjid" : "b8f34a25be23061ec8d25ac70d03b646",
     "pssystemdbcfgid" : "MYSQL5",
     "psobjname" : "DAYS"
+  }, {
+    "dbobjtype" : "COLUMN",
+    "pssystemdbcfgname" : "MYSQL5",
+    "pssysdmitemname" : "ZT_TEAM.END",
+    "userflag" : 0,
+    "createsql4" : "ALTER TABLE `zt_team`\nADD COLUMN `END`  DATETIME  COMMENT '结束时间' \n",
+    "testsql" : "SELECT `END` FROM `zt_team` WHERE 1<>1",
+    "psobjid" : "84e3d27860428585077b36293410814d",
+    "pssystemdbcfgid" : "MYSQL5",
+    "psobjname" : "END"
   }, {
     "dbobjtype" : "COLUMN",
     "pssystemdbcfgname" : "MYSQL5",
@@ -649,6 +786,16 @@
     "psobjid" : "2f9105929cd40a8e8188fc3b3b0c5c4e",
     "pssystemdbcfgid" : "MYSQL5",
     "psobjname" : "JOIN"
+  }, {
+    "dbobjtype" : "COLUMN",
+    "pssystemdbcfgname" : "MYSQL5",
+    "pssysdmitemname" : "ZT_TEAM.LEADINGCADRE",
+    "userflag" : 0,
+    "createsql4" : "ALTER TABLE `zt_team`\nADD COLUMN `LEADINGCADRE`  VARCHAR(60)  COMMENT '当前负责人' \n",
+    "testsql" : "SELECT `LEADINGCADRE` FROM `zt_team` WHERE 1<>1",
+    "psobjid" : "c373772d597b0383313ee6570f140fe4",
+    "pssystemdbcfgid" : "MYSQL5",
+    "psobjname" : "LEADINGCADRE"
   }, {
     "dbobjtype" : "COLUMN",
     "pssystemdbcfgname" : "MYSQL5",
@@ -708,6 +855,16 @@
     "psobjid" : "8178b7af1fa9966f7aef642f96c7e01a",
     "pssystemdbcfgid" : "MYSQL5",
     "psobjname" : "ROOT"
+  }, {
+    "dbobjtype" : "COLUMN",
+    "pssystemdbcfgname" : "MYSQL5",
+    "pssysdmitemname" : "ZT_TEAM.TEAMSTATUS",
+    "userflag" : 0,
+    "createsql4" : "ALTER TABLE `zt_team`\nADD COLUMN `TEAMSTATUS`  VARCHAR(100)  COMMENT '成员状态' \n",
+    "testsql" : "SELECT `TEAMSTATUS` FROM `zt_team` WHERE 1<>1",
+    "psobjid" : "0de2e1da0f313eaf2e403077195285f8",
+    "pssystemdbcfgid" : "MYSQL5",
+    "psobjname" : "TEAMSTATUS"
   }, {
     "dbobjtype" : "COLUMN",
     "pssystemdbcfgname" : "MYSQL5",

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDEDATAQUERIES/DEFAULT/PSDEDATAQUERY.json

@@ -7,9 +7,21 @@
   "custommode" : 0,
   "psdedqjoins" : [ {
     "psdedqjoinname" : "IBZ_PRODUCTTEAM",
+    "condflag" : 1,
     "psdejointypeid" : "MAIN",
     "joinpsdeid" : "<PSDATAENTITY>",
     "mainflag" : 1,
-    "psdejointypename" : "主查询"
+    "psdejointypename" : "主查询",
+    "psdedqconds" : [ {
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "condtype" : "SINGLE",
+      "psdefname" : "TYPE",
+      "psdefid" : "<PSDATAENTITY>/TYPE",
+      "psdedqid" : "<PSDEDATAQUERY>",
+      "condvalue" : "product",
+      "condvaluetext" : "产品团队",
+      "psdedqcondname" : "TYPE 等于(=) (product)"
+    } ]
   } ]
 }
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`ESTIMATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt1.`ROLE`,\nt1.`ROOT`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \n",
+  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`END`,\nt1.`ESTIMATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEADINGCADRE`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt1.`ROLE`,\nt1.`ROOT`,\nt1.`TEAMSTATUS`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -15,52 +15,69 @@
     "ordervalue" : 2,
     "psdedqcodeexpname" : "DAYS"
   }, {
-    "expcode" : "t1.`ESTIMATE`",
+    "expcode" : "t1.`END`",
     "ordervalue" : 3,
+    "psdedqcodeexpname" : "END"
+  }, {
+    "expcode" : "t1.`ESTIMATE`",
+    "ordervalue" : 4,
     "psdedqcodeexpname" : "ESTIMATE"
   }, {
     "expcode" : "t1.`HOURS`",
-    "ordervalue" : 4,
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "HOURS"
   }, {
     "expcode" : "t1.`ID`",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "ID"
   }, {
     "expcode" : "t1.`JOIN`",
-    "ordervalue" : 6,
+    "ordervalue" : 7,
     "psdedqcodeexpname" : "JOIN"
+  }, {
+    "expcode" : "t1.`LEADINGCADRE`",
+    "ordervalue" : 8,
+    "psdedqcodeexpname" : "LEADINGCADRE"
   }, {
     "expcode" : "t1.`LEFT`",
-    "ordervalue" : 7,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "LEFT"
   }, {
     "expcode" : "t1.`LIMITED`",
-    "ordervalue" : 8,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "LIMITED"
   }, {
     "expcode" : "t1.`ORDER`",
-    "ordervalue" : 9,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "ORDER"
   }, {
     "expcode" : "t1.`ROLE`",
-    "ordervalue" : 10,
+    "ordervalue" : 12,
     "psdedqcodeexpname" : "ROLE"
   }, {
     "expcode" : "t1.`ROOT`",
-    "ordervalue" : 11,
+    "ordervalue" : 13,
     "psdedqcodeexpname" : "ROOT"
+  }, {
+    "expcode" : "t1.`TEAMSTATUS`",
+    "ordervalue" : 14,
+    "psdedqcodeexpname" : "TEAMSTATUS"
   }, {
     "expcode" : "(t1.`DAYS` * t1.`HOURS`)",
-    "ordervalue" : 12,
+    "ordervalue" : 15,
     "psdedqcodeexpname" : "TOTAL"
   }, {
     "expcode" : "t1.`TYPE`",
-    "ordervalue" : 13,
+    "ordervalue" : 16,
     "psdedqcodeexpname" : "TYPE"
   }, {
     "expcode" : "(select t.realname from zt_user t where t.account = t1.account)",
-    "ordervalue" : 14,
+    "ordervalue" : 17,
     "psdedqcodeexpname" : "USERNAME"
+  } ],
+  "psdedqcodeconds" : [ {
+    "condcode" : "( t1.`TYPE` = 'product' )",
+    "psdedqcodecondname" : "查询条件",
+    "ordervalue" : 0
   } ]
 }
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDEDATAQUERIES/ProductTeamInfo/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\n\tt1.account,\n\tt1.days,\n\tt1.hours,\n\tt1.id,\n\tt1.`join`,\n\tt1.limited,\n\tt1.`order`,\n\tt1.role,\n\tt1.root,\n\t( t1.days * t1.hours ) AS total,\n\tt1.type,\n\t( SELECT t.realname FROM zt_user t WHERE t.account = t1.account ) AS username,\n\t(\nSELECT\n\tcount( t2.id ) \nFROM\n\tzt_task t2 \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project in (t1.zzz) \n\tAND t2.parent >= 0 \n\tAND (\n\tt2.assignedTo = t1.account \n\tOR t2.finishedBy = t1.account \n\tOR t2.id IN ( SELECT t.root FROM zt_team t WHERE t.type = 'task' AND t.account = t1.account ) \n\t) \n\t) AS taskcnt,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.LEFT IS NOT NULL THEN tt.LEFT ELSE t2.LEFT END ), 1) \nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project  in (t1.zzz) \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS `left`,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.estimate IS NOT NULL THEN tt.estimate ELSE t2.estimate END ), 1)\nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project  in (t1.zzz) \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS `estimate`,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.consumed IS NOT NULL THEN tt.consumed ELSE t2.consumed END ), 1)\nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project in (t1.zzz) \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS consumed \nFROM\n\t(\tSELECT *,(SELECT GROUP_CONCAT(project) from zt_projectproduct where product =  t1.root and t1.type = 'product' ) as zzz from zt_team t1\n) t1",
+  "querycode" : "SELECT\n\tt1.account,\n\tt1.days,\n\tt1.hours,\n\tt1.id,\n\tt1.`join`,\n        t1.`end`,\n        t1.`LEADINGCADRE`,\n\tt1.limited,\n\tt1.`order`,\n\tt1.role,\n\tt1.root,\n\t( t1.days * t1.hours ) AS total,\n\tt1.type,\n\t( SELECT t.realname FROM zt_user t WHERE t.account = t1.account ) AS username,\n\t(\nSELECT\n\tcount( t2.id ) \nFROM\n\tzt_task t2 \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project in (t1.zzz) \n\tAND t2.parent >= 0 \n\tAND (\n\tt2.assignedTo = t1.account \n\tOR t2.finishedBy = t1.account \n\tOR t2.id IN ( SELECT t.root FROM zt_team t WHERE t.type = 'task' AND t.account = t1.account ) \n\t) \n\t) AS taskcnt,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.LEFT IS NOT NULL THEN tt.LEFT ELSE t2.LEFT END ), 1) \nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project  in (t1.zzz) \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS `left`,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.estimate IS NOT NULL THEN tt.estimate ELSE t2.estimate END ), 1)\nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project  in (t1.zzz) \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS `estimate`,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.consumed IS NOT NULL THEN tt.consumed ELSE t2.consumed END ), 1)\nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project in (t1.zzz) \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS consumed \nFROM\n\t(\tSELECT *,(SELECT GROUP_CONCAT(project) from zt_projectproduct where product =  t1.root and t1.type = 'product' ) as zzz from zt_team t1\n) t1",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDEDATAQUERIES/ProjectApp/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "ProjectApp",
+  "logicname" : "项目立项",
+  "codename" : "ProjectApp",
+  "defaultmode" : 0,
+  "custommode" : 0,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "IBZ_PRODUCTTEAM",
+    "condflag" : 1,
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询",
+    "psdedqconds" : [ {
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "condtype" : "SINGLE",
+      "psdefname" : "ROOT",
+      "psvartypeid" : "WEBCONTEXT",
+      "psdefid" : "<PSDATAENTITY>/ROOT",
+      "psvartypename" : "网页请求上下文",
+      "psdedqid" : "<PSDEDATAQUERY>",
+      "condvalue" : "product",
+      "psdedqcondname" : "ROOT 等于(=) 网页请求上下文(product)"
+    }, {
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "condtype" : "SINGLE",
+      "psdefname" : "TYPE",
+      "psdefid" : "<PSDATAENTITY>/TYPE",
+      "psdedqid" : "<PSDEDATAQUERY>",
+      "condvalue" : "product",
+      "condvaluetext" : "产品团队",
+      "psdedqcondname" : "TYPE 等于(=) (product)"
+    } ]
+  } ]
+}
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDEDATAQUERIES/ProjectApp/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`END`,\nt1.`ESTIMATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEADINGCADRE`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt1.`ROLE`,\nt1.`ROOT`,\nt1.`TEAMSTATUS`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \n",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5",
+  "psdedqcodeexps" : [ {
+    "expcode" : "t1.`ACCOUNT`",
+    "ordervalue" : 0,
+    "psdedqcodeexpname" : "ACCOUNT"
+  }, {
+    "expcode" : "t1.`CONSUMED`",
+    "ordervalue" : 1,
+    "psdedqcodeexpname" : "CONSUMED"
+  }, {
+    "expcode" : "t1.`DAYS`",
+    "ordervalue" : 2,
+    "psdedqcodeexpname" : "DAYS"
+  }, {
+    "expcode" : "t1.`END`",
+    "ordervalue" : 3,
+    "psdedqcodeexpname" : "END"
+  }, {
+    "expcode" : "t1.`ESTIMATE`",
+    "ordervalue" : 4,
+    "psdedqcodeexpname" : "ESTIMATE"
+  }, {
+    "expcode" : "t1.`HOURS`",
+    "ordervalue" : 5,
+    "psdedqcodeexpname" : "HOURS"
+  }, {
+    "expcode" : "t1.`ID`",
+    "ordervalue" : 6,
+    "psdedqcodeexpname" : "ID"
+  }, {
+    "expcode" : "t1.`JOIN`",
+    "ordervalue" : 7,
+    "psdedqcodeexpname" : "JOIN"
+  }, {
+    "expcode" : "t1.`LEADINGCADRE`",
+    "ordervalue" : 8,
+    "psdedqcodeexpname" : "LEADINGCADRE"
+  }, {
+    "expcode" : "t1.`LEFT`",
+    "ordervalue" : 9,
+    "psdedqcodeexpname" : "LEFT"
+  }, {
+    "expcode" : "t1.`LIMITED`",
+    "ordervalue" : 10,
+    "psdedqcodeexpname" : "LIMITED"
+  }, {
+    "expcode" : "t1.`ORDER`",
+    "ordervalue" : 11,
+    "psdedqcodeexpname" : "ORDER"
+  }, {
+    "expcode" : "t1.`ROLE`",
+    "ordervalue" : 12,
+    "psdedqcodeexpname" : "ROLE"
+  }, {
+    "expcode" : "t1.`ROOT`",
+    "ordervalue" : 13,
+    "psdedqcodeexpname" : "ROOT"
+  }, {
+    "expcode" : "t1.`TEAMSTATUS`",
+    "ordervalue" : 14,
+    "psdedqcodeexpname" : "TEAMSTATUS"
+  }, {
+    "expcode" : "(t1.`DAYS` * t1.`HOURS`)",
+    "ordervalue" : 15,
+    "psdedqcodeexpname" : "TOTAL"
+  }, {
+    "expcode" : "t1.`TYPE`",
+    "ordervalue" : 16,
+    "psdedqcodeexpname" : "TYPE"
+  }, {
+    "expcode" : "(select t.realname from zt_user t where t.account = t1.account)",
+    "ordervalue" : 17,
+    "psdedqcodeexpname" : "USERNAME"
+  } ],
+  "psdedqcodeconds" : [ {
+    "condcode" : "( t1.`ROOT` = ${srfwebcontext('product','{\"defname\":\"ROOT\",\"dename\":\"IBZ_PRODUCTTEAM\"}')}  AND  t1.`TYPE` = 'product' )",
+    "psdedqcodecondname" : "查询条件",
+    "ordervalue" : 0
+  } ]
+}
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDEDATAQUERIES/RowEditDefaultProductTeam/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\n\tt1.* \nFROM\n\t(\nSELECT\n\tt1.`ACCOUNT`,\n\tt1.`CONSUMED`,\n\tt1.`DAYS`,\n\tt1.`ESTIMATE`,\n\tt1.`HOURS`,\n\tt1.id as `ID`,\n\tt1.`JOIN`,\n\tt1.`LEFT`,\n\tt1.`LIMITED`,\n\tt1.`ORDER`,\n\tt1.`ROLE`,\n\tt1.`ROOT`,\n\t( t1.`DAYS` * t1.`HOURS` ) AS `TOTAL`,\n\tt1.`TYPE`,\n\tt2.`realname` AS `USERNAME` \nFROM\n\t`zt_team` t1\n\tLEFT JOIN `zt_user` t2 ON t2.`account` = t1.`account` \n\tunion \n\tSELECT\n\tt1.`ACCOUNT`,\n\t0 AS `CONSUMED`,\n\t((select SUM(tt.days) from zt_project tt where  FIND_IN_SET(tt.id,(SELECT GROUP_CONCAT(project) FROM zt_projectproduct where product = #{srf.datacontext.root} )\n\t)) )\n\tAS `DAYS`,\n\t0 AS `ESTIMATE`,\n\t7 AS `HOURS`,\n\tnull as `ID`,\n\t'2020-07-13' AS `JOIN`,\n\t0 AS `LEFT`,\n\t'no' AS `LIMITED`,\n\t0 AS `ORDER`,\n\tt3.`name` as `ROLE`,\n\t#{srf.datacontext.root} \n\tas `ROOT`,\n\t90 AS `TOTAL`,\n\t'product' AS `TYPE`,\n\tt2.`realname` AS `USERNAME` \nFROM\n\t`zt_team` t1\n\tLEFT JOIN `zt_user` t2 ON t2.`account` = t1.`account` \n        left join zt_group t3 on t2.role = t3.role\n\twhere t1.type = 'product' and t1.root = #{srf.datacontext.teams} \n\tand t1.account not in (select  t.account from zt_team t where t.root = #{srf.datacontext.root} \n\tand t.type = 'product')\n\tunion \n\tSELECT\n\tt2.`ACCOUNT`,\n\t0 AS `CONSUMED`,\n\t((select SUM(tt.days) from zt_project tt where  FIND_IN_SET(tt.id,(SELECT GROUP_CONCAT(project) FROM zt_projectproduct where product = #{srf.datacontext.root} )\n\t)) )\n\tAS `DAYS`,\n\t0 AS `ESTIMATE`,\n\t7 AS `HOURS`,\n\tnull as `ID`,\n\t'2020-07-13' AS `JOIN`,\n\t0 AS `LEFT`,\n\t'no' AS `LIMITED`,\n\t0 AS `ORDER`,\n\tt3.`name` as `ROLE`,\n\t#{srf.datacontext.root}\n\tas `ROOT`,\n\t90 AS `TOTAL`,\n\t'product' AS `TYPE`,\n\tt2.`realname` AS `USERNAME` \nFROM\n\t`zt_dept` t1\n\tLEFT JOIN `zt_user` t2 ON t2.`dept` = t1.`id` \n\tleft join zt_group t3 on t2.role = t3.role\n\twhere t1.id = #{srf.datacontext.dept} \n\tand t2.account is not null and t2.account not in (select  t.account from zt_team t where t.root = #{srf.datacontext.root} \n\tand t.type = 'product')\n\t) t1",
+  "querycode" : "SELECT\n\tt1.* \nFROM\n\t(\nSELECT\n\tt1.`ACCOUNT`,\n\tt1.`CONSUMED`,\n\tt1.`DAYS`,\n        t1.`end`,\n        t1.`LEADINGCADRE`,\n\tt1.`ESTIMATE`,\n\tt1.`HOURS`,\n\tt1.id as `ID`,\n\tt1.`JOIN`,\n\tt1.`LEFT`,\n\tt1.`LIMITED`,\n\tt1.`ORDER`,\n\tt1.`ROLE`,\n\tt1.`ROOT`,\n\t( t1.`DAYS` * t1.`HOURS` ) AS `TOTAL`,\n\tt1.`TYPE`,\n\tt2.`realname` AS `USERNAME` \nFROM\n\t`zt_team` t1\n\tLEFT JOIN `zt_user` t2 ON t2.`account` = t1.`account` \n\tunion \n\tSELECT\n\tt1.`ACCOUNT`,\n\t0 AS `CONSUMED`,\n\t((select SUM(tt.days) from zt_project tt where  FIND_IN_SET(tt.id,(SELECT GROUP_CONCAT(project) FROM zt_projectproduct where product = #{srf.datacontext.root} )\n\t)) )\n\tAS `DAYS`,\n        null as `end`,\n        null as `LEADINGCADRE`,\n\t0 AS `ESTIMATE`,\n\t7 AS `HOURS`,\n\tnull as `ID`,\n\t'2020-07-13' AS `JOIN`,\n\t0 AS `LEFT`,\n\t'no' AS `LIMITED`,\n\t0 AS `ORDER`,\n\tt3.`name` as `ROLE`,\n\t#{srf.datacontext.root} \n\tas `ROOT`,\n\t90 AS `TOTAL`,\n\t'product' AS `TYPE`,\n\tt2.`realname` AS `USERNAME` \nFROM\n\t`zt_team` t1\n\tLEFT JOIN `zt_user` t2 ON t2.`account` = t1.`account` \n        left join zt_group t3 on t2.role = t3.role\n\twhere t1.type = 'product' and t1.root = #{srf.datacontext.teams} \n\tand t1.account not in (select  t.account from zt_team t where t.root = #{srf.datacontext.root} \n\tand t.type = 'product')\n\tunion \n\tSELECT\n\tt2.`ACCOUNT`,\n\t0 AS `CONSUMED`,\n\t((select SUM(tt.days) from zt_project tt where  FIND_IN_SET(tt.id,(SELECT GROUP_CONCAT(project) FROM zt_projectproduct where product = #{srf.datacontext.root} )\n\t)) )\n\tAS `DAYS`,\n        null as `end`,\n        null as `LEADINGCADRE`,\n\t0 AS `ESTIMATE`,\n\t7 AS `HOURS`,\n\tnull as `ID`,\n\t'2020-07-13' AS `JOIN`,\n\t0 AS `LEFT`,\n\t'no' AS `LIMITED`,\n\t0 AS `ORDER`,\n\tt3.`name` as `ROLE`,\n\t#{srf.datacontext.root}\n\tas `ROOT`,\n\t90 AS `TOTAL`,\n\t'product' AS `TYPE`,\n\tt2.`realname` AS `USERNAME` \nFROM\n\t`zt_dept` t1\n\tLEFT JOIN `zt_user` t2 ON t2.`dept` = t1.`id` \n\tleft join zt_group t3 on t2.role = t3.role\n\twhere t1.id = #{srf.datacontext.dept} \n\tand t2.account is not null and t2.account not in (select  t.account from zt_team t where t.root = #{srf.datacontext.root} \n\tand t.type = 'product')\n\t) t1",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`ESTIMATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt1.`ROLE`,\nt1.`ROOT`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \n",
+  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`END`,\nt1.`ESTIMATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEADINGCADRE`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt1.`ROLE`,\nt1.`ROOT`,\nt1.`TEAMSTATUS`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -15,52 +15,64 @@
     "ordervalue" : 2,
     "psdedqcodeexpname" : "DAYS"
   }, {
-    "expcode" : "t1.`ESTIMATE`",
+    "expcode" : "t1.`END`",
     "ordervalue" : 3,
+    "psdedqcodeexpname" : "END"
+  }, {
+    "expcode" : "t1.`ESTIMATE`",
+    "ordervalue" : 4,
     "psdedqcodeexpname" : "ESTIMATE"
   }, {
     "expcode" : "t1.`HOURS`",
-    "ordervalue" : 4,
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "HOURS"
   }, {
     "expcode" : "t1.`ID`",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "ID"
   }, {
     "expcode" : "t1.`JOIN`",
-    "ordervalue" : 6,
+    "ordervalue" : 7,
     "psdedqcodeexpname" : "JOIN"
+  }, {
+    "expcode" : "t1.`LEADINGCADRE`",
+    "ordervalue" : 8,
+    "psdedqcodeexpname" : "LEADINGCADRE"
   }, {
     "expcode" : "t1.`LEFT`",
-    "ordervalue" : 7,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "LEFT"
   }, {
     "expcode" : "t1.`LIMITED`",
-    "ordervalue" : 8,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "LIMITED"
   }, {
     "expcode" : "t1.`ORDER`",
-    "ordervalue" : 9,
+    "ordervalue" : 11,
     "psdedqcodeexpname" : "ORDER"
   }, {
     "expcode" : "t1.`ROLE`",
-    "ordervalue" : 10,
+    "ordervalue" : 12,
     "psdedqcodeexpname" : "ROLE"
   }, {
     "expcode" : "t1.`ROOT`",
-    "ordervalue" : 11,
+    "ordervalue" : 13,
     "psdedqcodeexpname" : "ROOT"
+  }, {
+    "expcode" : "t1.`TEAMSTATUS`",
+    "ordervalue" : 14,
+    "psdedqcodeexpname" : "TEAMSTATUS"
   }, {
     "expcode" : "(t1.`DAYS` * t1.`HOURS`)",
-    "ordervalue" : 12,
+    "ordervalue" : 15,
     "psdedqcodeexpname" : "TOTAL"
   }, {
     "expcode" : "t1.`TYPE`",
-    "ordervalue" : 13,
+    "ordervalue" : 16,
     "psdedqcodeexpname" : "TYPE"
   }, {
     "expcode" : "(select t.realname from zt_user t where t.account = t1.account)",
-    "ordervalue" : 14,
+    "ordervalue" : 17,
     "psdedqcodeexpname" : "USERNAME"
   } ]
 }
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PRODUCTTEAM/PSDEDATASETS/ProjectApp/PSDEDATASET.json

+{
+  "logicname" : "项目立项",
+  "codename" : "ProjectApp",
+  "psdedatasetname" : "ProjectApp",
+  "psdedsdqs" : [ {
+    "ordervalue" : 100,
+    "psdedqid" : "<PSDATAENTITY>/ProjectApp"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PROJECTTEAM/PSDATAENTITY.json

@@ -184,6 +184,35 @@
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "EXITDATE",
+    "psdatatypename" : "日期型",
+    "validflag" : 1,
+    "physicalfield" : 0,
+    "codename" : "Exitdate",
+    "psdatatypeid" : "DATE",
+    "pkey" : 0,
+    "logicname" : "退场时间",
+    "majorfield" : 0,
+    "deftype" : 2,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "formulaformat" : "DATE_ADD(t1.`join`, INTERVAL t1.days day)",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[EXITDATE][退场时间]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[EXITDATE][退场时间]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "EXITDATE",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "HOURS",
@@ -393,6 +422,81 @@
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "PM",
+    "psdatatypename" : "外键值附加数据",
+    "validflag" : 1,
+    "derpsdefid" : "zentao/ZT_PROJECT/PM",
+    "physicalfield" : 0,
+    "codename" : "PM",
+    "psdatatypeid" : "PICKUPDATA",
+    "derpsdefname" : "PM",
+    "pkey" : 0,
+    "logicname" : "项目经理",
+    "majorfield" : 0,
+    "deftype" : 3,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdername" : "DER1N_IBZ_PROJECTTEAM_ZT_PROJECT_ROOT",
+    "psderid" : "<PSDATAENTITY>/DER1N_IBZ_PROJECTTEAM_ZT_PROJECT_ROOT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[PM][项目经理]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[PM][项目经理]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "PM",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "PROJECTNAME",
+    "psdatatypename" : "外键值文本",
+    "validflag" : 1,
+    "derpsdefid" : "zentao/ZT_PROJECT/NAME",
+    "physicalfield" : 0,
+    "codename" : "ProjectName",
+    "psdatatypeid" : "PICKUPTEXT",
+    "derpsdefname" : "NAME",
+    "pkey" : 0,
+    "logicname" : "所属项目",
+    "majorfield" : 0,
+    "deftype" : 3,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdername" : "DER1N_IBZ_PROJECTTEAM_ZT_PROJECT_ROOT",
+    "psderid" : "<PSDATAENTITY>/DER1N_IBZ_PROJECTTEAM_ZT_PROJECT_ROOT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[PROJECTNAME][所属项目]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[PROJECTNAME][所属项目]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "psdefsfitemname" : "N_PROJECTNAME_EQ"
+    }, {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "LIKE",
+      "psdbvalueopname" : "文本包含(%)",
+      "psdefsfitemname" : "N_PROJECTNAME_LIKE"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "PROJECTNAME",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "ROLE",

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PROJECTTEAM/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`ESTIMATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt1.`ROLE`,\nt1.`ROOT`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \n",
+  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`ESTIMATE`,\nDATE_ADD(t1.`join`, INTERVAL t1.days day) AS `EXITDATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt11.`PM`,\nt11.`NAME` AS `PROJECTNAME`,\nt1.`ROLE`,\nt1.`ROOT`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \nLEFT JOIN `zt_project` t11 ON t1.`ROOT` = t11.`ID` \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -19,48 +19,60 @@
     "ordervalue" : 3,
     "psdedqcodeexpname" : "ESTIMATE"
   }, {
-    "expcode" : "t1.`HOURS`",
+    "expcode" : "DATE_ADD(t1.`join`, INTERVAL t1.days day)",
     "ordervalue" : 4,
+    "psdedqcodeexpname" : "EXITDATE"
+  }, {
+    "expcode" : "t1.`HOURS`",
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "HOURS"
   }, {
     "expcode" : "t1.`ID`",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "ID"
   }, {
     "expcode" : "t1.`JOIN`",
-    "ordervalue" : 6,
+    "ordervalue" : 7,
     "psdedqcodeexpname" : "JOIN"
   }, {
     "expcode" : "t1.`LEFT`",
-    "ordervalue" : 7,
+    "ordervalue" : 8,
     "psdedqcodeexpname" : "LEFT"
   }, {
     "expcode" : "t1.`LIMITED`",
-    "ordervalue" : 8,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "LIMITED"
   }, {
     "expcode" : "t1.`ORDER`",
-    "ordervalue" : 9,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "ORDER"
+  }, {
+    "expcode" : "t11.`PM`",
+    "ordervalue" : 11,
+    "psdedqcodeexpname" : "PM"
+  }, {
+    "expcode" : "t11.`NAME`",
+    "ordervalue" : 12,
+    "psdedqcodeexpname" : "PROJECTNAME"
   }, {
     "expcode" : "t1.`ROLE`",
-    "ordervalue" : 10,
+    "ordervalue" : 13,
     "psdedqcodeexpname" : "ROLE"
   }, {
     "expcode" : "t1.`ROOT`",
-    "ordervalue" : 11,
+    "ordervalue" : 14,
     "psdedqcodeexpname" : "ROOT"
   }, {
     "expcode" : "(t1.`DAYS` * t1.`HOURS`)",
-    "ordervalue" : 12,
+    "ordervalue" : 15,
     "psdedqcodeexpname" : "TOTAL"
   }, {
     "expcode" : "t1.`TYPE`",
-    "ordervalue" : 13,
+    "ordervalue" : 16,
     "psdedqcodeexpname" : "TYPE"
   }, {
     "expcode" : "(select t.realname from zt_user t where t.account = t1.account)",
-    "ordervalue" : 14,
+    "ordervalue" : 17,
     "psdedqcodeexpname" : "USERNAME"
   } ],
   "psdedqcodeconds" : [ {

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PROJECTTEAM/PSDEDATAQUERIES/ProjectTeamPm/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "ProjectTeamPm",
+  "logicname" : "项目成员（项目经理）",
+  "codename" : "ProjectTeamPm",
+  "defaultmode" : 0,
+  "custommode" : 1,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "IBZ_PROJECTTEAM",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PROJECTTEAM/PSDEDATAQUERIES/ProjectTeamPm/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT\n\tt1.account,\n\tt1.days,\n\tt1.hours,\n\tt1.id,\n\tt1.`join`,\n\tt1.limited,\n\tt1.`order`,\n\tt1.role,\n\tt1.root,\n\t( t1.days * t1.hours ) AS total,\n\tt1.type,\n\t( SELECT t.realname FROM zt_user t WHERE t.account = t1.account ) AS username,\n\t(\nSELECT\n\tcount( t2.id ) \nFROM\n\tzt_task t2 \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project = t1.root \n\tAND t2.parent >= 0 \n\tAND (\n\tt2.assignedTo = t1.account \n\tOR t2.finishedBy = t1.account \n\tOR t2.id IN ( SELECT t.root FROM zt_team t WHERE t.type = 'task' AND t.account = t1.account ) \n\t) \n\t) AS taskcnt,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.LEFT IS NOT NULL THEN tt.LEFT ELSE t2.LEFT END ), 1) \nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project = t1.root \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS `left`,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.estimate IS NOT NULL THEN tt.estimate ELSE t2.estimate END ), 1)\nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project = t1.root \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS `estimate`,\n\t(\nSELECT\n\tROUND(sum( CASE WHEN tt.consumed IS NOT NULL THEN tt.consumed ELSE t2.consumed END ), 1)\nFROM\n\tzt_task t2\n\tLEFT JOIN zt_team tt ON tt.root = t2.id \n\tAND tt.type = 'task' \nWHERE\n\tt2.deleted = '0' \n\tAND t2.project = t1.root \n\tAND t2.parent >= 0 \n\tAND ( t2.assignedTo = t1.account OR tt.account = t1.account ) \n\t) AS consumed ,\n\tt11.`PM`,\nt11.`NAME` AS `PROJECTNAME`,\nDATE_ADD(t1.`join`, INTERVAL t1.days day) as Exitdate\nFROM\n\tzt_team t1 \n\tLEFT JOIN `zt_project` t11 ON t1.`ROOT` = t11.`ID`",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5",
+  "psdedqcodeexps" : [ {
+    "expcode" : "t1.`ACCOUNT`",
+    "ordervalue" : 0,
+    "psdedqcodeexpname" : "ACCOUNT"
+  }, {
+    "expcode" : "t1.`CONSUMED`",
+    "ordervalue" : 1,
+    "psdedqcodeexpname" : "CONSUMED"
+  }, {
+    "expcode" : "t1.`DAYS`",
+    "ordervalue" : 2,
+    "psdedqcodeexpname" : "DAYS"
+  }, {
+    "expcode" : "t1.`ESTIMATE`",
+    "ordervalue" : 3,
+    "psdedqcodeexpname" : "ESTIMATE"
+  }, {
+    "expcode" : "t1.`HOURS`",
+    "ordervalue" : 4,
+    "psdedqcodeexpname" : "HOURS"
+  }, {
+    "expcode" : "t1.`ID`",
+    "ordervalue" : 5,
+    "psdedqcodeexpname" : "ID"
+  }, {
+    "expcode" : "t1.`JOIN`",
+    "ordervalue" : 6,
+    "psdedqcodeexpname" : "JOIN"
+  }, {
+    "expcode" : "t1.`LEFT`",
+    "ordervalue" : 7,
+    "psdedqcodeexpname" : "LEFT"
+  }, {
+    "expcode" : "t1.`LIMITED`",
+    "ordervalue" : 8,
+    "psdedqcodeexpname" : "LIMITED"
+  }, {
+    "expcode" : "t1.`ORDER`",
+    "ordervalue" : 9,
+    "psdedqcodeexpname" : "ORDER"
+  }, {
+    "expcode" : "t1.`ROLE`",
+    "ordervalue" : 10,
+    "psdedqcodeexpname" : "ROLE"
+  }, {
+    "expcode" : "t1.`ROOT`",
+    "ordervalue" : 11,
+    "psdedqcodeexpname" : "ROOT"
+  }, {
+    "expcode" : "(t1.`DAYS` * t1.`HOURS`)",
+    "ordervalue" : 12,
+    "psdedqcodeexpname" : "TOTAL"
+  }, {
+    "expcode" : "t1.`TYPE`",
+    "ordervalue" : 13,
+    "psdedqcodeexpname" : "TYPE"
+  }, {
+    "expcode" : "(select t.realname from zt_user t where t.account = t1.account)",
+    "ordervalue" : 14,
+    "psdedqcodeexpname" : "USERNAME"
+  } ],
+  "psdedqcodeconds" : [ {
+    "condcode" : "( t11.`PM` =  ${srfsessioncontext('srfloginname','{\"defname\":\"PM\",\"dename\":\"ZT_PROJECT\"}')} )",
+    "psdedqcodecondname" : "查询条件",
+    "ordervalue" : 0
+  } ]
+}
\ No newline at end of file

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PROJECTTEAM/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`ESTIMATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt1.`ROLE`,\nt1.`ROOT`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \n",
+  "querycode" : "SELECT\nt1.`ACCOUNT`,\nt1.`CONSUMED`,\nt1.`DAYS`,\nt1.`ESTIMATE`,\nDATE_ADD(t1.`join`, INTERVAL t1.days day) AS `EXITDATE`,\nt1.`HOURS`,\nt1.`ID`,\nt1.`JOIN`,\nt1.`LEFT`,\nt1.`LIMITED`,\nt1.`ORDER`,\nt11.`PM`,\nt11.`NAME` AS `PROJECTNAME`,\nt1.`ROLE`,\nt1.`ROOT`,\n(t1.`DAYS` * t1.`HOURS`) AS `TOTAL`,\nt1.`TYPE`,\n(select t.realname from zt_user t where t.account = t1.account) AS `USERNAME`\nFROM `zt_team` t1 \nLEFT JOIN `zt_project` t11 ON t1.`ROOT` = t11.`ID` \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {
@@ -19,48 +19,60 @@
     "ordervalue" : 3,
     "psdedqcodeexpname" : "ESTIMATE"
   }, {
-    "expcode" : "t1.`HOURS`",
+    "expcode" : "DATE_ADD(t1.`join`, INTERVAL t1.days day)",
     "ordervalue" : 4,
+    "psdedqcodeexpname" : "EXITDATE"
+  }, {
+    "expcode" : "t1.`HOURS`",
+    "ordervalue" : 5,
     "psdedqcodeexpname" : "HOURS"
   }, {
     "expcode" : "t1.`ID`",
-    "ordervalue" : 5,
+    "ordervalue" : 6,
     "psdedqcodeexpname" : "ID"
   }, {
     "expcode" : "t1.`JOIN`",
-    "ordervalue" : 6,
+    "ordervalue" : 7,
     "psdedqcodeexpname" : "JOIN"
   }, {
     "expcode" : "t1.`LEFT`",
-    "ordervalue" : 7,
+    "ordervalue" : 8,
     "psdedqcodeexpname" : "LEFT"
   }, {
     "expcode" : "t1.`LIMITED`",
-    "ordervalue" : 8,
+    "ordervalue" : 9,
     "psdedqcodeexpname" : "LIMITED"
   }, {
     "expcode" : "t1.`ORDER`",
-    "ordervalue" : 9,
+    "ordervalue" : 10,
     "psdedqcodeexpname" : "ORDER"
+  }, {
+    "expcode" : "t11.`PM`",
+    "ordervalue" : 11,
+    "psdedqcodeexpname" : "PM"
+  }, {
+    "expcode" : "t11.`NAME`",
+    "ordervalue" : 12,
+    "psdedqcodeexpname" : "PROJECTNAME"
   }, {
     "expcode" : "t1.`ROLE`",
-    "ordervalue" : 10,
+    "ordervalue" : 13,
     "psdedqcodeexpname" : "ROLE"
   }, {
     "expcode" : "t1.`ROOT`",
-    "ordervalue" : 11,
+    "ordervalue" : 14,
     "psdedqcodeexpname" : "ROOT"
   }, {
     "expcode" : "(t1.`DAYS` * t1.`HOURS`)",
-    "ordervalue" : 12,
+    "ordervalue" : 15,
     "psdedqcodeexpname" : "TOTAL"
   }, {
     "expcode" : "t1.`TYPE`",
-    "ordervalue" : 13,
+    "ordervalue" : 16,
     "psdedqcodeexpname" : "TYPE"
   }, {
     "expcode" : "(select t.realname from zt_user t where t.account = t1.account)",
-    "ordervalue" : 14,
+    "ordervalue" : 17,
     "psdedqcodeexpname" : "USERNAME"
   } ],
   "psdedqcodeconds" : [ {

PSMODULES/ibiz/PSDATAENTITIES/IBZ_PROJECTTEAM/PSDEDATASETS/ProjectTeamPm/PSDEDATASET.json

+{
+  "logicname" : "项目成员（项目经理）",
+  "codename" : "ProjectTeamPm",
+  "psdedatasetname" : "ProjectTeamPm",
+  "psdedsdqs" : [ {
+    "ordervalue" : 100,
+    "psdedqid" : "<PSDATAENTITY>/ProjectTeamPm"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEACMODES/DEFAULT/PSDEACMODE.json

+{
+  "psdeacmodename" : "DEFAULT",
+  "codename" : "Default",
+  "defaultmode" : 1
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEACTIONS/CheckKey/PSDEACTION.json

+{
+  "logicname" : "CheckKey",
+  "psdeactionname" : "CheckKey",
+  "actiontype" : "BUILTIN",
+  "codename" : "CheckKey"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEACTIONS/Create/PSDEACTION.json

+{
+  "logicname" : "Create",
+  "psdeactionname" : "Create",
+  "actiontype" : "BUILTIN",
+  "codename" : "Create"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEACTIONS/Get/PSDEACTION.json

+{
+  "logicname" : "Get",
+  "psdeactionname" : "Get",
+  "actiontype" : "BUILTIN",
+  "codename" : "Get"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEACTIONS/GetDraft/PSDEACTION.json

+{
+  "logicname" : "GetDraft",
+  "psdeactionname" : "GetDraft",
+  "actiontype" : "BUILTIN",
+  "codename" : "GetDraft"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEACTIONS/Remove/PSDEACTION.json

+{
+  "logicname" : "Remove",
+  "psdeactionname" : "Remove",
+  "actiontype" : "BUILTIN",
+  "codename" : "Remove"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEACTIONS/Save/PSDEACTION.json

+{
+  "logicname" : "Save",
+  "psdeactionname" : "Save",
+  "actiontype" : "BUILTIN",
+  "codename" : "Save"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEACTIONS/Update/PSDEACTION.json

+{
+  "logicname" : "Update",
+  "psdeactionname" : "Update",
+  "actiontype" : "BUILTIN",
+  "codename" : "Update"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATAQUERIES/AllAccountEstimate/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "AllAccountEstimate",
+  "logicname" : "所有用户工时",
+  "codename" : "AllAccountEstimate",
+  "defaultmode" : 0,
+  "custommode" : 1,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "ACCOUNTTASKESTIMATE",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATAQUERIES/AllAccountEstimate/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT T1.* FROM (SELECT\n\tt1.account,t1.`YEAR`,concat(t1.`YEAR`, t1.`MONTH`) as `MONTH`,\n\tsum(if(t1.`day` = '01',t1.consumed, 0)) as oneconsumed,\n\tsum(if(t1.`day` = '02',t1.consumed, 0)) as twoconsumed,\n\tsum(if(t1.`day` = '03',t1.consumed, 0)) as threeconsumed,\n\tsum(if(t1.`day` = '04',t1.consumed, 0)) as FOURONSUMED,\n\tsum(if(t1.`day` = '05',t1.consumed, 0)) as fiveconsumed,\n\tsum(if(t1.`day` = '06',t1.consumed, 0)) as sixconsumed,\n\tsum(if(t1.`day` = '07',t1.consumed, 0)) as sevenconsumed,\n\tsum(if(t1.`day` = '08',t1.consumed, 0)) as eightconsumed,\n\tsum(if(t1.`day` = '09',t1.consumed, 0)) as nineconsumed,\n\tsum(if(t1.`day` = '10',t1.consumed, 0)) as tenconsumed,\n\tsum(if(t1.`day` = '11',t1.consumed, 0)) as elevenconsumed,\n\tsum(if(t1.`day` = '12',t1.consumed, 0)) as twelveconsumed,\n\tsum(if(t1.`day` = '13',t1.consumed, 0)) as thirteenconsumed,\n\tsum(if(t1.`day` = '14',t1.consumed, 0)) as fourteenconsumed,\n\tsum(if(t1.`day` = '15',t1.consumed, 0)) as fifteenconsumed,\n\tsum(if(t1.`day` = '16',t1.consumed, 0)) as sixteenconsumed,\n\tsum(if(t1.`day` = '17',t1.consumed, 0)) as seventeenconsumed,\n\tsum(if(t1.`day` = '18',t1.consumed, 0)) as eighteenconsumed,\n\tsum(if(t1.`day` = '19',t1.consumed, 0)) as nineteenconsumed,\n\tsum(if(t1.`day` = '20',t1.consumed, 0)) as twentyconsumed,\n\tsum(if(t1.`day` = '21',t1.consumed, 0)) as twentyoneconsumed,\n\tsum(if(t1.`day` = '22',t1.consumed, 0)) as twentytwoconsumed,\n\tsum(if(t1.`day` = '23',t1.consumed, 0)) as twentythreeconsumed,\n\tsum(if(t1.`day` = '24',t1.consumed, 0)) as twentyfourconsumed,\n\tsum(if(t1.`day` = '25',t1.consumed, 0)) as twentyfiveconsumed,\n\tsum(if(t1.`day` = '26',t1.consumed, 0)) as twentysixconsumed,\n\tsum(if(t1.`day` = '27',t1.consumed, 0)) as twentysevenconsumed,\n\tsum(if(t1.`day` = '28',t1.consumed, 0)) as twentyeightconsumed,\n\tsum(if(t1.`day` = '29',t1.consumed, 0)) as twentynineconsumed,\n\tsum(if(t1.`day` = '30',t1.consumed, 0)) as thirtyconsumed,\n\tsum(if(t1.`day` = '31',t1.consumed, 0)) as thirtyoneconsumed,\n\tsum(if(t1.`day` = '01',t1.EVALUATIONTIME, 0)) as oneEVALUATIONTIME,\n\tsum(if(t1.`day` = '02',t1.EVALUATIONTIME, 0)) as twoEVALUATIONTIME,\n\tsum(if(t1.`day` = '03',t1.EVALUATIONTIME, 0)) as threeEVALUATIONTIME,\n\tsum(if(t1.`day` = '04',t1.EVALUATIONTIME, 0)) as fourEVALUATIONTIME,\n\tsum(if(t1.`day` = '05',t1.EVALUATIONTIME, 0)) as fiveEVALUATIONTIME,\n\tsum(if(t1.`day` = '06',t1.EVALUATIONTIME, 0)) as sixEVALUATIONTIME,\n\tsum(if(t1.`day` = '07',t1.EVALUATIONTIME, 0)) as sevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '08',t1.EVALUATIONTIME, 0)) as eightEVALUATIONTIME,\n\tsum(if(t1.`day` = '09',t1.EVALUATIONTIME, 0)) as nineEVALUATIONTIME,\n\tsum(if(t1.`day` = '10',t1.EVALUATIONTIME, 0)) as tenEVALUATIONTIME,\n\tsum(if(t1.`day` = '11',t1.EVALUATIONTIME, 0)) as elevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '12',t1.EVALUATIONTIME, 0)) as twelveEVALUATIONTIME,\n\tsum(if(t1.`day` = '13',t1.EVALUATIONTIME, 0)) as thirteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '14',t1.EVALUATIONTIME, 0)) as fourteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '15',t1.EVALUATIONTIME, 0)) as fifteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '16',t1.EVALUATIONTIME, 0)) as sixteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '17',t1.EVALUATIONTIME, 0)) as seventeenEVALUATIONTIME,\n\tsum(if(t1.`day` = '18',t1.EVALUATIONTIME, 0)) as eighteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '19',t1.EVALUATIONTIME, 0)) as nineteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '20',t1.EVALUATIONTIME, 0)) as twentyEVALUATIONTIME,\n\tsum(if(t1.`day` = '21',t1.EVALUATIONTIME, 0)) as twentyoneEVALUATIONTIME,\n\tsum(if(t1.`day` = '22',t1.EVALUATIONTIME, 0)) as twentytwoEVALUATIONTIME,\n\tsum(if(t1.`day` = '23',t1.EVALUATIONTIME, 0)) as twentythreeEVALUATIONTIME,\n\tsum(if(t1.`day` = '24',t1.EVALUATIONTIME, 0)) as twentyfourEVALUATIONTIME,\n\tsum(if(t1.`day` = '25',t1.EVALUATIONTIME, 0)) as twentyfiveEVALUATIONTIME,\n\tsum(if(t1.`day` = '26',t1.EVALUATIONTIME, 0)) as twentysixEVALUATIONTIME,\n\tsum(if(t1.`day` = '27',t1.EVALUATIONTIME, 0)) as twentysevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '28',t1.EVALUATIONTIME, 0)) as twentyeightEVALUATIONTIME,\n\tsum(if(t1.`day` = '29',t1.EVALUATIONTIME, 0)) as twentynineEVALUATIONTIME,\n\tsum(if(t1.`day` = '30',t1.EVALUATIONTIME, 0)) as thirtyEVALUATIONTIME,\n\tsum(if(t1.`day` = '31',t1.EVALUATIONTIME, 0)) as thirtyoneEVALUATIONTIME,\n\tsum(if(t1.`day` = '01',t1.EVALUATIONCOST, 0)) as oneEVALUATIONCOST,\n\tsum(if(t1.`day` = '02',t1.EVALUATIONCOST, 0)) as twoEVALUATIONCOST,\n\tsum(if(t1.`day` = '03',t1.EVALUATIONCOST, 0)) as threeEVALUATIONCOST,\n\tsum(if(t1.`day` = '04',t1.EVALUATIONCOST, 0)) as fourEVALUATIONCOST,\n\tsum(if(t1.`day` = '05',t1.EVALUATIONCOST, 0)) as fiveEVALUATIONCOST,\n\tsum(if(t1.`day` = '06',t1.EVALUATIONCOST, 0)) as sixEVALUATIONCOST,\n\tsum(if(t1.`day` = '07',t1.EVALUATIONCOST, 0)) as sevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '08',t1.EVALUATIONCOST, 0)) as eightEVALUATIONCOST,\n\tsum(if(t1.`day` = '09',t1.EVALUATIONCOST, 0)) as nineEVALUATIONCOST,\n\tsum(if(t1.`day` = '10',t1.EVALUATIONCOST, 0)) as tenEVALUATIONCOST,\n\tsum(if(t1.`day` = '11',t1.EVALUATIONCOST, 0)) as elevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '12',t1.EVALUATIONCOST, 0)) as twelveEVALUATIONCOST,\n\tsum(if(t1.`day` = '13',t1.EVALUATIONCOST, 0)) as thirteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '14',t1.EVALUATIONCOST, 0)) as fourteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '15',t1.EVALUATIONCOST, 0)) as fifteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '16',t1.EVALUATIONCOST, 0)) as sixteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '17',t1.EVALUATIONCOST, 0)) as seventeenEVALUATIONCOST,\n\tsum(if(t1.`day` = '18',t1.EVALUATIONCOST, 0)) as eighteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '19',t1.EVALUATIONCOST, 0)) as nineteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '20',t1.EVALUATIONCOST, 0)) as twentyEVALUATIONCOST,\n\tsum(if(t1.`day` = '21',t1.EVALUATIONCOST, 0)) as twentyoneEVALUATIONCOST,\n\tsum(if(t1.`day` = '22',t1.EVALUATIONCOST, 0)) as twentytwoEVALUATIONCOST,\n\tsum(if(t1.`day` = '23',t1.EVALUATIONCOST, 0)) as twentythreeEVALUATIONCOST,\n\tsum(if(t1.`day` = '24',t1.EVALUATIONCOST, 0)) as twentyfourEVALUATIONCOST,\n\tsum(if(t1.`day` = '25',t1.EVALUATIONCOST, 0)) as twentyfiveEVALUATIONCOST,\n\tsum(if(t1.`day` = '26',t1.EVALUATIONCOST, 0)) as twentysixEVALUATIONCOST,\n\tsum(if(t1.`day` = '27',t1.EVALUATIONCOST, 0)) as twentysevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '28',t1.EVALUATIONCOST, 0)) as twentyeightEVALUATIONCOST,\n\tsum(if(t1.`day` = '29',t1.EVALUATIONCOST, 0)) as twentynineEVALUATIONCOST,\n\tsum(if(t1.`day` = '30',t1.EVALUATIONCOST, 0)) as thirtyEVALUATIONCOST,\n\tsum(if(t1.`day` = '31',t1.EVALUATIONCOST, 0)) as thirtyoneEVALUATIONCOST,\n\tSUM(T1.consumed) AS consumed,SUM(T1.EVALUATIONCOST) AS EVALUATIONCOST, SUM(T1.INPUTCOST) AS INPUTCOST, SUM(T1.EVALUATIONTIME) AS EVALUATIONTIME\nFROM\n\t(\nSELECT YEAR\n\t( t1.date ) AS `year`,\n\tRight(100 + MONTH ( t1.date ), 2) AS `month`,\n\tRight(100 + day ( t1.date ), 2) AS `day`,\n\tt1.account,\n\tt1.date,\n\tROUND( sum( t1.consumed ), 2 ) AS consumed,\n\tROUND( sum( t1.EVALUATIONCOST ), 2 ) AS EVALUATIONCOST,\n\tROUND( sum( t1.INPUTCOST ), 2 ) AS INPUTCOST,\n\tROUND( sum( t1.EVALUATIONTIME ), 2 ) AS EVALUATIONTIME\nFROM\n\t`zt_taskestimate` t1\n\tLEFT JOIN `zt_task` t11 ON t1.`TASK` = t11.`ID`\nWHERE\n\tt11.project IS NOT NULL \n\tAND t11.project <> '0' \n\tAND t1.date <> '0000-00-00'  and t11.deleted = '0'\nGROUP BY\n\tt1.account,\n\tt1.date \n\t) t1 GROUP BY t1.account, t1.`YEAR`,t1.`MONTH`) T1",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATAQUERIES/DEFAULT/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "DEFAULT",
+  "logicname" : "数据查询",
+  "codename" : "Default",
+  "defaultmode" : 0,
+  "custommode" : 1,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "ACCOUNTTASKESTIMATE",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT T1.* FROM (SELECT\n\tt1.account,t1.`YEAR`,concat(t1.`YEAR`, t1.`MONTH`) as `MONTH`,\n\tsum(if(t1.`day` = '01',t1.consumed, 0)) as oneconsumed,\n\tsum(if(t1.`day` = '02',t1.consumed, 0)) as twoconsumed,\n\tsum(if(t1.`day` = '03',t1.consumed, 0)) as threeconsumed,\n\tsum(if(t1.`day` = '04',t1.consumed, 0)) as FOURONSUMED,\n\tsum(if(t1.`day` = '05',t1.consumed, 0)) as fiveconsumed,\n\tsum(if(t1.`day` = '06',t1.consumed, 0)) as sixconsumed,\n\tsum(if(t1.`day` = '07',t1.consumed, 0)) as sevenconsumed,\n\tsum(if(t1.`day` = '08',t1.consumed, 0)) as eightconsumed,\n\tsum(if(t1.`day` = '09',t1.consumed, 0)) as nineconsumed,\n\tsum(if(t1.`day` = '10',t1.consumed, 0)) as tenconsumed,\n\tsum(if(t1.`day` = '11',t1.consumed, 0)) as elevenconsumed,\n\tsum(if(t1.`day` = '12',t1.consumed, 0)) as twelveconsumed,\n\tsum(if(t1.`day` = '13',t1.consumed, 0)) as thirteenconsumed,\n\tsum(if(t1.`day` = '14',t1.consumed, 0)) as fourteenconsumed,\n\tsum(if(t1.`day` = '15',t1.consumed, 0)) as fifteenconsumed,\n\tsum(if(t1.`day` = '16',t1.consumed, 0)) as sixteenconsumed,\n\tsum(if(t1.`day` = '17',t1.consumed, 0)) as seventeenconsumed,\n\tsum(if(t1.`day` = '18',t1.consumed, 0)) as eighteenconsumed,\n\tsum(if(t1.`day` = '19',t1.consumed, 0)) as nineteenconsumed,\n\tsum(if(t1.`day` = '20',t1.consumed, 0)) as twentyconsumed,\n\tsum(if(t1.`day` = '21',t1.consumed, 0)) as twentyoneconsumed,\n\tsum(if(t1.`day` = '22',t1.consumed, 0)) as twentytwoconsumed,\n\tsum(if(t1.`day` = '23',t1.consumed, 0)) as twentythreeconsumed,\n\tsum(if(t1.`day` = '24',t1.consumed, 0)) as twentyfourconsumed,\n\tsum(if(t1.`day` = '25',t1.consumed, 0)) as twentyfiveconsumed,\n\tsum(if(t1.`day` = '26',t1.consumed, 0)) as twentysixconsumed,\n\tsum(if(t1.`day` = '27',t1.consumed, 0)) as twentysevenconsumed,\n\tsum(if(t1.`day` = '28',t1.consumed, 0)) as twentyeightconsumed,\n\tsum(if(t1.`day` = '29',t1.consumed, 0)) as twentynineconsumed,\n\tsum(if(t1.`day` = '30',t1.consumed, 0)) as thirtyconsumed,\n\tsum(if(t1.`day` = '31',t1.consumed, 0)) as thirtyoneconsumed,\n\tsum(if(t1.`day` = '01',t1.EVALUATIONTIME, 0)) as oneEVALUATIONTIME,\n\tsum(if(t1.`day` = '02',t1.EVALUATIONTIME, 0)) as twoEVALUATIONTIME,\n\tsum(if(t1.`day` = '03',t1.EVALUATIONTIME, 0)) as threeEVALUATIONTIME,\n\tsum(if(t1.`day` = '04',t1.EVALUATIONTIME, 0)) as fourEVALUATIONTIME,\n\tsum(if(t1.`day` = '05',t1.EVALUATIONTIME, 0)) as fiveEVALUATIONTIME,\n\tsum(if(t1.`day` = '06',t1.EVALUATIONTIME, 0)) as sixEVALUATIONTIME,\n\tsum(if(t1.`day` = '07',t1.EVALUATIONTIME, 0)) as sevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '08',t1.EVALUATIONTIME, 0)) as eightEVALUATIONTIME,\n\tsum(if(t1.`day` = '09',t1.EVALUATIONTIME, 0)) as nineEVALUATIONTIME,\n\tsum(if(t1.`day` = '10',t1.EVALUATIONTIME, 0)) as tenEVALUATIONTIME,\n\tsum(if(t1.`day` = '11',t1.EVALUATIONTIME, 0)) as elevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '12',t1.EVALUATIONTIME, 0)) as twelveEVALUATIONTIME,\n\tsum(if(t1.`day` = '13',t1.EVALUATIONTIME, 0)) as thirteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '14',t1.EVALUATIONTIME, 0)) as fourteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '15',t1.EVALUATIONTIME, 0)) as fifteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '16',t1.EVALUATIONTIME, 0)) as sixteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '17',t1.EVALUATIONTIME, 0)) as seventeenEVALUATIONTIME,\n\tsum(if(t1.`day` = '18',t1.EVALUATIONTIME, 0)) as eighteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '19',t1.EVALUATIONTIME, 0)) as nineteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '20',t1.EVALUATIONTIME, 0)) as twentyEVALUATIONTIME,\n\tsum(if(t1.`day` = '21',t1.EVALUATIONTIME, 0)) as twentyoneEVALUATIONTIME,\n\tsum(if(t1.`day` = '22',t1.EVALUATIONTIME, 0)) as twentytwoEVALUATIONTIME,\n\tsum(if(t1.`day` = '23',t1.EVALUATIONTIME, 0)) as twentythreeEVALUATIONTIME,\n\tsum(if(t1.`day` = '24',t1.EVALUATIONTIME, 0)) as twentyfourEVALUATIONTIME,\n\tsum(if(t1.`day` = '25',t1.EVALUATIONTIME, 0)) as twentyfiveEVALUATIONTIME,\n\tsum(if(t1.`day` = '26',t1.EVALUATIONTIME, 0)) as twentysixEVALUATIONTIME,\n\tsum(if(t1.`day` = '27',t1.EVALUATIONTIME, 0)) as twentysevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '28',t1.EVALUATIONTIME, 0)) as twentyeightEVALUATIONTIME,\n\tsum(if(t1.`day` = '29',t1.EVALUATIONTIME, 0)) as twentynineEVALUATIONTIME,\n\tsum(if(t1.`day` = '30',t1.EVALUATIONTIME, 0)) as thirtyEVALUATIONTIME,\n\tsum(if(t1.`day` = '31',t1.EVALUATIONTIME, 0)) as thirtyoneEVALUATIONTIME,\n\tsum(if(t1.`day` = '01',t1.EVALUATIONCOST, 0)) as oneEVALUATIONCOST,\n\tsum(if(t1.`day` = '02',t1.EVALUATIONCOST, 0)) as twoEVALUATIONCOST,\n\tsum(if(t1.`day` = '03',t1.EVALUATIONCOST, 0)) as threeEVALUATIONCOST,\n\tsum(if(t1.`day` = '04',t1.EVALUATIONCOST, 0)) as fourEVALUATIONCOST,\n\tsum(if(t1.`day` = '05',t1.EVALUATIONCOST, 0)) as fiveEVALUATIONCOST,\n\tsum(if(t1.`day` = '06',t1.EVALUATIONCOST, 0)) as sixEVALUATIONCOST,\n\tsum(if(t1.`day` = '07',t1.EVALUATIONCOST, 0)) as sevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '08',t1.EVALUATIONCOST, 0)) as eightEVALUATIONCOST,\n\tsum(if(t1.`day` = '09',t1.EVALUATIONCOST, 0)) as nineEVALUATIONCOST,\n\tsum(if(t1.`day` = '10',t1.EVALUATIONCOST, 0)) as tenEVALUATIONCOST,\n\tsum(if(t1.`day` = '11',t1.EVALUATIONCOST, 0)) as elevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '12',t1.EVALUATIONCOST, 0)) as twelveEVALUATIONCOST,\n\tsum(if(t1.`day` = '13',t1.EVALUATIONCOST, 0)) as thirteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '14',t1.EVALUATIONCOST, 0)) as fourteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '15',t1.EVALUATIONCOST, 0)) as fifteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '16',t1.EVALUATIONCOST, 0)) as sixteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '17',t1.EVALUATIONCOST, 0)) as seventeenEVALUATIONCOST,\n\tsum(if(t1.`day` = '18',t1.EVALUATIONCOST, 0)) as eighteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '19',t1.EVALUATIONCOST, 0)) as nineteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '20',t1.EVALUATIONCOST, 0)) as twentyEVALUATIONCOST,\n\tsum(if(t1.`day` = '21',t1.EVALUATIONCOST, 0)) as twentyoneEVALUATIONCOST,\n\tsum(if(t1.`day` = '22',t1.EVALUATIONCOST, 0)) as twentytwoEVALUATIONCOST,\n\tsum(if(t1.`day` = '23',t1.EVALUATIONCOST, 0)) as twentythreeEVALUATIONCOST,\n\tsum(if(t1.`day` = '24',t1.EVALUATIONCOST, 0)) as twentyfourEVALUATIONCOST,\n\tsum(if(t1.`day` = '25',t1.EVALUATIONCOST, 0)) as twentyfiveEVALUATIONCOST,\n\tsum(if(t1.`day` = '26',t1.EVALUATIONCOST, 0)) as twentysixEVALUATIONCOST,\n\tsum(if(t1.`day` = '27',t1.EVALUATIONCOST, 0)) as twentysevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '28',t1.EVALUATIONCOST, 0)) as twentyeightEVALUATIONCOST,\n\tsum(if(t1.`day` = '29',t1.EVALUATIONCOST, 0)) as twentynineEVALUATIONCOST,\n\tsum(if(t1.`day` = '30',t1.EVALUATIONCOST, 0)) as thirtyEVALUATIONCOST,\n\tsum(if(t1.`day` = '31',t1.EVALUATIONCOST, 0)) as thirtyoneEVALUATIONCOST,\n\tSUM(T1.consumed) AS consumed,SUM(T1.EVALUATIONCOST) AS EVALUATIONCOST, SUM(T1.INPUTCOST) AS INPUTCOST, SUM(T1.EVALUATIONTIME) AS EVALUATIONTIME\nFROM\n\t(\nSELECT YEAR\n\t( t1.date ) AS `year`,\n\tRight(100 + MONTH ( t1.date ), 2) AS `month`,\n\tRight(100 + day ( t1.date ), 2) AS `day`,\n\tt1.account,\n\tt1.date,\n\tROUND( sum( t1.consumed ), 2 ) AS consumed,\n\tROUND( sum( t1.EVALUATIONCOST ), 2 ) AS EVALUATIONCOST,\n\tROUND( sum( t1.INPUTCOST ), 2 ) AS INPUTCOST,\n\tROUND( sum( t1.EVALUATIONTIME ), 2 ) AS EVALUATIONTIME\nFROM\n\t`zt_taskestimate` t1\n\tLEFT JOIN `zt_task` t11 ON t1.`TASK` = t11.`ID`\nWHERE\n\tt11.project IS NOT NULL \n\tAND t11.project <> '0' \n\tAND t1.date <> '0000-00-00'  and t11.deleted = '0'\nGROUP BY\n\tt1.account,\n\tt1.date \n\t) t1 GROUP BY t1.account, t1.`YEAR`,t1.`MONTH`) T1",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5",
+  "psdedqcodeconds" : [ {
+    "condcode" : "t1.account =#{srf.webcontext.account}",
+    "psdedqcodecondname" : "查询条件",
+    "ordervalue" : 0
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATAQUERIES/VIEW/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "VIEW",
+  "logicname" : "默认（全部数据）",
+  "codename" : "View",
+  "defaultmode" : 0,
+  "custommode" : 0,
+  "viewcollevel" : 0,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "ACCOUNTTASKESTIMATE",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT\nt1.`DATE`,\nt1.`EVALUATIONCOST`,\nt1.`INPUTCOST`\nFROM `zt_taskestimate` t1 \n",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5",
+  "psdedqcodeexps" : [ {
+    "expcode" : "t1.`DATE`",
+    "ordervalue" : 0,
+    "psdedqcodeexpname" : "DATE"
+  }, {
+    "expcode" : "t1.`EVALUATIONCOST`",
+    "ordervalue" : 1,
+    "psdedqcodeexpname" : "EVALUATIONCOST"
+  }, {
+    "expcode" : "t1.`INPUTCOST`",
+    "ordervalue" : 2,
+    "psdedqcodeexpname" : "INPUTCOST"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATARELATIONS/Default/PSDEDATARELATION.json

+{
+  "codename" : "Default",
+  "psdedatarelationname" : "用户工时统计默认关系界面组"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATASETS/AllAccountEstimate/PSDEDATASET.json

+{
+  "enablegroup" : 0,
+  "logicname" : "所有用户工时",
+  "codename" : "AllAccountEstimate",
+  "psdedatasetname" : "AllAccountEstimate",
+  "psdedsdqs" : [ {
+    "ordervalue" : 100,
+    "psdedqid" : "<PSDATAENTITY>/AllAccountEstimate"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEDATASETS/DEFAULT/PSDEDATASET.json

+{
+  "logicname" : "数据集",
+  "codename" : "Default",
+  "defaultmode" : 1,
+  "psdedatasetname" : "DEFAULT",
+  "psdedsdqs" : [ {
+    "ordervalue" : 100,
+    "psdedqid" : "<PSDATAENTITY>/DEFAULT"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEFORMS/Default/PSDEFORM.json

+{
+  "formtype" : "SEARCHFORM",
+  "dynasysrefmode" : 0,
+  "codename" : "Default",
+  "psdeformname" : "默认搜索表单",
+  "mobflag" : 0,
+  "psdeformdetails" : [ {
+    "caption" : "常规条件",
+    "showcaption" : 0,
+    "psdeformdetailname" : "formpage1",
+    "detailtype" : "FORMPAGE",
+    "colmodel" : "33%;33%;34%"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEFORMS/Main/PSDEFORM.json

+{
+  "formtype" : "EDITFORM",
+  "dynasysrefmode" : 0,
+  "codename" : "Main",
+  "psdeformname" : "主编辑表单",
+  "mobflag" : 0,
+  "psdeformdetails" : [ {
+    "caption" : "基本信息",
+    "psdeformdetailname" : "formpage1",
+    "detailtype" : "FORMPAGE",
+    "psdeformdetails" : [ {
+      "caption" : "用户工时统计基本信息",
+      "psdeformdetailname" : "group1",
+      "detailtype" : "GROUPPANEL",
+      "psdeformid" : "<PSDEFORM>",
+      "colmodel" : "50%;50%"
+    } ]
+  }, {
+    "caption" : "其它",
+    "psdeformdetailname" : "formpage2",
+    "detailtype" : "FORMPAGE",
+    "psdeformdetails" : [ {
+      "caption" : "操作信息",
+      "psdeformdetailname" : "group2",
+      "detailtype" : "GROUPPANEL",
+      "psdeformid" : "<PSDEFORM>",
+      "colmodel" : "50%;50%"
+    } ]
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEGRIDS/Main/PSDEGRID.json

+{
+  "showheader" : 1,
+  "enablepagingbar" : 1,
+  "psdegridname" : "主表格",
+  "pagingsize" : 20,
+  "codename" : "Main"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDELISTS/MOB/PSDELIST.json

+{
+  "appenddeitems" : 1,
+  "logicname" : "移动端列表",
+  "psdelistname" : "MOB",
+  "psdedsid" : "<PSDATAENTITY>/DEFAULT",
+  "codename" : "Mob"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEEDITVIEW",
+  "codename" : "EditView",
+  "predefineviewtype" : "EDITVIEW",
+  "psdeviewbasename" : "用户工时统计实体编辑视图",
+  "readonlymode" : 0,
+  "title" : "用户工时统计编辑视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto91",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeformname" : "主编辑表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "FORM",
+    "psdeviewctrlname" : "FORM",
+    "psdeformid" : "<PSDATAENTITY>/Main",
+    "configinfo" : "[表单]主编辑表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
+    "psdetoolbarid" : "Auto5",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEVIEWBASES/EditView2/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEEDITVIEW2",
+  "codename" : "EditView2",
+  "psdeviewbasename" : "用户工时统计实体编辑视图（左右关系）",
+  "readonlymode" : 0,
+  "title" : "用户工时统计编辑视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "DRBAR",
+    "psdeviewctrlname" : "DRBAR",
+    "psdedrname" : "用户工时统计默认关系界面组",
+    "configinfo" : "[关系组]用户工时统计默认关系界面组",
+    "psdedrid" : "<PSDATAENTITY>/Default"
+  }, {
+    "psachandlerid" : "Auto91",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeformname" : "主编辑表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "FORM",
+    "psdeviewctrlname" : "FORM",
+    "psdeformid" : "<PSDATAENTITY>/Main",
+    "configinfo" : "[表单]主编辑表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
+    "psdetoolbarid" : "Auto5",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEVIEWBASES/GridView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEGRIDVIEW",
+  "codename" : "GridView",
+  "predefineviewtype" : "MDATAVIEW",
+  "psdeviewbasename" : "用户工时统计实体表格视图",
+  "readonlymode" : 0,
+  "title" : "用户工时统计表格视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto96",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdegridid" : "<PSDATAENTITY>/Main",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "GRID",
+    "psdeviewctrlname" : "GRID",
+    "psdegridname" : "主表格",
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
+  }, {
+    "psachandlerid" : "Auto71",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeformname" : "默认搜索表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "SEARCHFORM",
+    "psdeviewctrlname" : "SEARCHFORM",
+    "psdeformid" : "<PSDATAENTITY>/Default",
+    "configinfo" : "[表单]默认搜索表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（版本）_编辑_提交测试_查看Bug_删除",
+    "psdetoolbarid" : "Auto8_1132",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（版本）_编辑_提交测试_查看Bug_删除"
+  } ],
+  "psdeviewrvs" : [ {
+    "minorpsdeviewid" : "<PSDATAENTITY>/EditView",
+    "refmodetext" : "编辑数据视图",
+    "psdeviewrvname" : "EDITDATA",
+    "defviewtype" : "EDITVIEW"
+  }, {
+    "minorpsdeviewid" : "<PSDATAENTITY>/EditView",
+    "refmodetext" : "新建数据视图",
+    "psdeviewrvname" : "NEWDATA",
+    "defviewtype" : "EDITVIEW"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEVIEWBASES/MPickupView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEMPICKUPVIEW",
+  "codename" : "MPickupView",
+  "predefineviewtype" : "MPICKUPVIEW",
+  "psdeviewbasename" : "用户工时统计实体数据多项选择视图",
+  "readonlymode" : 0,
+  "title" : "用户工时统计数据多项选择视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeviewid" : "<PSDATAENTITY>/PickupGridView",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "PICKUPVIEWPANEL",
+    "psdeviewctrlname" : "PICKUPVIEWPANEL",
+    "configinfo" : "[实体视图]用户工时统计实体选择表格视图（部件视图）"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEVIEWBASES/PickupGridView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
+  "codename" : "PickupGridView",
+  "psdeviewbasename" : "用户工时统计实体选择表格视图（部件视图）",
+  "readonlymode" : 0,
+  "title" : "用户工时统计选择表格视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto96",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdegridid" : "<PSDATAENTITY>/Main",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "GRID",
+    "psdeviewctrlname" : "GRID",
+    "psdegridname" : "主表格",
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
+  }, {
+    "psachandlerid" : "Auto71",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeformname" : "默认搜索表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "SEARCHFORM",
+    "psdeviewctrlname" : "SEARCHFORM",
+    "psdeformid" : "<PSDATAENTITY>/Default",
+    "configinfo" : "[表单]默认搜索表单"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEVIEWBASES/PickupView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEPICKUPVIEW",
+  "codename" : "PickupView",
+  "predefineviewtype" : "PICKUPVIEW",
+  "psdeviewbasename" : "用户工时统计实体数据选择视图",
+  "readonlymode" : 0,
+  "title" : "用户工时统计数据选择视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeviewid" : "<PSDATAENTITY>/PickupGridView",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "PICKUPVIEWPANEL",
+    "psdeviewctrlname" : "PICKUPVIEWPANEL",
+    "configinfo" : "[实体视图]用户工时统计实体选择表格视图（部件视图）"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSDEVIEWBASES/RedirectView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEREDIRECTVIEW",
+  "codename" : "RedirectView",
+  "predefineviewtype" : "REDIRECTVIEW",
+  "psdeviewbasename" : "用户工时统计实体数据重定向视图",
+  "readonlymode" : 0,
+  "title" : "用户工时统计数据重定向视图"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/ACCOUNTTASKESTIMATE/PSHELPARTICLES/Auto176/PSHELPARTICLE.json

+{
+  "articletype" : "DEMODEL",
+  "pshelparticlename" : "[ACCOUNTTASKESTIMATE]模型说明",
+  "codename" : "Auto176",
+  "pshelpsections" : [ {
+    "validflag" : 1,
+    "codename" : "Auto2012",
+    "pshelpsectionname" : "概念",
+    "sectiontype" : "DECONCEPTS",
+    "ordervalue" : 100
+  }, {
+    "validflag" : 1,
+    "codename" : "Auto2014",
+    "pshelpsectionname" : "属性",
+    "sectiontype" : "DEFDESCS",
+    "ordervalue" : 200
+  }, {
+    "validflag" : 1,
+    "codename" : "Auto2009",
+    "pshelpsectionname" : "任务",
+    "sectiontype" : "DEMANUALS",
+    "ordervalue" : 300
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/IBIZPRO_INDEX/PSDATAENTITY.json

@@ -13,7 +13,7 @@
   "enablededataset" : 1,
   "noviewmode" : 1,
   "serviceapiflag" : 1,
-  "storagemode" : 1,
+  "storagemode" : 0,
   "logicname" : "索引检索",
   "existingmodel" : 0,
   "enatempdata" : 0,

PSMODULES/ibizpro/PSDATAENTITIES/IBIZPRO_INDEX/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
-  "querycode" : "SELECT\nt1.`ACL`,\nt1.`ACLLIST`,\nt1.`COLOR`,\nt1.`DELETED`,\nt1.`INDEXDESC`,\nt1.`INDEXID`,\nt1.`INDEXNAME`,\nt1.`INDEX_TYPE`,\nt1.`MDEPTID`,\nt1.`ORGID`,\nt1.`PROJECT`\nFROM (SELECT\n'bug' AS `INDEX_TYPE`,v1.`ID` AS `INDEXID`\n,v1.`TITLE` AS `INDEXNAME`\n,NULL AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v1.`STEPS` AS `INDEXDESC`\n,NULL AS `COLOR`\n,NULL AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`ID`,\nt1.`TITLE`\nFROM `zt_bug` t1 \n) v1\nUNION ALL\nSELECT\n'case' AS `INDEX_TYPE`,v2.`ID` AS `INDEXID`\n,v2.`TITLE` AS `INDEXNAME`\n,NULL AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v2.`PRECONDITION` AS `INDEXDESC`\n,NULL AS `COLOR`\n,NULL AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`ID`,\nt1.`TITLE`\nFROM `zt_case` t1 \n) v2\nUNION ALL\nSELECT\n'product' AS `INDEX_TYPE`,v3.`ID` AS `INDEXID`\n,v3.`NAME` AS `INDEXNAME`\n,NULL AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v3.`DESC` AS `INDEXDESC`\n,NULL AS `COLOR`\n,NULL AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`ID`,\nt1.`NAME`\nFROM `zt_product` t1 \n) v3\nUNION ALL\nSELECT\n'project' AS `INDEX_TYPE`,v4.`ID` AS `INDEXID`\n,v4.`NAME` AS `INDEXNAME`\n,NULL AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v4.`DESC` AS `INDEXDESC`\n,NULL AS `COLOR`\n,NULL AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`ID`,\nt1.`NAME`\nFROM `zt_project` t1 \n) v4\nUNION ALL\nSELECT\n'story' AS `INDEX_TYPE`,v5.`ID` AS `INDEXID`\n,v5.`TITLE` AS `INDEXNAME`\n,v5.`DELETED` AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v5.`SPEC` AS `INDEXDESC`\n,v5.`COLOR` AS `COLOR`\n,v5.`PROJECT` AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`COLOR`,\nt1.`DELETED`,\nt1.`ID`,\nt1.`TITLE`\nFROM `zt_story` t1 \n) v5\nUNION ALL\nSELECT\n'task' AS `INDEX_TYPE`,v6.`ID` AS `INDEXID`\n,v6.`NAME` AS `INDEXNAME`\n,NULL AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v6.`DESC` AS `INDEXDESC`\n,NULL AS `COLOR`\n,NULL AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`ID`,\nt1.`NAME`\nFROM `zt_task` t1 \n) v6\n) t1 \n",
+  "querycode" : "SELECT\nt1.`ACL`,\nt1.`ACLLIST`,\nt1.`COLOR`,\nt1.`DELETED`,\nt1.`INDEXDESC`,\nt1.`INDEXID`,\nt1.`INDEXNAME`,\nt1.`INDEX_TYPE`,\nt1.`MDEPTID`,\nt1.`ORGID`,\nt1.`PROJECT`\nFROM (SELECT\n'bug' AS `INDEX_TYPE`,v1.`ID` AS `INDEXID`\n,v1.`TITLE` AS `INDEXNAME`\n,v1.`DELETED` AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v1.`STEPS` AS `INDEXDESC`\n,NULL AS `COLOR`\n,v1.`PROJECT` AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`DELETED`,\nt1.`ID`,\nt1.`PRODUCT`,\nt1.`PROJECT`,\nt1.`TITLE`\nFROM `zt_bug` t1 \n) v1\nUNION ALL\nSELECT\n'case' AS `INDEX_TYPE`,v2.`ID` AS `INDEXID`\n,v2.`TITLE` AS `INDEXNAME`\n,v2.`DELETED` AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v2.`PRECONDITION` AS `INDEXDESC`\n,NULL AS `COLOR`\n,NULL AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`DELETED`,\nt1.`ID`,\nt1.`PRODUCT`,\nt1.`TITLE`\nFROM `zt_case` t1 \n) v2\nUNION ALL\nSELECT\n'product' AS `INDEX_TYPE`,v3.`ID` AS `INDEXID`\n,v3.`NAME` AS `INDEXNAME`\n,v3.`DELETED` AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v3.`DESC` AS `INDEXDESC`\n,NULL AS `COLOR`\n,NULL AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`DELETED`,\nt1.`ID`,\nt1.`NAME`\nFROM `zt_product` t1 \n) v3\nUNION ALL\nSELECT\n'project' AS `INDEX_TYPE`,v4.`ID` AS `INDEXID`\n,v4.`NAME` AS `INDEXNAME`\n,v4.`DELETED` AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v4.`DESC` AS `INDEXDESC`\n,NULL AS `COLOR`\n,v4.`ID` AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`DELETED`,\nt1.`ID`,\nt1.`NAME`\nFROM `zt_project` t1 \n) v4\nUNION ALL\nSELECT\n'story' AS `INDEX_TYPE`,v5.`ID` AS `INDEXID`\n,v5.`TITLE` AS `INDEXNAME`\n,v5.`DELETED` AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v5.`SPEC` AS `INDEXDESC`\n,v5.`COLOR` AS `COLOR`\n,NULL AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`COLOR`,\nt1.`DELETED`,\nt1.`ID`,\nt1.`PRODUCT`,\nt1.`TITLE`\nFROM `zt_story` t1 \n) v5\nUNION ALL\nSELECT\n'task' AS `INDEX_TYPE`,v6.`ID` AS `INDEXID`\n,v6.`NAME` AS `INDEXNAME`\n,v6.`DELETED` AS `DELETED`\n,NULL AS `ORGID`\n,NULL AS `MDEPTID`\n,v6.`DESC` AS `INDEXDESC`\n,NULL AS `COLOR`\n,v6.`PROJECT` AS `PROJECT`\n,NULL AS `ACLLIST`\n,NULL AS `ACL`\nFROM\n(SELECT\nt1.`DELETED`,\nt1.`ID`,\nt1.`NAME`,\nt1.`PROJECT`\nFROM `zt_task` t1 \n) v6\n) t1 \n",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5",
   "psdedqcodeexps" : [ {

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEACMODES/DEFAULT/PSDEACMODE.json

+{
+  "psdeacmodename" : "DEFAULT",
+  "codename" : "Default",
+  "defaultmode" : 1
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEACTIONS/CheckKey/PSDEACTION.json

+{
+  "logicname" : "CheckKey",
+  "psdeactionname" : "CheckKey",
+  "actiontype" : "BUILTIN",
+  "codename" : "CheckKey"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEACTIONS/Create/PSDEACTION.json

+{
+  "logicname" : "Create",
+  "psdeactionname" : "Create",
+  "actiontype" : "BUILTIN",
+  "codename" : "Create"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEACTIONS/Get/PSDEACTION.json

+{
+  "logicname" : "Get",
+  "psdeactionname" : "Get",
+  "actiontype" : "BUILTIN",
+  "codename" : "Get"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEACTIONS/GetDraft/PSDEACTION.json

+{
+  "logicname" : "GetDraft",
+  "psdeactionname" : "GetDraft",
+  "actiontype" : "BUILTIN",
+  "codename" : "GetDraft"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEACTIONS/Remove/PSDEACTION.json

+{
+  "logicname" : "Remove",
+  "psdeactionname" : "Remove",
+  "actiontype" : "BUILTIN",
+  "codename" : "Remove"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEACTIONS/Save/PSDEACTION.json

+{
+  "logicname" : "Save",
+  "psdeactionname" : "Save",
+  "actiontype" : "BUILTIN",
+  "codename" : "Save"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEACTIONS/Update/PSDEACTION.json

+{
+  "logicname" : "Update",
+  "psdeactionname" : "Update",
+  "actiontype" : "BUILTIN",
+  "codename" : "Update"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATAQUERIES/AccountDetail/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "AccountDetail",
+  "logicname" : "用户月工时详情",
+  "codename" : "AccountDetail",
+  "defaultmode" : 0,
+  "custommode" : 1,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "PROJECTTASKESTIMATE",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATAQUERIES/AccountDetail/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT T1.* FROM (SELECT\n\tt1.account,t1.project,t1.projectname,t1.`YEAR`,concat(t1.`YEAR`, t1.`MONTH`) as `MONTH`,\n\tsum(if(t1.`day` = '01',t1.consumed, 0)) as oneconsumed,\n\tsum(if(t1.`day` = '02',t1.consumed, 0)) as twoconsumed,\n\tsum(if(t1.`day` = '03',t1.consumed, 0)) as threeconsumed,\n\tsum(if(t1.`day` = '04',t1.consumed, 0)) as FOURONSUMED,\n\tsum(if(t1.`day` = '05',t1.consumed, 0)) as fiveconsumed,\n\tsum(if(t1.`day` = '06',t1.consumed, 0)) as sixconsumed,\n\tsum(if(t1.`day` = '07',t1.consumed, 0)) as sevenconsumed,\n\tsum(if(t1.`day` = '08',t1.consumed, 0)) as eightconsumed,\n\tsum(if(t1.`day` = '09',t1.consumed, 0)) as nineconsumed,\n\tsum(if(t1.`day` = '10',t1.consumed, 0)) as tenconsumed,\n\tsum(if(t1.`day` = '11',t1.consumed, 0)) as elevenconsumed,\n\tsum(if(t1.`day` = '12',t1.consumed, 0)) as twelveconsumed,\n\tsum(if(t1.`day` = '13',t1.consumed, 0)) as thirteenconsumed,\n\tsum(if(t1.`day` = '14',t1.consumed, 0)) as fourteenconsumed,\n\tsum(if(t1.`day` = '15',t1.consumed, 0)) as fifteenconsumed,\n\tsum(if(t1.`day` = '16',t1.consumed, 0)) as sixteenconsumed,\n\tsum(if(t1.`day` = '17',t1.consumed, 0)) as seventeenconsumed,\n\tsum(if(t1.`day` = '18',t1.consumed, 0)) as eighteenconsumed,\n\tsum(if(t1.`day` = '19',t1.consumed, 0)) as nineteenconsumed,\n\tsum(if(t1.`day` = '20',t1.consumed, 0)) as twentyconsumed,\n\tsum(if(t1.`day` = '21',t1.consumed, 0)) as twentyoneconsumed,\n\tsum(if(t1.`day` = '22',t1.consumed, 0)) as twentytwoconsumed,\n\tsum(if(t1.`day` = '23',t1.consumed, 0)) as twentythreeconsumed,\n\tsum(if(t1.`day` = '24',t1.consumed, 0)) as twentyfourconsumed,\n\tsum(if(t1.`day` = '25',t1.consumed, 0)) as twentyfiveconsumed,\n\tsum(if(t1.`day` = '26',t1.consumed, 0)) as twentysixconsumed,\n\tsum(if(t1.`day` = '27',t1.consumed, 0)) as twentysevenconsumed,\n\tsum(if(t1.`day` = '28',t1.consumed, 0)) as twentyeightconsumed,\n\tsum(if(t1.`day` = '29',t1.consumed, 0)) as twentynineconsumed,\n\tsum(if(t1.`day` = '30',t1.consumed, 0)) as thirtyconsumed,\n\tsum(if(t1.`day` = '31',t1.consumed, 0)) as thirtyoneconsumed,\n\tsum(if(t1.`day` = '01',t1.EVALUATIONTIME, 0)) as oneEVALUATIONTIME,\n\tsum(if(t1.`day` = '02',t1.EVALUATIONTIME, 0)) as twoEVALUATIONTIME,\n\tsum(if(t1.`day` = '03',t1.EVALUATIONTIME, 0)) as threeEVALUATIONTIME,\n\tsum(if(t1.`day` = '04',t1.EVALUATIONTIME, 0)) as fourEVALUATIONTIME,\n\tsum(if(t1.`day` = '05',t1.EVALUATIONTIME, 0)) as fiveEVALUATIONTIME,\n\tsum(if(t1.`day` = '06',t1.EVALUATIONTIME, 0)) as sixEVALUATIONTIME,\n\tsum(if(t1.`day` = '07',t1.EVALUATIONTIME, 0)) as sevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '08',t1.EVALUATIONTIME, 0)) as eightEVALUATIONTIME,\n\tsum(if(t1.`day` = '09',t1.EVALUATIONTIME, 0)) as nineEVALUATIONTIME,\n\tsum(if(t1.`day` = '10',t1.EVALUATIONTIME, 0)) as tenEVALUATIONTIME,\n\tsum(if(t1.`day` = '11',t1.EVALUATIONTIME, 0)) as elevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '12',t1.EVALUATIONTIME, 0)) as twelveEVALUATIONTIME,\n\tsum(if(t1.`day` = '13',t1.EVALUATIONTIME, 0)) as thirteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '14',t1.EVALUATIONTIME, 0)) as fourteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '15',t1.EVALUATIONTIME, 0)) as fifteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '16',t1.EVALUATIONTIME, 0)) as sixteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '17',t1.EVALUATIONTIME, 0)) as seventeenEVALUATIONTIME,\n\tsum(if(t1.`day` = '18',t1.EVALUATIONTIME, 0)) as eighteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '19',t1.EVALUATIONTIME, 0)) as nineteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '20',t1.EVALUATIONTIME, 0)) as twentyEVALUATIONTIME,\n\tsum(if(t1.`day` = '21',t1.EVALUATIONTIME, 0)) as twentyoneEVALUATIONTIME,\n\tsum(if(t1.`day` = '22',t1.EVALUATIONTIME, 0)) as twentytwoEVALUATIONTIME,\n\tsum(if(t1.`day` = '23',t1.EVALUATIONTIME, 0)) as twentythreeEVALUATIONTIME,\n\tsum(if(t1.`day` = '24',t1.EVALUATIONTIME, 0)) as twentyfourEVALUATIONTIME,\n\tsum(if(t1.`day` = '25',t1.EVALUATIONTIME, 0)) as twentyfiveEVALUATIONTIME,\n\tsum(if(t1.`day` = '26',t1.EVALUATIONTIME, 0)) as twentysixEVALUATIONTIME,\n\tsum(if(t1.`day` = '27',t1.EVALUATIONTIME, 0)) as twentysevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '28',t1.EVALUATIONTIME, 0)) as twentyeightEVALUATIONTIME,\n\tsum(if(t1.`day` = '29',t1.EVALUATIONTIME, 0)) as twentynineEVALUATIONTIME,\n\tsum(if(t1.`day` = '30',t1.EVALUATIONTIME, 0)) as thirtyEVALUATIONTIME,\n\tsum(if(t1.`day` = '31',t1.EVALUATIONTIME, 0)) as thirtyoneEVALUATIONTIME,\n\tsum(if(t1.`day` = '01',t1.EVALUATIONCOST, 0)) as oneEVALUATIONCOST,\n\tsum(if(t1.`day` = '02',t1.EVALUATIONCOST, 0)) as twoEVALUATIONCOST,\n\tsum(if(t1.`day` = '03',t1.EVALUATIONCOST, 0)) as threeEVALUATIONCOST,\n\tsum(if(t1.`day` = '04',t1.EVALUATIONCOST, 0)) as fourEVALUATIONCOST,\n\tsum(if(t1.`day` = '05',t1.EVALUATIONCOST, 0)) as fiveEVALUATIONCOST,\n\tsum(if(t1.`day` = '06',t1.EVALUATIONCOST, 0)) as sixEVALUATIONCOST,\n\tsum(if(t1.`day` = '07',t1.EVALUATIONCOST, 0)) as sevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '08',t1.EVALUATIONCOST, 0)) as eightEVALUATIONCOST,\n\tsum(if(t1.`day` = '09',t1.EVALUATIONCOST, 0)) as nineEVALUATIONCOST,\n\tsum(if(t1.`day` = '10',t1.EVALUATIONCOST, 0)) as tenEVALUATIONCOST,\n\tsum(if(t1.`day` = '11',t1.EVALUATIONCOST, 0)) as elevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '12',t1.EVALUATIONCOST, 0)) as twelveEVALUATIONCOST,\n\tsum(if(t1.`day` = '13',t1.EVALUATIONCOST, 0)) as thirteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '14',t1.EVALUATIONCOST, 0)) as fourteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '15',t1.EVALUATIONCOST, 0)) as fifteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '16',t1.EVALUATIONCOST, 0)) as sixteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '17',t1.EVALUATIONCOST, 0)) as seventeenEVALUATIONCOST,\n\tsum(if(t1.`day` = '18',t1.EVALUATIONCOST, 0)) as eighteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '19',t1.EVALUATIONCOST, 0)) as nineteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '20',t1.EVALUATIONCOST, 0)) as twentyEVALUATIONCOST,\n\tsum(if(t1.`day` = '21',t1.EVALUATIONCOST, 0)) as twentyoneEVALUATIONCOST,\n\tsum(if(t1.`day` = '22',t1.EVALUATIONCOST, 0)) as twentytwoEVALUATIONCOST,\n\tsum(if(t1.`day` = '23',t1.EVALUATIONCOST, 0)) as twentythreeEVALUATIONCOST,\n\tsum(if(t1.`day` = '24',t1.EVALUATIONCOST, 0)) as twentyfourEVALUATIONCOST,\n\tsum(if(t1.`day` = '25',t1.EVALUATIONCOST, 0)) as twentyfiveEVALUATIONCOST,\n\tsum(if(t1.`day` = '26',t1.EVALUATIONCOST, 0)) as twentysixEVALUATIONCOST,\n\tsum(if(t1.`day` = '27',t1.EVALUATIONCOST, 0)) as twentysevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '28',t1.EVALUATIONCOST, 0)) as twentyeightEVALUATIONCOST,\n\tsum(if(t1.`day` = '29',t1.EVALUATIONCOST, 0)) as twentynineEVALUATIONCOST,\n\tsum(if(t1.`day` = '30',t1.EVALUATIONCOST, 0)) as thirtyEVALUATIONCOST,\n\tsum(if(t1.`day` = '31',t1.EVALUATIONCOST, 0)) as thirtyoneEVALUATIONCOST,\n\tSUM(T1.consumed) AS consumed,SUM(T1.EVALUATIONCOST) AS EVALUATIONCOST, SUM(T1.INPUTCOST) AS INPUTCOST, SUM(T1.EVALUATIONTIME) AS EVALUATIONTIME,\n(select ROUND(sum(t.consumed),2) from zt_taskestimate t left join zt_task tt on tt.id = t.task where tt.project <> t1.project and t.account = t1.account and DATE_FORMAT(t.date,'%Y%m') = concat(t1.`YEAR`, t1.`MONTH`)) as otherconsumed,\n\t(select ROUND(sum(t.EVALUATIONTIME),2) from zt_taskestimate t left join zt_task tt on tt.id = t.task where tt.project <> t1.project and t.account = t1.account and DATE_FORMAT(t.date,'%Y%m') = concat(t1.`YEAR`, t1.`MONTH`)) as otherEVALUATIONTIME\nFROM\n\t(\nSELECT YEAR\n\t( t1.date ) AS `year`,\n\tRight(100 + MONTH ( t1.date ), 2) AS `month`,\n\tRight(100 + day ( t1.date ), 2) AS `day`,\n\tt11.project,\n\tt21.`name` AS projectname,\n\tt1.account,\n\tt1.date,\n\tROUND( sum( t1.consumed ), 2 ) AS consumed,\n\tROUND( sum( t1.EVALUATIONCOST ), 2 ) AS EVALUATIONCOST,\n\tROUND( sum( t1.INPUTCOST ), 2 ) AS INPUTCOST,\n\tROUND( sum( t1.EVALUATIONTIME ), 2 ) AS EVALUATIONTIME\nFROM\n\t`zt_taskestimate` t1\n\tLEFT JOIN `zt_task` t11 ON t1.`TASK` = t11.`ID`\n\tLEFT JOIN `zt_project` t21 ON t11.`PROJECT` = t21.`ID` \nWHERE\n\tt11.project IS NOT NULL \n\tAND t11.project <> '0' \n\tAND t1.date <> '0000-00-00'  and t11.deleted = '0'\nGROUP BY\n\tt11.project,\n\tt21.`name`,\n\tt1.account,\n\tt1.date \n\t) t1 GROUP BY t1.account, t1.project,t1.projectname,t1.`YEAR`,t1.`MONTH`) T1",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5",
+  "psdedqcodeconds" : [ {
+    "condcode" : "t1.account =#{srf.webcontext.account}",
+    "psdedqcodecondname" : "查询条件",
+    "ordervalue" : 0
+  }, {
+    "condcode" : "t1.`MONTH`=#{srf.webcontext.month}",
+    "psdedqcodecondname" : "查询条件",
+    "ordervalue" : 1
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATAQUERIES/DEFAULT/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "DEFAULT",
+  "logicname" : "数据查询",
+  "codename" : "Default",
+  "defaultmode" : 0,
+  "custommode" : 1,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "PROJECTTASKESTIMATE",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT T1.* FROM (SELECT\n\tt1.account,t1.project,t1.projectname,t1.`YEAR`,concat(t1.`YEAR`, t1.`MONTH`) as `MONTH`,\n\tsum(if(t1.`day` = '01',t1.consumed, 0)) as oneconsumed,\n\tsum(if(t1.`day` = '02',t1.consumed, 0)) as twoconsumed,\n\tsum(if(t1.`day` = '03',t1.consumed, 0)) as threeconsumed,\n\tsum(if(t1.`day` = '04',t1.consumed, 0)) as FOURONSUMED,\n\tsum(if(t1.`day` = '05',t1.consumed, 0)) as fiveconsumed,\n\tsum(if(t1.`day` = '06',t1.consumed, 0)) as sixconsumed,\n\tsum(if(t1.`day` = '07',t1.consumed, 0)) as sevenconsumed,\n\tsum(if(t1.`day` = '08',t1.consumed, 0)) as eightconsumed,\n\tsum(if(t1.`day` = '09',t1.consumed, 0)) as nineconsumed,\n\tsum(if(t1.`day` = '10',t1.consumed, 0)) as tenconsumed,\n\tsum(if(t1.`day` = '11',t1.consumed, 0)) as elevenconsumed,\n\tsum(if(t1.`day` = '12',t1.consumed, 0)) as twelveconsumed,\n\tsum(if(t1.`day` = '13',t1.consumed, 0)) as thirteenconsumed,\n\tsum(if(t1.`day` = '14',t1.consumed, 0)) as fourteenconsumed,\n\tsum(if(t1.`day` = '15',t1.consumed, 0)) as fifteenconsumed,\n\tsum(if(t1.`day` = '16',t1.consumed, 0)) as sixteenconsumed,\n\tsum(if(t1.`day` = '17',t1.consumed, 0)) as seventeenconsumed,\n\tsum(if(t1.`day` = '18',t1.consumed, 0)) as eighteenconsumed,\n\tsum(if(t1.`day` = '19',t1.consumed, 0)) as nineteenconsumed,\n\tsum(if(t1.`day` = '20',t1.consumed, 0)) as twentyconsumed,\n\tsum(if(t1.`day` = '21',t1.consumed, 0)) as twentyoneconsumed,\n\tsum(if(t1.`day` = '22',t1.consumed, 0)) as twentytwoconsumed,\n\tsum(if(t1.`day` = '23',t1.consumed, 0)) as twentythreeconsumed,\n\tsum(if(t1.`day` = '24',t1.consumed, 0)) as twentyfourconsumed,\n\tsum(if(t1.`day` = '25',t1.consumed, 0)) as twentyfiveconsumed,\n\tsum(if(t1.`day` = '26',t1.consumed, 0)) as twentysixconsumed,\n\tsum(if(t1.`day` = '27',t1.consumed, 0)) as twentysevenconsumed,\n\tsum(if(t1.`day` = '28',t1.consumed, 0)) as twentyeightconsumed,\n\tsum(if(t1.`day` = '29',t1.consumed, 0)) as twentynineconsumed,\n\tsum(if(t1.`day` = '30',t1.consumed, 0)) as thirtyconsumed,\n\tsum(if(t1.`day` = '31',t1.consumed, 0)) as thirtyoneconsumed,\n\tsum(if(t1.`day` = '01',t1.EVALUATIONTIME, 0)) as oneEVALUATIONTIME,\n\tsum(if(t1.`day` = '02',t1.EVALUATIONTIME, 0)) as twoEVALUATIONTIME,\n\tsum(if(t1.`day` = '03',t1.EVALUATIONTIME, 0)) as threeEVALUATIONTIME,\n\tsum(if(t1.`day` = '04',t1.EVALUATIONTIME, 0)) as fourEVALUATIONTIME,\n\tsum(if(t1.`day` = '05',t1.EVALUATIONTIME, 0)) as fiveEVALUATIONTIME,\n\tsum(if(t1.`day` = '06',t1.EVALUATIONTIME, 0)) as sixEVALUATIONTIME,\n\tsum(if(t1.`day` = '07',t1.EVALUATIONTIME, 0)) as sevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '08',t1.EVALUATIONTIME, 0)) as eightEVALUATIONTIME,\n\tsum(if(t1.`day` = '09',t1.EVALUATIONTIME, 0)) as nineEVALUATIONTIME,\n\tsum(if(t1.`day` = '10',t1.EVALUATIONTIME, 0)) as tenEVALUATIONTIME,\n\tsum(if(t1.`day` = '11',t1.EVALUATIONTIME, 0)) as elevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '12',t1.EVALUATIONTIME, 0)) as twelveEVALUATIONTIME,\n\tsum(if(t1.`day` = '13',t1.EVALUATIONTIME, 0)) as thirteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '14',t1.EVALUATIONTIME, 0)) as fourteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '15',t1.EVALUATIONTIME, 0)) as fifteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '16',t1.EVALUATIONTIME, 0)) as sixteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '17',t1.EVALUATIONTIME, 0)) as seventeenEVALUATIONTIME,\n\tsum(if(t1.`day` = '18',t1.EVALUATIONTIME, 0)) as eighteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '19',t1.EVALUATIONTIME, 0)) as nineteenEVALUATIONTIME,\n\tsum(if(t1.`day` = '20',t1.EVALUATIONTIME, 0)) as twentyEVALUATIONTIME,\n\tsum(if(t1.`day` = '21',t1.EVALUATIONTIME, 0)) as twentyoneEVALUATIONTIME,\n\tsum(if(t1.`day` = '22',t1.EVALUATIONTIME, 0)) as twentytwoEVALUATIONTIME,\n\tsum(if(t1.`day` = '23',t1.EVALUATIONTIME, 0)) as twentythreeEVALUATIONTIME,\n\tsum(if(t1.`day` = '24',t1.EVALUATIONTIME, 0)) as twentyfourEVALUATIONTIME,\n\tsum(if(t1.`day` = '25',t1.EVALUATIONTIME, 0)) as twentyfiveEVALUATIONTIME,\n\tsum(if(t1.`day` = '26',t1.EVALUATIONTIME, 0)) as twentysixEVALUATIONTIME,\n\tsum(if(t1.`day` = '27',t1.EVALUATIONTIME, 0)) as twentysevenEVALUATIONTIME,\n\tsum(if(t1.`day` = '28',t1.EVALUATIONTIME, 0)) as twentyeightEVALUATIONTIME,\n\tsum(if(t1.`day` = '29',t1.EVALUATIONTIME, 0)) as twentynineEVALUATIONTIME,\n\tsum(if(t1.`day` = '30',t1.EVALUATIONTIME, 0)) as thirtyEVALUATIONTIME,\n\tsum(if(t1.`day` = '31',t1.EVALUATIONTIME, 0)) as thirtyoneEVALUATIONTIME,\n\tsum(if(t1.`day` = '01',t1.EVALUATIONCOST, 0)) as oneEVALUATIONCOST,\n\tsum(if(t1.`day` = '02',t1.EVALUATIONCOST, 0)) as twoEVALUATIONCOST,\n\tsum(if(t1.`day` = '03',t1.EVALUATIONCOST, 0)) as threeEVALUATIONCOST,\n\tsum(if(t1.`day` = '04',t1.EVALUATIONCOST, 0)) as fourEVALUATIONCOST,\n\tsum(if(t1.`day` = '05',t1.EVALUATIONCOST, 0)) as fiveEVALUATIONCOST,\n\tsum(if(t1.`day` = '06',t1.EVALUATIONCOST, 0)) as sixEVALUATIONCOST,\n\tsum(if(t1.`day` = '07',t1.EVALUATIONCOST, 0)) as sevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '08',t1.EVALUATIONCOST, 0)) as eightEVALUATIONCOST,\n\tsum(if(t1.`day` = '09',t1.EVALUATIONCOST, 0)) as nineEVALUATIONCOST,\n\tsum(if(t1.`day` = '10',t1.EVALUATIONCOST, 0)) as tenEVALUATIONCOST,\n\tsum(if(t1.`day` = '11',t1.EVALUATIONCOST, 0)) as elevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '12',t1.EVALUATIONCOST, 0)) as twelveEVALUATIONCOST,\n\tsum(if(t1.`day` = '13',t1.EVALUATIONCOST, 0)) as thirteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '14',t1.EVALUATIONCOST, 0)) as fourteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '15',t1.EVALUATIONCOST, 0)) as fifteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '16',t1.EVALUATIONCOST, 0)) as sixteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '17',t1.EVALUATIONCOST, 0)) as seventeenEVALUATIONCOST,\n\tsum(if(t1.`day` = '18',t1.EVALUATIONCOST, 0)) as eighteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '19',t1.EVALUATIONCOST, 0)) as nineteenEVALUATIONCOST,\n\tsum(if(t1.`day` = '20',t1.EVALUATIONCOST, 0)) as twentyEVALUATIONCOST,\n\tsum(if(t1.`day` = '21',t1.EVALUATIONCOST, 0)) as twentyoneEVALUATIONCOST,\n\tsum(if(t1.`day` = '22',t1.EVALUATIONCOST, 0)) as twentytwoEVALUATIONCOST,\n\tsum(if(t1.`day` = '23',t1.EVALUATIONCOST, 0)) as twentythreeEVALUATIONCOST,\n\tsum(if(t1.`day` = '24',t1.EVALUATIONCOST, 0)) as twentyfourEVALUATIONCOST,\n\tsum(if(t1.`day` = '25',t1.EVALUATIONCOST, 0)) as twentyfiveEVALUATIONCOST,\n\tsum(if(t1.`day` = '26',t1.EVALUATIONCOST, 0)) as twentysixEVALUATIONCOST,\n\tsum(if(t1.`day` = '27',t1.EVALUATIONCOST, 0)) as twentysevenEVALUATIONCOST,\n\tsum(if(t1.`day` = '28',t1.EVALUATIONCOST, 0)) as twentyeightEVALUATIONCOST,\n\tsum(if(t1.`day` = '29',t1.EVALUATIONCOST, 0)) as twentynineEVALUATIONCOST,\n\tsum(if(t1.`day` = '30',t1.EVALUATIONCOST, 0)) as thirtyEVALUATIONCOST,\n\tsum(if(t1.`day` = '31',t1.EVALUATIONCOST, 0)) as thirtyoneEVALUATIONCOST,\n\tSUM(T1.consumed) AS consumed,SUM(T1.EVALUATIONCOST) AS EVALUATIONCOST, SUM(T1.INPUTCOST) AS INPUTCOST, SUM(T1.EVALUATIONTIME) AS EVALUATIONTIME,\n(select ROUND(sum(t.consumed),2) from zt_taskestimate t left join zt_task tt on tt.id = t.task where tt.project <> t1.project and t.account = t1.account and tt.deleted = '0' and DATE_FORMAT(t.date,'%Y%m') = concat(t1.`YEAR`, t1.`MONTH`)) as otherconsumed,\n\t(select ROUND(sum(t.EVALUATIONTIME),2) from zt_taskestimate t left join zt_task tt on tt.id = t.task where tt.project <> t1.project and t.account = t1.account and tt.deleted = '0' and DATE_FORMAT(t.date,'%Y%m') = concat(t1.`YEAR`, t1.`MONTH`)) as otherEVALUATIONTIME\nFROM\n\t(\nSELECT YEAR\n\t( t1.date ) AS `year`,\n\tRight(100 + MONTH ( t1.date ), 2) AS `month`,\n\tRight(100 + day ( t1.date ), 2) AS `day`,\n\tt11.project,\n\tt21.`name` AS projectname,\n\tt1.account,\n\tt1.date,\n\tROUND( sum( t1.consumed ), 2 ) AS consumed,\n\tROUND( sum( t1.EVALUATIONCOST ), 2 ) AS EVALUATIONCOST,\n\tROUND( sum( t1.INPUTCOST ), 2 ) AS INPUTCOST,\n\tROUND( sum( t1.EVALUATIONTIME ), 2 ) AS EVALUATIONTIME\nFROM\n\t`zt_taskestimate` t1\n\tLEFT JOIN `zt_task` t11 ON t1.`TASK` = t11.`ID`\n\tLEFT JOIN `zt_project` t21 ON t11.`PROJECT` = t21.`ID` \nWHERE\n\tt11.project IS NOT NULL \n\tAND t11.project <> '0' \n\tAND t1.date <> '0000-00-00'  and t11.deleted = '0'\nGROUP BY\n\tt11.project,\n\tt21.`name`,\n\tt1.account,\n\tt1.date \n\t) t1 GROUP BY t1.account, t1.project,t1.projectname,t1.`YEAR`,t1.`MONTH`) T1",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5",
+  "psdedqcodeconds" : [ {
+    "condcode" : "t1.project =#{srf.webcontext.project}",
+    "psdedqcodecondname" : "查询条件",
+    "ordervalue" : 0
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATAQUERIES/VIEW/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "VIEW",
+  "logicname" : "默认（全部数据）",
+  "codename" : "View",
+  "defaultmode" : 0,
+  "custommode" : 0,
+  "viewcollevel" : 0,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "PROJECTTASKESTIMATE",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATAQUERIES/VIEW/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "SELECT\nt1.`DATE`,\nt1.`EVALUATIONCOST`,\nt1.`INPUTCOST`\nFROM `zt_taskestimate` t1 \n",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5",
+  "psdedqcodeexps" : [ {
+    "expcode" : "t1.`DATE`",
+    "ordervalue" : 0,
+    "psdedqcodeexpname" : "DATE"
+  }, {
+    "expcode" : "t1.`EVALUATIONCOST`",
+    "ordervalue" : 1,
+    "psdedqcodeexpname" : "EVALUATIONCOST"
+  }, {
+    "expcode" : "t1.`INPUTCOST`",
+    "ordervalue" : 2,
+    "psdedqcodeexpname" : "INPUTCOST"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATARELATIONS/Default/PSDEDATARELATION.json

+{
+  "codename" : "Default",
+  "psdedatarelationname" : "项目工时统计默认关系界面组"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATASETS/AccountDetail/PSDEDATASET.json

+{
+  "logicname" : "用户月工时详情",
+  "codename" : "AccountDetail",
+  "psdedatasetname" : "AccountDetail",
+  "psdedsdqs" : [ {
+    "ordervalue" : 100,
+    "psdedqid" : "<PSDATAENTITY>/AccountDetail"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEDATASETS/DEFAULT/PSDEDATASET.json

+{
+  "logicname" : "数据集",
+  "codename" : "Default",
+  "defaultmode" : 1,
+  "psdedatasetname" : "DEFAULT",
+  "psdedsdqs" : [ {
+    "ordervalue" : 100,
+    "psdedqid" : "<PSDATAENTITY>/DEFAULT"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEFORMS/Default/PSDEFORM.json

+{
+  "formtype" : "SEARCHFORM",
+  "dynasysrefmode" : 0,
+  "codename" : "Default",
+  "psdeformname" : "默认搜索表单",
+  "mobflag" : 0,
+  "psdeformdetails" : [ {
+    "caption" : "常规条件",
+    "showcaption" : 0,
+    "psdeformdetailname" : "formpage1",
+    "detailtype" : "FORMPAGE",
+    "colmodel" : "33%;33%;34%"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEFORMS/Main/PSDEFORM.json

+{
+  "formtype" : "EDITFORM",
+  "dynasysrefmode" : 0,
+  "codename" : "Main",
+  "psdeformname" : "主编辑表单",
+  "mobflag" : 0,
+  "psdeformdetails" : [ {
+    "caption" : "基本信息",
+    "psdeformdetailname" : "formpage1",
+    "detailtype" : "FORMPAGE",
+    "psdeformdetails" : [ {
+      "caption" : "项目工时统计基本信息",
+      "psdeformdetailname" : "group1",
+      "detailtype" : "GROUPPANEL",
+      "psdeformid" : "<PSDEFORM>",
+      "colmodel" : "50%;50%"
+    } ]
+  }, {
+    "caption" : "其它",
+    "psdeformdetailname" : "formpage2",
+    "detailtype" : "FORMPAGE",
+    "psdeformdetails" : [ {
+      "caption" : "操作信息",
+      "psdeformdetailname" : "group2",
+      "detailtype" : "GROUPPANEL",
+      "psdeformid" : "<PSDEFORM>",
+      "colmodel" : "50%;50%"
+    } ]
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEGRIDS/Main/PSDEGRID.json

+{
+  "showheader" : 1,
+  "enablepagingbar" : 1,
+  "psdegridname" : "主表格",
+  "pagingsize" : 20,
+  "codename" : "Main"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDELISTS/MOB/PSDELIST.json

+{
+  "appenddeitems" : 1,
+  "logicname" : "移动端列表",
+  "psdelistname" : "MOB",
+  "psdedsid" : "<PSDATAENTITY>/DEFAULT",
+  "codename" : "Mob"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEEDITVIEW",
+  "codename" : "EditView",
+  "predefineviewtype" : "EDITVIEW",
+  "psdeviewbasename" : "项目工时统计实体编辑视图",
+  "readonlymode" : 0,
+  "title" : "项目工时统计编辑视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto91",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeformname" : "主编辑表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "FORM",
+    "psdeviewctrlname" : "FORM",
+    "psdeformid" : "<PSDATAENTITY>/Main",
+    "configinfo" : "[表单]主编辑表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
+    "psdetoolbarid" : "Auto5",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEVIEWBASES/EditView2/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEEDITVIEW2",
+  "codename" : "EditView2",
+  "psdeviewbasename" : "项目工时统计实体编辑视图（左右关系）",
+  "readonlymode" : 0,
+  "title" : "项目工时统计编辑视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "DRBAR",
+    "psdeviewctrlname" : "DRBAR",
+    "psdedrname" : "项目工时统计默认关系界面组",
+    "configinfo" : "[关系组]项目工时统计默认关系界面组",
+    "psdedrid" : "<PSDATAENTITY>/Default"
+  }, {
+    "psachandlerid" : "Auto91",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeformname" : "主编辑表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "FORM",
+    "psdeviewctrlname" : "FORM",
+    "psdeformid" : "<PSDATAENTITY>/Main",
+    "configinfo" : "[表单]主编辑表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
+    "psdetoolbarid" : "Auto5",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEVIEWBASES/GridView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEGRIDVIEW",
+  "codename" : "GridView",
+  "predefineviewtype" : "MDATAVIEW",
+  "psdeviewbasename" : "项目工时统计实体表格视图",
+  "readonlymode" : 0,
+  "title" : "项目工时统计表格视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto96",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdegridid" : "<PSDATAENTITY>/Main",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "GRID",
+    "psdeviewctrlname" : "GRID",
+    "psdegridname" : "主表格",
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
+  }, {
+    "psachandlerid" : "Auto71",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeformname" : "默认搜索表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "SEARCHFORM",
+    "psdeviewctrlname" : "SEARCHFORM",
+    "psdeformid" : "<PSDATAENTITY>/Default",
+    "configinfo" : "[表单]默认搜索表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（版本）_编辑_提交测试_查看Bug_删除",
+    "psdetoolbarid" : "Auto8_1132",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（版本）_编辑_提交测试_查看Bug_删除"
+  } ],
+  "psdeviewrvs" : [ {
+    "minorpsdeviewid" : "<PSDATAENTITY>/EditView",
+    "refmodetext" : "编辑数据视图",
+    "psdeviewrvname" : "EDITDATA",
+    "defviewtype" : "EDITVIEW"
+  }, {
+    "minorpsdeviewid" : "<PSDATAENTITY>/EditView",
+    "refmodetext" : "新建数据视图",
+    "psdeviewrvname" : "NEWDATA",
+    "defviewtype" : "EDITVIEW"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEVIEWBASES/MPickupView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEMPICKUPVIEW",
+  "codename" : "MPickupView",
+  "predefineviewtype" : "MPICKUPVIEW",
+  "psdeviewbasename" : "项目工时统计实体数据多项选择视图",
+  "readonlymode" : 0,
+  "title" : "项目工时统计数据多项选择视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeviewid" : "<PSDATAENTITY>/PickupGridView",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "PICKUPVIEWPANEL",
+    "psdeviewctrlname" : "PICKUPVIEWPANEL",
+    "configinfo" : "[实体视图]项目工时统计实体选择表格视图（部件视图）"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEVIEWBASES/PickupGridView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
+  "codename" : "PickupGridView",
+  "psdeviewbasename" : "项目工时统计实体选择表格视图（部件视图）",
+  "readonlymode" : 0,
+  "title" : "项目工时统计选择表格视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto96",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdegridid" : "<PSDATAENTITY>/Main",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "GRID",
+    "psdeviewctrlname" : "GRID",
+    "psdegridname" : "主表格",
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
+  }, {
+    "psachandlerid" : "Auto71",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeformname" : "默认搜索表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "SEARCHFORM",
+    "psdeviewctrlname" : "SEARCHFORM",
+    "psdeformid" : "<PSDATAENTITY>/Default",
+    "configinfo" : "[表单]默认搜索表单"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEVIEWBASES/PickupView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEPICKUPVIEW",
+  "codename" : "PickupView",
+  "predefineviewtype" : "PICKUPVIEW",
+  "psdeviewbasename" : "项目工时统计实体数据选择视图",
+  "readonlymode" : 0,
+  "title" : "项目工时统计数据选择视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "psdeviewid" : "<PSDATAENTITY>/PickupGridView",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "PICKUPVIEWPANEL",
+    "psdeviewctrlname" : "PICKUPVIEWPANEL",
+    "configinfo" : "[实体视图]项目工时统计实体选择表格视图（部件视图）"
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSDEVIEWBASES/RedirectView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEREDIRECTVIEW",
+  "codename" : "RedirectView",
+  "predefineviewtype" : "REDIRECTVIEW",
+  "psdeviewbasename" : "项目工时统计实体数据重定向视图",
+  "readonlymode" : 0,
+  "title" : "项目工时统计数据重定向视图"
+}
\ No newline at end of file

PSMODULES/ibizpro/PSDATAENTITIES/PROJECTTASKESTIMATE/PSHELPARTICLES/Auto175/PSHELPARTICLE.json

+{
+  "articletype" : "DEMODEL",
+  "pshelparticlename" : "[PROJECTTASKESTIMATE]模型说明",
+  "codename" : "Auto175",
+  "pshelpsections" : [ {
+    "validflag" : 1,
+    "codename" : "Auto2010",
+    "pshelpsectionname" : "概念",
+    "sectiontype" : "DECONCEPTS",
+    "ordervalue" : 100
+  }, {
+    "validflag" : 1,
+    "codename" : "Auto2013",
+    "pshelpsectionname" : "属性",
+    "sectiontype" : "DEFDESCS",
+    "ordervalue" : 200
+  }, {
+    "validflag" : 1,
+    "codename" : "Auto2011",
+    "pshelpsectionname" : "任务",
+    "sectiontype" : "DEMANUALS",
+    "ordervalue" : 300
+  } ]
+}
\ No newline at end of file

PSMODULES/ibizpro/PSSYSBACKSERVICES/CreateCycleTasksService/PSSYSBACKSERVICE.json

+{
+  "psdeid" : "zentao/ZT_TASK",
+  "psdeactionid" : "zentao/ZT_TASK/CreateCycleTasks",
+  "servicecontainer" : "SC01",
+  "psdename" : "ZT_TASK",
+  "codename" : "CreateCycleTasksService",
+  "startmode" : "AUTO",
+  "serviceobj" : "CreateCycleTasksService",
+  "pssysbackservicename" : "定时生成周期任务"
+}
\ No newline at end of file

PSMODULES/report/PSDATAENTITIES/IBZ_DAILY/PSDEFORMS/CreateDailyEditForm/PSDEFORM.json

@@ -37,6 +37,28 @@
         "psdeformid" : "<PSDEFORM>",
         "editortypename" : "隐藏表单项"
       } ]
+    }, {
+      "psdefid" : "<PSDATAENTITY>/REPORTTO",
+      "editortype" : "DROPDOWNLIST",
+      "psdeformdetailname" : "REPORTTO",
+      "psdefname" : "REPORTTO",
+      "detailtype" : "FORMITEM",
+      "logicname" : "汇报给",
+      "col_lg" : 12,
+      "psdeformid" : "<PSDEFORM>",
+      "editortypename" : "下拉列表框",
+      "pscodelistid" : "zentao/UserRealName"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/MAILTO",
+      "editortype" : "MDROPDOWNLIST",
+      "psdeformdetailname" : "MAILTO",
+      "psdefname" : "MAILTO",
+      "detailtype" : "FORMITEM",
+      "logicname" : "抄送给",
+      "col_lg" : 12,
+      "psdeformid" : "<PSDEFORM>",
+      "editortypename" : "下拉列表框（多选）",
+      "pscodelistid" : "zentao/UserRealName"
     }, {
       "psdefid" : "<PSDATAENTITY>/TODAYTASK",
       "editorparams" : "SRFNAVPARAM.date=%date%\nSRFNAVCTX.date=%date%",
@@ -96,28 +118,6 @@
       "logicname" : "附件",
       "psdeformid" : "<PSDEFORM>",
       "editortypename" : "文件上传控件"
-    }, {
-      "psdefid" : "<PSDATAENTITY>/REPORTTO",
-      "editortype" : "DROPDOWNLIST",
-      "psdeformdetailname" : "REPORTTO",
-      "psdefname" : "REPORTTO",
-      "detailtype" : "FORMITEM",
-      "logicname" : "汇报给",
-      "col_lg" : 12,
-      "psdeformid" : "<PSDEFORM>",
-      "editortypename" : "下拉列表框",
-      "pscodelistid" : "zentao/UserRealName"
-    }, {
-      "psdefid" : "<PSDATAENTITY>/MAILTO",
-      "editortype" : "MDROPDOWNLIST",
-      "psdeformdetailname" : "MAILTO",
-      "psdefname" : "MAILTO",
-      "detailtype" : "FORMITEM",
-      "logicname" : "抄送给",
-      "col_lg" : 12,
-      "psdeformid" : "<PSDEFORM>",
-      "editortypename" : "下拉列表框（多选）",
-      "pscodelistid" : "zentao/UserRealName"
     }, {
       "psdefid" : "<PSDATAENTITY>/IBZ_DAILYID",
       "editortype" : "HIDDEN",

PSMODULES/report/PSDATAENTITIES/IBZ_DAILY/PSDEFORMS/EditDailyEditForm/PSDEFORM.json

@@ -37,6 +37,28 @@
         "psdeformid" : "<PSDEFORM>",
         "editortypename" : "隐藏表单项"
       } ]
+    }, {
+      "psdefid" : "<PSDATAENTITY>/REPORTTO",
+      "editortype" : "DROPDOWNLIST",
+      "psdeformdetailname" : "REPORTTO",
+      "psdefname" : "REPORTTO",
+      "detailtype" : "FORMITEM",
+      "logicname" : "汇报给",
+      "col_lg" : 12,
+      "psdeformid" : "<PSDEFORM>",
+      "editortypename" : "下拉列表框",
+      "pscodelistid" : "zentao/UserRealName"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/MAILTO",
+      "editortype" : "MDROPDOWNLIST",
+      "psdeformdetailname" : "MAILTO",
+      "psdefname" : "MAILTO",
+      "detailtype" : "FORMITEM",
+      "logicname" : "抄送给",
+      "col_lg" : 12,
+      "psdeformid" : "<PSDEFORM>",
+      "editortypename" : "下拉列表框（多选）",
+      "pscodelistid" : "zentao/UserRealName"
     }, {
       "psdefid" : "<PSDATAENTITY>/TODAYTASK",
       "editortype" : "MDROPDOWNLIST",
@@ -95,28 +117,6 @@
       "logicname" : "附件",
       "psdeformid" : "<PSDEFORM>",
       "editortypename" : "文件上传控件"
-    }, {
-      "psdefid" : "<PSDATAENTITY>/REPORTTO",
-      "editortype" : "DROPDOWNLIST",
-      "psdeformdetailname" : "REPORTTO",
-      "psdefname" : "REPORTTO",
-      "detailtype" : "FORMITEM",
-      "logicname" : "汇报给",
-      "col_lg" : 12,
-      "psdeformid" : "<PSDEFORM>",
-      "editortypename" : "下拉列表框",
-      "pscodelistid" : "zentao/UserRealName"
-    }, {
-      "psdefid" : "<PSDATAENTITY>/MAILTO",
-      "editortype" : "MDROPDOWNLIST",
-      "psdeformdetailname" : "MAILTO",
-      "psdefname" : "MAILTO",
-      "detailtype" : "FORMITEM",
-      "logicname" : "抄送给",
-      "col_lg" : 12,
-      "psdeformid" : "<PSDEFORM>",
-      "editortypename" : "下拉列表框（多选）",
-      "pscodelistid" : "zentao/UserRealName"
     }, {
       "psdefid" : "<PSDATAENTITY>/IBZ_DAILYID",
       "editortype" : "HIDDEN",

PSMODULES/report/PSDATAENTITIES/IBZ_DAILY/PSDEVIEWBASES/DailyEditView/PSDEVIEWBASE.json

 {
-  "openmode" : "DRAWER_RIGHT",
+  "openmode" : "INDEXVIEWTAB",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "DailyEditView",
   "psdeviewbasename" : "日报实体编辑视图（新建）",

PSMODULES/report/PSDATAENTITIES/IBZ_DAILY/PSDEVIEWBASES/mainEditView/PSDEVIEWBASE.json

 {
-  "openmode" : "DRAWER_RIGHT",
+  "openmode" : "INDEXVIEWTAB",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "mainEditView",
   "psdeviewbasename" : "日报实体编辑视图（编辑）",

PSMODULES/report/PSDATAENTITIES/IBZ_MONTHLY/PSDEFORMS/New/PSDEFORM.json

@@ -35,6 +35,28 @@
         "logicname" : "日期",
         "psdeformid" : "<PSDEFORM>",
         "editortypename" : "隐藏表单项"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/REPORTTO",
+        "psdeformdetailname" : "reportto",
+        "psdefname" : "reportto",
+        "detailtype" : "FORMITEM",
+        "logicname" : "汇报给",
+        "col_lg" : 12,
+        "psdeformid" : "<PSDEFORM>",
+        "col_md" : 12,
+        "pscodelistid" : "zentao/UserRealName"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/MAILTO",
+        "editortype" : "MDROPDOWNLIST",
+        "psdeformdetailname" : "mailto",
+        "psdefname" : "mailto",
+        "detailtype" : "FORMITEM",
+        "logicname" : "抄送给",
+        "col_lg" : 12,
+        "psdeformid" : "<PSDEFORM>",
+        "col_md" : 12,
+        "editortypename" : "下拉列表框（多选）",
+        "pscodelistid" : "zentao/UserRealName"
       }, {
         "psdefid" : "<PSDATAENTITY>/THISMONTHTASK",
         "editortype" : "MDROPDOWNLIST",
@@ -87,28 +109,6 @@
         "logicname" : "附件",
         "psdeformid" : "<PSDEFORM>",
         "editortypename" : "文件上传控件"
-      }, {
-        "psdefid" : "<PSDATAENTITY>/REPORTTO",
-        "psdeformdetailname" : "reportto",
-        "psdefname" : "reportto",
-        "detailtype" : "FORMITEM",
-        "logicname" : "汇报给",
-        "col_lg" : 12,
-        "psdeformid" : "<PSDEFORM>",
-        "col_md" : 12,
-        "pscodelistid" : "zentao/UserRealName"
-      }, {
-        "psdefid" : "<PSDATAENTITY>/MAILTO",
-        "editortype" : "MDROPDOWNLIST",
-        "psdeformdetailname" : "mailto",
-        "psdefname" : "mailto",
-        "detailtype" : "FORMITEM",
-        "logicname" : "抄送给",
-        "col_lg" : 12,
-        "psdeformid" : "<PSDEFORM>",
-        "col_md" : 12,
-        "editortypename" : "下拉列表框（多选）",
-        "pscodelistid" : "zentao/UserRealName"
       }, {
         "psdefid" : "<PSDATAENTITY>/IBZ_MONTHLYID",
         "editortype" : "HIDDEN",

PSMODULES/report/PSDATAENTITIES/IBZ_MONTHLY/PSDEVIEWBASES/EditMonthlyEditView/PSDEVIEWBASE.json

 {
-  "openmode" : "DRAWER_RIGHT",
+  "openmode" : "INDEXVIEWTAB",
   "caption" : "月报",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "EditMonthlyEditView",

PSMODULES/report/PSDATAENTITIES/IBZ_MONTHLY/PSDEVIEWBASES/NewMonthlyEditView/PSDEVIEWBASE.json

 {
-  "openmode" : "DRAWER_RIGHT",
+  "openmode" : "INDEXVIEWTAB",
   "caption" : "月报",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "NewMonthlyEditView",

PSMODULES/report/PSDATAENTITIES/IBZ_WEEKLY/PSDEFORMS/Main/PSDEFORM.json

@@ -29,6 +29,25 @@
       "logicname" : "日期",
       "psdeformid" : "<PSDEFORM>",
       "editortypename" : "隐藏表单项"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/REPORTTO",
+      "psdeformdetailname" : "reportto",
+      "psdefname" : "reportto",
+      "detailtype" : "FORMITEM",
+      "logicname" : "汇报给",
+      "col_lg" : 12,
+      "allowempty" : 0,
+      "psdeformid" : "<PSDEFORM>"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/MAILTO",
+      "editortype" : "MDROPDOWNLIST",
+      "psdeformdetailname" : "mailto",
+      "psdefname" : "mailto",
+      "detailtype" : "FORMITEM",
+      "logicname" : "抄送给",
+      "col_lg" : 12,
+      "psdeformid" : "<PSDEFORM>",
+      "editortypename" : "下拉列表框（多选）"
     }, {
       "psdefid" : "<PSDATAENTITY>/THISWEEKTASK",
       "editortype" : "MDROPDOWNLIST",
@@ -88,25 +107,6 @@
       "logicname" : "附件",
       "psdeformid" : "<PSDEFORM>",
       "editortypename" : "文件上传控件"
-    }, {
-      "psdefid" : "<PSDATAENTITY>/REPORTTO",
-      "psdeformdetailname" : "reportto",
-      "psdefname" : "reportto",
-      "detailtype" : "FORMITEM",
-      "logicname" : "汇报给",
-      "col_lg" : 12,
-      "allowempty" : 0,
-      "psdeformid" : "<PSDEFORM>"
-    }, {
-      "psdefid" : "<PSDATAENTITY>/MAILTO",
-      "editortype" : "MDROPDOWNLIST",
-      "psdeformdetailname" : "mailto",
-      "psdefname" : "mailto",
-      "detailtype" : "FORMITEM",
-      "logicname" : "抄送给",
-      "col_lg" : 12,
-      "psdeformid" : "<PSDEFORM>",
-      "editortypename" : "下拉列表框（多选）"
     }, {
       "psdefid" : "<PSDATAENTITY>/IBZ_WEEKLYID",
       "editortype" : "HIDDEN",

PSMODULES/report/PSDATAENTITIES/IBZ_WEEKLY/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

 {
-  "openmode" : "DRAWER_RIGHT",
+  "openmode" : "INDEXVIEWTAB",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "EditView",
   "predefineviewtype" : "EDITVIEW",

PSMODULES/report/PSDATAENTITIES/IBZ_WEEKLY/PSDEVIEWBASES/EditViewEdit/PSDEVIEWBASE.json

 {
-  "openmode" : "DRAWER_RIGHT",
+  "openmode" : "INDEXVIEWTAB",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "EditViewEdit",
   "psdeviewbasename" : "周报实体编辑视图(编辑)",

PSMODULES/zentao/PSCODELISTS/TaskSpecies/PSCODELIST.json

+{
+  "psdeid" : "<PSMODULE>/ZT_TASK",
+  "pscodelistname" : "任务种别",
+  "cltype" : "STATIC",
+  "userscope" : 0,
+  "validflag" : 1,
+  "psdename" : "ZT_TASK",
+  "codename" : "TaskSpecies",
+  "pscodeitems" : [ {
+    "validflag" : 1,
+    "defaultflag" : 0,
+    "codeitemvalue" : "plan",
+    "pscodeitemname" : "计划任务",
+    "ordervalue" : 10
+  }, {
+    "validflag" : 1,
+    "defaultflag" : 0,
+    "codeitemvalue" : "cycle",
+    "pscodeitemname" : "周期任务",
+    "ordervalue" : 20
+  }, {
+    "validflag" : 1,
+    "defaultflag" : 0,
+    "codeitemvalue" : "temp",
+    "pscodeitemname" : "临时任务",
+    "ordervalue" : 30
+  } ]
+}
\ No newline at end of file

PSMODULES/zentao/PSCODELISTS/TimeEvaluationStatuts/PSCODELIST.json

+{
+  "pscodelistname" : "工时评估",
+  "cltype" : "STATIC",
+  "userscope" : 0,
+  "validflag" : 1,
+  "codename" : "TimeEvaluationStatuts"
+}
\ No newline at end of file

PSMODULES/zentao/PSDATAENTITIES/TASKESTIMATESTATS/PSDEDATAQUERIES/ActionMonth/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "ActionMonth",
+  "logicname" : "日志月",
+  "codename" : "ActionMonth",
+  "defaultmode" : 0,
+  "custommode" : 1,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "TASKESTIMATESTATS",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/zentao/PSDATAENTITIES/TASKESTIMATESTATS/PSDEDATAQUERIES/ActionMonth/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "select t1.`YEAR`,concat(t1.`YEAR`, Right(100+ t1.`MONTH`,2)) as `MONTH`,concat(t1.`MONTH`,'月') as monthname from (select DISTINCT year( t1.date ) AS `year`,MONTH(t1.date) as `MONTH` from zt_taskestimate t1 where t1.date <> '0000-00-00' ) t1",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5"
+}
\ No newline at end of file

PSMODULES/zentao/PSDATAENTITIES/TASKESTIMATESTATS/PSDEDATAQUERIES/ActionYear/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "ActionYear",
+  "logicname" : "日志年",
+  "codename" : "ActionYear",
+  "defaultmode" : 0,
+  "custommode" : 1,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "TASKESTIMATESTATS",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/zentao/PSDATAENTITIES/TASKESTIMATESTATS/PSDEDATAQUERIES/ActionYear/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

+{
+  "querycode" : "select t1.`YEAR`,concat(t1.`year`, '年') as yearname from (select DISTINCT year( t1.date ) AS `year` from zt_taskestimate t1 where t1.date <> '0000-00-00' ) t1",
+  "dbtype" : "MYSQL5",
+  "psdedqcodename" : "MySQL5"
+}
\ No newline at end of file