liuliang

src/com/engine/attendance/persongroup/service/PersonGroupService.java

@@ -7,4 +7,6 @@ import java.util.Map;
 
 public interface PersonGroupService {
     Map<String,Object> getHrmCondition(Map<String,Object> params, User user);
+
+    Map<String,Object> saveApplicableOrganization(Map<String,Object> params);
 }

src/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.java

@@ -3,13 +3,16 @@ package com.engine.attendance.persongroup.service.impl;
 
 import com.engine.attendance.persongroup.service.PersonGroupService;
 import com.engine.common.util.DbTools;
+import com.engine.common.util.Utils;
 import com.engine.core.impl.Service;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
 import weaver.systeminfo.SystemEnv;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -62,4 +65,35 @@ public class PersonGroupServiceImpl extends Service implements PersonGroupServic
     }
 
 
+    @Override
+    public Map<String, Object> saveApplicableOrganization(Map<String, Object> params) {
+        String billId = Util.null2String(params.get("billid"));
+        String tableName = Util.null2String(params.get("tableName"));
+        String modeId = Util.null2String(params.get("modeId"));
+        String data = Util.null2String(params.get("data"));
+        Map<String,Object> resultMap = Maps.newHashMap();
+
+        List<Map<String,String>> dataList = Utils.resolveList_Map(data);
+        //清空原有数据
+        String sql = "delete from "+tableName+" where modeid=? and dataid =?";
+        RecordSet rs = new RecordSet();
+        boolean updateResult = DbTools.update(rs,sql,modeId,billId);
+        List<List> addLists = new ArrayList<>();
+        log.info("updateResult : {}",updateResult);
+        String insertSql = "insert into "+tableName+" (dxlx,dx,aqjb,modeid,dataid) values (?,?,?,?,?)";
+        if (updateResult){
+            dataList.forEach(e->{
+                ArrayList<Object> list = new ArrayList<>();
+                list.add(e.get("dxlx"));
+                list.add(e.get("dx"));
+                list.add(e.get("aqjb"));
+                list.add(modeId);
+                list.add(billId);
+                addLists.add(list);
+            });
+        }
+        log.info("insert data : [{}]",addLists);
+        resultMap.put("result",rs.executeBatchSql(insertSql,addLists));
+        return resultMap;
+    }
 }

src/com/engine/attendance/persongroup/web/PersonGroupAction.java

@@ -12,6 +12,7 @@ import weaver.hrm.User;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
@@ -40,4 +41,24 @@ public class PersonGroupAction {
         }
 
     }
+
+    /**
+     * 适用组织存储
+     * @return
+     */
+    @POST
+    @Path("/saveApplicableOrganization")
+    @Produces({"text/plain"})
+    public String saveApplicableOrganization(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            Map<String,Object> paramMap = ParamUtil.request2Map(request);
+            Map<String,Object> dataMap = basicsetService.saveApplicableOrganization(paramMap);
+            return ApiReturnTools.success(dataMap);
+        }catch (Exception e){
+            log.error("execute fail,catch error: [{}]",e);
+            return ApiReturnTools.error("500","saveApplicableOrganization error");
+        }
+    }
+
+
 }

src/com/engine/common/cmd/QueryCommonCmd.java

@@ -4,6 +4,7 @@ import com.engine.common.biz.AbstractCommonCommand;
 import com.engine.common.entity.BizLogContext;
 import com.engine.common.util.DbTools;
 import com.engine.core.interceptor.CommandContext;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import weaver.general.Util;
 
