Commit 2a734827 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

parents a1c718dc 9c73f62a
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
SELECT a.EMP_NAME, SELECT a.EMP_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
b.EMP_SEX, b.EMP_SEX,
b.EMP_AGE, (substring(now(),1,4)-substring(a.EMP_IDCARD,7,4))-(substring(a.EMP_IDCARD,11,4)-date_format(now(),'%m%d')>0) EMP_AGE,
b.EMP_PHONE, b.EMP_PHONE,
CASE CASE
WHEN MAX(a.EMP_NATRUE)=3 THEN "3" WHEN MAX(a.EMP_NATRUE)=3 THEN "3"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment