fq(S$cssmn=A6oykWAo;O`&bkEO|L)o&%gI6ge|myM+5x+3Vs>5AhuzFnF===t~iE1S}9c&J2ntRyegoZUHM7Qb> zR)ahyY$rA{DQy25Bj+9$1AaG$jvmn6<_k`)5q~b}&}^i~9_DjY@a6$ZW!F(T6Ai9R z7 S<)=y4RPgW;k+sKP*Akjqt4ZM8=>A&}CmG Uv z3Tafkv7ub4-(j@aYm?JPJyV9G0#(W!3jPhH*_3G;it>{~B;_lMG~umEwf-=MTdPuq zDlgFv) x0@6Y@Sa+gPYCW$KQ+e>a$2o`w#O&5h7ukkM}a-eS}3%A(yvaBUii zoTZuW^4Nti1n|&RV>_m)oPb7Yu}M*FiRs3zRRSI DjQ_bO;5S!n(@^I?FQtd?Fn#q>I zmaBizdGYG~Vjv*du1bHK!zQ^%FD|7HgH+Lxf_N* Mn26vcZDCo7u`N{3%G%9ZxhlHK z(K~HpHqGU6i>`gl)47Nw=Hyd<)zn)f$ofXBo#zIgXnZ7J%~B k2t%v+4UTL>}Q!}W_wdwH$fE?Gg(HD3fS1RC@3A5^ZFsMvc$ zz;q~2Ukg}#dMfdPuqadU8hvFQsj2_v!;WSLYDl`OO{v6aUDv+&1t^>kw5JiF{URZ0 zh%6vAoulH-1$95^AnaBQ>6DKmM6XtB0-c{>bZ#LUouB-k3EXf{bpu~JopC3Z;Nl}{ zfCHgy_J*)4)t3w8mU$mNCX+q_=Nm5Jy2$mxE4ybbsgiTGkoLHRID74Hpx!6hF&r-Y zCvL9P>Y}GKD8r_Qg$qF3^Yoaj{rQm}o!dlZukY;jd_6p0>)R?)-}0c7trW%w4ZLO; zKr^M w>i|>}H03EZ4Hgmxrh-+W!^$IFV>0;xTMw;iMFGre|-p84$5rJ_{{yI4q z&sC88nQewmrWA>qr#HB6s<;vH%@&w3kzW-0DU{E4)D}Pb`>w)xXL(%_WS_`n-^+W) zF>JOJdOM3Z^)s}~>pRpC%x{>MC!#uxIB&6M0@c{cSwjnYg;oHFgRMAHqMA}WTM%<@ zO`((z5VLhW3j)m_uA0_4a9g5!kE(8_A~i=++jbrW=T$ehpIA0`0_ u9U^B+PP^o4wW6w%s#ZL85t0j*hQ7(~Vhhs}D_UGkeEBWq{OK~j5b-75%=1TS z#{Vge@;yT3NJRg~AuB&B1456+y~j+KL&mcpqFw}B8p;WUlM_0;31Org#Gxc9X~IF` zlSqk*;q&f|ahsxga#Ppp+Tw6?Vf)d+;uGXMO56alT!0>H*K5J@!f*%gpsV4dfNX{; z#^I^3_!!p*1B%(|WD9|nn25m45GC}lFl9~6Bbcd;14B+(!inM*obpx}TB!j{O?EP= zDRkAl&5EfTibEVp+Cc+i#3D^x#P~a+D3++y> mg4VIJ1Lr$|zXu4`fbT 5#bZ zD6PfF rK9Hht4sU%w@vBs=`TR< 1m9dz^fYsgxdKf#R@nxaA^_@?0dtB^6T9}J_th=synB|9`A zHALyvLu%Pl^B5+WtA-(m9KmSxj0|Q $CzC4~yZi$Dq`4wIv-D4f^6_Hs#K%&mQz z)!&Sg$`o; E5ZJd5;8CK`ep2bpzL@#9gRy>e$nAKkJ|i@?4s5g8|uZP;Fb_w2o( z(r?VD-mDcKBOxX}OODUO;qS_z?k#p~$5Lx}&J2)E#)^8XXdk5X+ru$T(&u;^w&k&@ z9@(sA)@)P|lGnEsdCG}{P+*&58q{H@az>?lTtDvqS ~Ke?( Za(pQ1a&Lo0x^Ci-VP-b{3gfIOneVBgVaJJzxa`x?=%wK2wj9-|}&t)%l~fhx79Y z%G)rCMkAeFGt2>HcvZSAeI#~xV=iN{4}kn2{9UuX$tpd}Lnmf4-q!L1C;47Ru1=|4 zkY1riJdL62kBTR&nX7Kp5AmE*H#wskP>8Yo^zL#Ai>^evO=PI7hy6!|tmI*Nn4}r8 z2003d;s8+8SrT@EM48l>vlMQSCy`(%5%Gb1#eU{k4N9OzdXmv_L%$rMD^b7D=(AN( zBbPVRf_*+Yg$#GfD3}T8eRuqM&>C|i_1mHQL`O{Oipd3!jMnLi2P7Fb;xz6(lzI(} zI$GQ0`fc +9O{a)w|41xyq } zxg_d)T;vA{Vg7QKe=QmPJM7Q-?C -Kf7Vy*&Ld(f=Bt`un7R_5}XA z^o=aPg#FFR{L>@*JL=DN>|aqO+5QFUA3nw3QGd1%{;J|T?EfA0&t(OFu`YmsuwH)D Npn!n3xW51O{{W#jGiCq) literal 0 HcmV?d00001 diff --git a/src/com/api/attendance/common/CommonActionApi.java b/src/com/api/attendance/common/CommonActionApi.java new file mode 100644 index 0000000..9951e9e --- /dev/null +++ b/src/com/api/attendance/common/CommonActionApi.java @@ -0,0 +1,9 @@ +package com.api.attendance.common; + +import com.engine.common.web.CommonAction; + +import javax.ws.rs.Path; + +@Path("/operate/common") +public class CommonActionApi extends CommonAction{ +} diff --git a/src/com/api/attendance/persongroup/web/PersonGroupActionApi.java b/src/com/api/attendance/persongroup/web/PersonGroupActionApi.java new file mode 100644 index 0000000..039d41b --- /dev/null +++ b/src/com/api/attendance/persongroup/web/PersonGroupActionApi.java @@ -0,0 +1,11 @@ +package com.api.attendance.persongroup.web; + +import com.engine.attendance.persongroup.web.PersonGroupAction; +import lombok.extern.slf4j.Slf4j; + +import javax.ws.rs.Path; + +@Path("/attendance/persongroup") +@Slf4j +public class PersonGroupActionApi extends PersonGroupAction { +} diff --git a/src/com/attendance/engine/util/SendEmMessage.java b/src/com/attendance/engine/util/SendEmMessage.java deleted file mode 100644 index d4d5c04..0000000 --- a/src/com/attendance/engine/util/SendEmMessage.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.util; - -import com.cloudstore.dev.api.bean.MessageBean; -import com.cloudstore.dev.api.bean.MessageType; -import com.cloudstore.dev.api.util.Util_Message; -import com.engine.dto.BaseResult; -import com.google.common.collect.Maps; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import weaver.general.BaseBean; - -import java.io.IOException; -import java.lang.reflect.Type; -import java.util.Map; -import java.util.Set; - -/** - * 消息中心 - */ -@Slf4j -public class SendEmMessage { - - - /** - * - * @param userIdsSet 接收人id 必填 - * @param title 标题 - * @param context 内容 - * @param pcLinkUrl PC端链接 - * @param linkMobileUrl 移动端链接 - */ - public static void sendEmMessage(Set userIdsSet,int messageType,int creater, String title,String context,String pcLinkUrl,String linkMobileUrl){ - MessageType type = MessageType.newInstance(messageType); // 消息来源(见文档第四点补充 必填) - - try { - MessageBean messageBean = Util_Message.createMessage(type, userIdsSet, title, context, pcLinkUrl, linkMobileUrl); - messageBean.setCreater(creater);// 创建人id - - Util_Message.store(messageBean); - } catch (IOException e) { - log.error("sendEmMessage error: [{}]",e); - e.printStackTrace(); - } - } - - public static BaseResult sendWxMessage(String chatId,String messageContent){ - BaseBean baseBean = new BaseBean(); - //发送消息接口 - String sendMessageToWxGroupUrl = baseBean.getPropValue("weComConf","sendMessageToWxGroupUrl"); - Map sendMessageParamMap = Maps.newHashMap(); - sendMessageParamMap.put("chatid",chatId); - sendMessageParamMap.put("msgtype","markdown"); - Map content = Maps.newHashMap(); - content.put("content",messageContent); - sendMessageParamMap.put("markdown",content); - Gson gson = new Gson(); - BaseResult baseResult = gson.fromJson(TokenUtil.post(sendMessageToWxGroupUrl,gson.toJson(sendMessageParamMap)),(Type) BaseResult.class); - return baseResult; - } -} diff --git a/src/com/attendance/engine/util/TokenUtil.java b/src/com/attendance/engine/util/TokenUtil.java deleted file mode 100644 index 3b56deb..0000000 --- a/src/com/attendance/engine/util/TokenUtil.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.util; - -import com.cloudstore.dev.api.util.Util_DataCache; -import com.engine.dto.TokenResult; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import weaver.general.BaseBean; -import weaver.general.Util; - -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.Map; - -@Slf4j -public class TokenUtil { - - private static final int timeOutSecond = 3600; - - /** - * 配置文件名称 - */ - private static final String confFileName = "weComConf"; - - private static BaseBean baseBean = new BaseBean(); - - private static Gson gson = new Gson(); - - public static final String TOKEN_URL = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"; - - private static String corpid = ""; - - private static String corpsecret = ""; - - static { - corpid = baseBean.getPropValue(confFileName,"corpid"); - corpsecret = baseBean.getPropValue(confFileName,"corpsecret"); -// Util_DataCache.setObjVal("corpid",corpid); -// Util_DataCache.setObjVal("corpsecret",corpsecret); - } - - public static String post(String url,String paramJson){ - String token = Util.null2String(Util_DataCache.getObjVal("wx_access_token")); - if ("".equals(token)){ - token = getAccessToken(); - Util_DataCache.setObjVal("wx_access_token",token); - } - url = url + "?access_token="+token; - return HttpRequestUtil.doPost(url,paramJson); - } - - - public static String getAccessToken(){ - Map map = new HashMap<>(); - map.put("corpid",corpid); - map.put("corpsecret",corpsecret); -// map.put("corpid","wx22cd58d9bee18c0f"); -// map.put("corpsecret","n4ueR_AnNWXtmYpwr01dRA6i2v9kephxRKbW23n_ZTM"); - - String response = HttpRequestUtil.doGet(TOKEN_URL,map); - TokenResult tokenResult = gson.fromJson(response,(Type) TokenResult.class); - if ("0".equals(tokenResult.getErrcode())){ - return tokenResult.getAccess_token(); - }else { - return ""; - } - } - -} diff --git a/src/com/engine/attendance/persongroup/service/PersonGroupService.java b/src/com/engine/attendance/persongroup/service/PersonGroupService.java new file mode 100644 index 0000000..a9b3af6 --- /dev/null +++ b/src/com/engine/attendance/persongroup/service/PersonGroupService.java @@ -0,0 +1,10 @@ +package com.engine.attendance.persongroup.service; + + +import weaver.hrm.User; + +import java.util.Map; + +public interface PersonGroupService { + Map getHrmCondition(Map params, User user); +} diff --git a/src/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.java b/src/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.java new file mode 100644 index 0000000..61df061 --- /dev/null +++ b/src/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.java @@ -0,0 +1,65 @@ +package com.engine.attendance.persongroup.service.impl; + + +import com.engine.attendance.persongroup.service.PersonGroupService; +import com.engine.common.util.DbTools; +import com.engine.core.impl.Service; +import com.google.common.collect.Maps; +import lombok.extern.slf4j.Slf4j; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.systeminfo.SystemEnv; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +@Slf4j +public class PersonGroupServiceImpl extends Service implements PersonGroupService { + @Override + public Map getHrmCondition(Map params, User user) { + //获取字段类型 0:日期类型,1:下拉选择类型,2:手工自由输入类型 + String type = Util.null2String(params.get("fieldType")); + String condition = ""; + if ("0".equals(type)){ + condition = " and fieldhtmltype='3' and type=2 "; + }else if ("1".equals(type)){ + condition = " and fieldhtmltype = '5' "; + }else if ("2".equals(type)){ + condition = " and fieldhtmltype <> '3' and fieldhtmltype <> '5' "; + } + + Map data = Maps.newHashMap(); + String sql = "select * from (select t1.fieldid,t2.fieldname,t1.fieldlable,t1.ismand,t2.fielddbtype,t2.fieldhtmltype,t2.type, t1.dmlurl, t1.fieldorder, t1.isuse, t1.isModify,'1' as allowModify, t1.groupid, 1 as allowhide from cus_formfield t1, cus_formdict t2 where t1.fieldid=t2.id and t1.scope='HrmCustomFieldByInfoType' and (t1.scopeid='1' or t1.scopeid='-1' or t1.scopeid='3' ) " + + " UNION all " + + " select fieldid, fieldname, fieldlabel ,ismand ,fielddbtype ,fieldhtmltype ,type , dmlurl,fieldorder ,isuse ,isModify ,allowModify, groupid, allowhide from hrm_formfield) hrmallfield where groupid in (select id from hrm_fieldgroup where (grouptype = '1' or grouptype = '-1' or grouptype = '3')) "; + + sql = sql +condition+" order by hrmallfield.groupid, hrmallfield.fieldorder "; + log.info("sql :[{}]",sql); + List