@@ -25,33 +26,29 @@ public class QueryCommonCmd extends AbstractCommonCommand<Map<String,Object>> {
     @Override
     public Map<String, Object> execute(CommandContext commandContext) {
         Map<String,Object> resultMap = new HashMap<>();
-        String tableName = Util.null2String(params.get("tableName"));
-        String columns = Util.null2String(params.get("columns"));
-        String conditions = Util.null2String(params.get("conditions"));
-        String orderby = Util.null2String(params.get("orderby"));
-        String limit = Util.null2String(params.get("limit"));
-
-        tableName = tableName.replace("ｊｏｉｎ","join");
-        conditions = conditions.replace("ｉｎ","in");
-        String sql = "select "+columns +" from "+tableName;
-        if (!"".equals(conditions) ){
-            conditions = conditions.replace(":","=");
-            if (conditions.indexOf("in")<0){
-                conditions = conditions.replace(","," and ");
-            }
-            sql = sql + " where "+ conditions;
-        }
-        if (!"".equals(orderby)){
-            sql = sql + orderby;
+        String action = Util.null2String(params.get("action"));
+        String mark = Util.null2String(params.get("mark"));
+        String condition = Util.null2String(params.get("condition"));
+        String sql = "select sentence from uf_sqltool where action =? and mark =?";
+        String sentenceSql = DbTools.getSql(sql,action,mark);
+        String conditionSql = "";
+        String[] conditions = condition.split(",");
+        Object[] objs = new Object[conditions.length];
+        int i = 0;
+        for (String str :conditions){
+            conditionSql = conditionSql +" "+ str.split(":")[0]+"=? and";
+            objs[i] = str.split(":")[1];
+            i++;
         }
-        if (!"".equals(limit)){
-            sql = sql + limit;
+        if (!"".equals(conditionSql)){
+            conditionSql = conditionSql.substring(0,conditionSql.length()-3);
+            sentenceSql = sentenceSql +" where "+ conditionSql;
         }
-        log.info("QueryCommonCmd sql :[{}]",sql);
-
-        List<Map<String,Object>> resultList = DbTools.getSqlToList(sql);
+        log.info("sql : [{}]",sentenceSql);
+        log.info("objs : [{}]",objs);
+        List<Map<String,Object>> lists = DbTools.getSqlToList(sentenceSql,objs);
 
-        resultMap.put("data",resultList);
+        resultMap.put("data",lists);
         return resultMap;
     }
 }

src/com/engine/common/service/impl/CommonServiceImpl.java

@@ -6,14 +6,10 @@ import com.engine.common.util.CommonUtil;
 import com.engine.common.util.DbTools;
 import com.engine.common.util.Utils;
 import com.engine.core.impl.Service;
-import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 import weaver.general.Util;
-
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 @Slf4j
 public class CommonServiceImpl extends Service implements CommonService {

src/com/engine/common/util/DbTools.java

@@ -74,6 +74,7 @@ public class DbTools {
         RecordSet rs = thread.get();
         if (value == null || value.length <=0 || "".equals(value)){
             return rs.executeUpdate(sql);
+            
         }else {
             return rs.executeUpdate(sql,value);
         }
@@ -82,9 +83,26 @@ public class DbTools {
     public static boolean update(RecordSet rs,String sql,Object...value){
         if (value == null || value.length <=0 || "".equals(value)){
             return rs.executeUpdate(sql);
+
         }else {
             return rs.executeUpdate(sql,value);
         }
     }
 
+    /**
+     * 获取sql语句
+     * @param sql
+     * @param value
+     * @return
+     */
+    public  static  String getSql(String sql,Object...value){
+        RecordSet rs = thread.get();
+        rs.executeQuery(sql,value);
+        String sentenceSql = "";
+        if (rs.next()){
+            sentenceSql = rs.getString("sentence");
+        }
+        return sentenceSql;
+    }
+
 }

src/com/engine/common/web/CommonAction.java

@@ -30,19 +30,19 @@ public class CommonAction {
      * orderby 排序及limit
      * @return
      */
-//    @GET
-//    @Path("/queryCommon")
-//    @Produces({"text/plain"})
-//    public String getBasicSetInformation(@Context HttpServletRequest request, @Context HttpServletResponse response) {
-//        try {
-//            Map<String,Object> paramMap = ParamUtil.request2Map(request);
-//            Map<String,Object> dataMap = basicsetService.queryCommon(paramMap);
-//            return ApiReturnTools.success(dataMap);
-//        }catch (Exception e){
-//            log.error("sync fund status fail,catch error: [{}]",e);
-//            return ApiReturnTools.error("200","查询失败");
-//        }
-//    }
+    @GET
+    @Path("/queryCommon")
+    @Produces({"text/plain"})
+    public String getBasicSetInformation(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            Map<String,Object> paramMap = ParamUtil.request2Map(request);
+            Map<String,Object> dataMap = basicsetService.queryCommon(paramMap);
+            return ApiReturnTools.success(dataMap);
+        }catch (Exception e){
+            log.error("sync fund status fail,catch error: [{}]",e);
+            return ApiReturnTools.error("200","查询失败");
+        }
+    }
 
 //    /**
 //     * @return